refactor Models namespace to Script

DannyBen · DannyBen · commit b15a52bec06d · 2021-10-29T06:56:54.000Z
in order to allow for more logical namespaces
diff --git a/lib/bashly.rb b/lib/bashly.rb
@@ -9,6 +9,6 @@
 
 requires 'bashly/settings'
 requires 'bashly/exceptions'
-requires 'bashly/models/base'
+requires 'bashly/script/base'
 requires 'bashly/commands/base'
 requires 'bashly'
diff --git a/lib/bashly/commands/add.rb b/lib/bashly/commands/add.rb
@@ -108,7 +108,7 @@ def config
       end
 
       def command
-        @command ||= Models::Command.new config
+        @command ||= Script::Command.new config
       end
 
       def completions
diff --git a/lib/bashly/commands/generate.rb b/lib/bashly/commands/generate.rb
@@ -69,7 +69,7 @@ def create_master_script
       end
 
       def script
-        @script ||= Models::Script.new(command, args['--wrap'])
+        @script ||= Script::Wrapper.new(command, args['--wrap'])
       end
 
       def master_script_path
@@ -81,7 +81,7 @@ def config
       end
 
       def command
-        @command ||= Models::Command.new config
+        @command ||= Script::Command.new config
       end
 
     end
diff --git a/lib/bashly/commands/preview.rb b/lib/bashly/commands/preview.rb
@@ -10,8 +10,8 @@ class Preview < Base
 
       def run
         config = Config.new "#{Settings.source_dir}/bashly.yml"
-        command = Models::Command.new(config)
-        script = Models::Script.new command
+        command = Script::Command.new(config)
+        script = Script::Wrapper.new command
         puts script.code
       end
     end
diff --git a/lib/bashly/script/argument.rb b/lib/bashly/script/argument.rb
@@ -1,5 +1,5 @@
 module Bashly
-  module Models
+  module Script
     class Argument < Base
       def usage_string
         required ? name.upcase : "[#{name.upcase}]"
diff --git a/lib/bashly/script/base.rb b/lib/bashly/script/base.rb
@@ -1,5 +1,5 @@
 module Bashly
-  module Models
+  module Script
     class Base
       include Renderable
 
diff --git a/lib/bashly/script/command.rb b/lib/bashly/script/command.rb
@@ -1,5 +1,5 @@
 module Bashly
-  module Models
+  module Script
     class Command < Base
       include Completions
 
diff --git a/lib/bashly/script/environment_variable.rb b/lib/bashly/script/environment_variable.rb
@@ -1,5 +1,5 @@
 module Bashly
-  module Models
+  module Script
     class EnvironmentVariable < Base
       def usage_string(extended: false)
         result = [name.upcase]
diff --git a/lib/bashly/script/flag.rb b/lib/bashly/script/flag.rb
@@ -1,5 +1,5 @@
 module Bashly
-  module Models
+  module Script
     class Flag < Base
       def aliases
         if long and short
diff --git a/lib/bashly/script/wrapper.rb b/lib/bashly/script/wrapper.rb
@@ -1,6 +1,6 @@
 module Bashly
-  module Models
-    class Script
+  module Script
+    class Wrapper
       include Renderable
 
       attr_reader :command, :function_name
diff --git a/lib/bashly/views/wrapper/bash3_bouncer.erb b/lib/bashly/views/wrapper/bash3_bouncer.erb
diff --git a/lib/bashly/views/wrapper/header.erb b/lib/bashly/views/wrapper/header.erb
diff --git a/lib/bashly/views/wrapper/wrapper.erb b/lib/bashly/views/wrapper/wrapper.erb
diff --git a/spec/approvals/script/wrapper/code b/spec/approvals/script/wrapper/code
diff --git a/spec/approvals/script/wrapper/code-wrapped b/spec/approvals/script/wrapper/code-wrapped
diff --git a/spec/bashly/concerns/completions_spec.rb b/spec/bashly/concerns/completions_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Models::Command do
+describe Script::Command do
   let(:fixture) { :completions_simple }
 
   subject do
-    options = load_fixture('models/commands')[fixture]
+    options = load_fixture('script/commands')[fixture]
     described_class.new options
   end
 
diff --git a/spec/bashly/script/argument_spec.rb b/spec/bashly/script/argument_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Models::Argument do
+describe Script::Argument do
   let(:options) { {"name" => "file"} }
   subject { described_class.new options }
 
diff --git a/spec/bashly/script/base_spec.rb b/spec/bashly/script/base_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Models::Base do
+describe Script::Base do
   let(:options) { {"name" => "file", "help" => "line one\nline two"} }
   subject { described_class.new options }
 
diff --git a/spec/bashly/script/command_spec.rb b/spec/bashly/script/command_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Models::Command do
+describe Script::Command do
   let(:fixture) { :basic_command }
 
   subject do
-    options = load_fixture('models/commands')[fixture]
+    options = load_fixture('script/commands')[fixture]
     described_class.new options
   end
 
@@ -51,7 +51,7 @@
   describe '#args' do
     it "returns an array of Argument objects" do
       expect(subject.args).to be_an Array
-      expect(subject.args.first).to be_a Models::Argument
+      expect(subject.args.first).to be_a Script::Argument
     end
   end
 
@@ -186,7 +186,7 @@
 
     it "returns an array of Command objects" do
       expect(subject.commands).to be_an Array
-      expect(subject.commands.first).to be_a Models::Command
+      expect(subject.commands.first).to be_a Script::Command
     end
 
     it "sets the parents property of its commands" do
@@ -215,7 +215,7 @@
     let(:fixture) { :default_command }
 
     it "returns a Command object of the first default command" do
-      expect(subject.default_command).to be_a Models::Command
+      expect(subject.default_command).to be_a Script::Command
       expect(subject.default_command.name).to eq 'get'
     end    
   end
@@ -233,7 +233,7 @@
   describe '#environment_cariables' do
     it "returns an array of EnvironemntVariable objects" do
       expect(subject.environment_variables).to be_an Array
-      expect(subject.environment_variables.first).to be_a Models::EnvironmentVariable
+      expect(subject.environment_variables.first).to be_a Script::EnvironmentVariable
     end
   end
 
@@ -264,7 +264,7 @@
   describe '#flags' do
     it "returns an array of Flag objects" do
       expect(subject.flags).to be_an Array
-      expect(subject.flags.first).to be_a Models::Flag
+      expect(subject.flags.first).to be_a Script::Flag
     end
   end
 
diff --git a/spec/bashly/script/flag_spec.rb b/spec/bashly/script/flag_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Models::Flag do
+describe Script::Flag do
   let(:options) { {"long" => "--help", "short" => "-h", "help" => "show this help"} }
   subject { described_class.new options }
 
diff --git a/spec/bashly/script/wrapper_spec.rb b/spec/bashly/script/wrapper_spec.rb
@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Models::Script do
+describe Script::Wrapper do
   subject { described_class.new command }
-  let(:command) { Models::Command.new config }
-  let(:config) { load_fixture('models/commands')[fixture] }
+  let(:command) { Script::Command.new config }
+  let(:config) { load_fixture('script/commands')[fixture] }
   let(:fixture) { :basic_command }
 
   describe '#code' do
     context "without function name" do
       it "returns the complete script" do
         lines = subject.code.split "\n"
-        expect(lines[0..12].join("\n")).to match_approval('models/script/code')
+        expect(lines[0..12].join("\n")).to match_approval('script/wrapper/code')
         expect(lines[-1]).to eq 'run "$@"'
       end
     end
@@ -20,7 +20,7 @@
 
       it "returns the complete script wrapped in a function without a bash3 bouncer" do
         lines = subject.code.split "\n"
-        expect(lines[0..12].join("\n")).to match_approval('models/script/code-wrapped')
+        expect(lines[0..12].join("\n")).to match_approval('script/wrapper/code-wrapped')
         expect(lines[-1]).to eq '(return 0 2>/dev/null) || my_super_function "$@"'
       end
     end
diff --git a/spec/fixtures/script/commands.yml b/spec/fixtures/script/commands.yml
