hobo-inviqa 0.0.7 → 0.0.8

data/lib/hobo/version.rb

@@ -1,3 +1,3 @@
 module Hobo
-  VERSION = '0.0.7'
-end
+  VERSION = '0.0.8'
+end

data/spec/hobo/asset_applicator_spec.rb

@@ -1,4 +1,4 @@
-require 'hobo/asset_applicator'
+require 'spec_helper'
 
 describe Hobo::AssetApplicatorRegistry do
   describe "asset_applicators accessor" do
@@ -28,4 +28,4 @@ describe Hobo::AssetApplicatorRegistry do
       registry["abc"].call.should match "block"
     end
   end
-end
+end

data/spec/hobo/cli_spec.rb

@@ -1,16 +1,19 @@
 require 'spec_helper'
-require 'rake'
-require 'hobo'
 
 describe Hobo::Cli do
   cli = nil
   help = nil
   hobofile = nil
 
+  def test_args args
+    args.concat(['--skip-host-checks'])
+  end
+
   before do
     Rake::Task.tasks.each do |task|
       task.clear
     end
+
     Hobo.ui = double(Hobo::Ui).as_null_object
     help = double(Hobo::HelpFormatter).as_null_object
     cli = Hobo::Cli.new help: help
@@ -21,6 +24,8 @@ describe Hobo::Cli do
     FakeFS.activate!
 
     File.write('Hobofile', hobofile)
+
+    double(Hobo::Lib::HostCheck).as_null_object
   end
 
   after do
@@ -29,61 +34,61 @@ describe Hobo::Cli do
   end
 
   it "should load the hobofile if present" do
-    cli.start []
+    cli.start test_args([])
     Rake::Task["test:non-interactive"].should_not be nil
   end
 
   it "should load the user hobofile if present" do
     FileUtils.mkdir_p(File.dirname(Hobo.user_hobofile_path))
     File.write(Hobo.user_hobofile_path, "namespace :user do\ntask :user do\nend\nend")
-    cli.start []
+    cli.start test_args([])
     Rake::Task["user:user"].should_not be nil
   end
 
   it "should load project config if present" do
     FileUtils.mkdir_p("tools/hobo/")
     File.write("tools/hobo/config.yaml", YAML::dump({ :project => "project_config" }))
-    cli.start []
+    cli.start test_args([])
     Hobo.project_config.project.should match "project_config"
   end
 
   it "should load user config if present" do
     FileUtils.mkdir_p(Hobo.config_path)
     File.write(Hobo.user_config_file, YAML::dump({ :user => "user_config" }))
-    cli.start []
+    cli.start test_args([])
     Hobo.user_config.user.should match "user_config"
   end
 
   it "should set command map on help formatter" do
     help.should_recieve('command_map=')
-    cli.start ["test", "subcommand"]
+    cli.start test_args(["test", "subcommand"])
   end
 
   it "should propagate description metadata" do
     map = nil
     allow(help).to receive("command_map=") { |i| map = i }
-    cli.start []
+    cli.start test_args([])
     map["test:metadata"].description.should match "description"
   end
 
   it "should propagate long description metadata" do
     map = nil
     allow(help).to receive("command_map=") { |i| map = i }
-    cli.start []
+    cli.start test_args([])
     map["test:metadata"].long_description.should match "long description"
   end
 
   it "should propagate arg list metadata" do
     map = nil
     allow(help).to receive("command_map=") { |i| map = i }
-    cli.start []
+    cli.start test_args([])
     expect(map["test:metadata"].arg_list).to eq [ :arg ]
   end
 
   it "should propagate option metadata" do
     map = nil
     allow(help).to receive("command_map=") { |i| map = i }
-    cli.start []
+    cli.start test_args([])
     map["test:metadata"].options.length.should be 2
     expect(map["test:metadata"].options.map(&:short)).to eq [ 'o', 'h' ]
     expect(map["test:metadata"].options.map(&:long)).to eq [ 'option', 'help' ]
@@ -93,61 +98,72 @@ describe Hobo::Cli do
   it "should propagate hidden metadata" do
     map = nil
     allow(help).to receive("command_map=") { |i| map = i }
-    cli.start []
+    cli.start test_args([])
     map["test:metadata"].hidden.should be true
   end
 
   it "should set non-interactive mode in ui if --non-interactive" do
     Hobo.ui.should_receive('interactive=').with(false)
-    cli.start(['--non-interactive'])
+    cli.start(test_args(['--non-interactive']))
   end
 
   it "should show help if no args or opts passed" do
     help.should_receive(:help)
-    cli.start([])
+    cli.start(test_args([]))
   end
 
   it "should show help for --help" do
     help.should_receive(:help)
-    cli.start ["--help"]
+    cli.start test_args(["--help"])
   end
 
   it "should execute a top level command" do
     Hobo.ui.should_recieve(:info).with("top level")
-    cli.start ["top-level"]
+    cli.start test_args(["top-level"])
   end
 
   it "should execute a subcommand" do
     Hobo.ui.should_recieve(:info).with("Subcommand test")
-    cli.start ["test", "subcommand"]
+    cli.start test_args(["test", "subcommand"])
   end
 
   it "should show help for a namespace" do
     help.should_receive(:help).with(all: nil, target: "test")
-    cli.start ["test"]
+    cli.start test_args(["test"])
   end
 
   it "should show command help for --help" do
     help.should_receive(:help).with(all: nil, target: "test:subcommand")
-    cli.start ["test", "subcommand", "--help"]
+    cli.start test_args(["test", "subcommand", "--help"])
   end
 
   it "should propagate --all option to help" do
     help.should_receive(:help).with(all: true, target: "test")
-    cli.start ["test", "--all"]
+    cli.start test_args(["test", "--all"])
   end
 
   it "should propagate command opts to command" do
     Hobo.ui.should_receive(:info).with("1234")
-    cli.start ["test", "option-test", "--testing=1234"]
+    cli.start test_args(["test", "option-test", "--testing=1234"])
   end
 
   it "should propagate arguments to command" do
     Hobo.ui.should_receive(:info).with("1234")
-    cli.start ["test", "argument-test", "1234"]
+    cli.start test_args(["test", "argument-test", "1234"])
+  end
+
+  it "should propagate unparsed arguments in :_unparsed opt" do
+    Hobo.ui.should_receive(:info).with("ls --help")
+    cli.slop.unparsed = "ls --help"
+    cli.start test_args(["test", "unparsed", "--skip-host-checks"])
+  end
+
+  it "should propagate unparsed arguments in :_unparsed opt" do
+    Hobo.ui.should_receive(:info).with("ls --help")
+    cli.start ["test", "unparsed", "--", "ls", "--help"]
   end
 
   it "should raise an exception if not enough arguments were passed" do
-    expect { cli.start(["test", "metadata"]) }.to raise_error Hobo::MissingArgumentsError
+    expect { cli.start(test_args(["test", "metadata"])) }.to raise_error Hobo::MissingArgumentsError
   end
-end
+end

data/spec/hobo/config/file_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'hobo/paths'
-require 'hobo/config/file'
 
 describe Hobo::Config::File do
   before do
@@ -55,4 +53,4 @@ describe Hobo::Config::File do
       expect { Hobo::Config::File.load("test.yaml") }.to raise_error(RuntimeError, "Invalid hobo configuration (test.yaml)")
     end
   end
-end
+end

data/spec/hobo/error_handlers/debug_spec.rb

@@ -1,10 +1,44 @@
-require 'hobo/error_handlers/debug'
+require 'spec_helper'
 
 describe Hobo::ErrorHandlers::Debug do
+  before do
+    Hobo.ui = double(Hobo::Ui.new).as_null_object
+  end
+
+  def faked_exception(error_template)
+    error = nil
+    begin
+      raise error_template
+    rescue Exception => error
+    end
+
+    return error
+  end
+
   describe "handle" do
-    it "should re-raise the error" do
-      exception = Exception.new
-      expect { Hobo::ErrorHandlers::Debug.new.handle(exception) }.to raise_error exception
+    it "should dump the error" do
+      error = nil
+      begin
+        raise Exception.new('error_message')
+      rescue Exception => error
+      end
+
+      Hobo.ui.should_receive(:error).with(/\(Exception\).*error_message.*debug_spec.rb.*/m)
+      Hobo::ErrorHandlers::Debug.new.handle(error)
+    end
+
+    it "should return exit code according to exit_code_map" do
+      File.write("temp_log", "command output")
+      output = Struct.new(:path).new
+      output.path = "temp_log"
+
+      Hobo::ErrorHandlers::Debug.new.handle(faked_exception Interrupt.new).should eq 1
+      Hobo::ErrorHandlers::Debug.new.handle(faked_exception Hobo::ExternalCommandError.new("command", 128, output)).should eq 3
+      Hobo::ErrorHandlers::Debug.new.handle(faked_exception Hobo::InvalidCommandOrOpt.new("command")).should eq 4
+      Hobo::ErrorHandlers::Debug.new.handle(faked_exception Hobo::MissingArgumentsError.new("command", ["arg1"])).should eq 5
+      Hobo::ErrorHandlers::Debug.new.handle(faked_exception Hobo::UserError.new("user error")).should eq 6
+      Hobo::ErrorHandlers::Debug.new.handle(faked_exception Hobo::ProjectOnlyError.new).should eq 7
+      Hobo::ErrorHandlers::Debug.new.handle(faked_exception Exception.new "general").should eq 128
     end
   end
-end
+end

data/spec/hobo/error_handlers/friendly_spec.rb

@@ -1,5 +1,4 @@
-require 'hobo/error_handlers/friendly'
-require 'hobo/ui'
+require 'spec_helper'
 
 describe Hobo::ErrorHandlers::Friendly do
   before do
@@ -13,9 +12,19 @@ describe Hobo::ErrorHandlers::Friendly do
     FakeFS.deactivate!
   end
 
+  def faked_exception(error_template)
+    error = nil
+    begin
+      raise error_template
+    rescue Exception => error
+    end
+
+    return error
+  end
+
   describe "handle" do
     it "should display specialized error for Interrupt" do
-      error = Interrupt.new
+      error = faked_exception(Interrupt.new)
       Hobo.ui.should_receive(:warning).with(/Caught Interrupt/)
       Hobo::ErrorHandlers::Friendly.new.handle(error)
     end
@@ -24,7 +33,9 @@ describe Hobo::ErrorHandlers::Friendly do
       File.write("temp_log", "command output")
       output = Struct.new(:path).new
       output.path = "temp_log"
-      error = Hobo::ExternalCommandError.new("command", 128, output)
+
+      error = faked_exception Hobo::ExternalCommandError.new("command", 128, output)
+
       Hobo.ui.should_receive(:error).with(/The following external command appears to have failed \(exit status 128\)/)
       Hobo::ErrorHandlers::Friendly.new.handle(error)
     end
@@ -33,49 +44,55 @@ describe Hobo::ErrorHandlers::Friendly do
       File.write("temp_log", "command output")
       output = Struct.new(:path).new
       output.path = "temp_log"
-      error = Hobo::ExternalCommandError.new("command", 128, output)
+
+      error = faked_exception Hobo::ExternalCommandError.new("command", 128, output)
+
       Hobo::ErrorHandlers::Friendly.new.handle(error)
       File.read(File.join(Dir.tmpdir, 'hobo_error.log')).should match "command output"
     end
 
     it "should display specialized error for invalid command or opt error" do
-      error = Hobo::InvalidCommandOrOpt.new("command")
+      error = faked_exception Hobo::InvalidCommandOrOpt.new("command")
       Hobo.ui.should_receive(:error).with(/Invalid command or option specified: 'command'/)
       Hobo::ErrorHandlers::Friendly.new.handle(error)
     end
 
     it "should display specialized error for missing argument error" do
-      error = Hobo::MissingArgumentsError.new("command", ["arg1"])
+      error = faked_exception Hobo::MissingArgumentsError.new("command", ["arg1"])
       Hobo.ui.should_receive(:error).with(/Not enough arguments for command/)
       Hobo::ErrorHandlers::Friendly.new.handle(error)
     end
 
     it "should display specialized error for user error" do
-      error = Hobo::UserError.new("user error")
+      error = faked_exception Hobo::UserError.new("user error")
       Hobo.ui.should_receive(:error).with(/user error/)
       Hobo::ErrorHandlers::Friendly.new.handle(error)
     end
 
     it "should display generic error for other exception" do
-      error = nil
-      begin
-        raise Exception.new("general error")
-      rescue Exception => error
-      end
-
+      error = faked_exception Exception.new("general error")
       Hobo.ui.should_receive(:error).with(/An unexpected error has occured/)
       Hobo::ErrorHandlers::Friendly.new.handle(error)
     end
 
     it "should write error backtrace to /tmp/hobo_error.log for other exception" do
-      error = nil
-      begin
-        raise Exception.new("general error")
-      rescue Exception => error
-      end
-
+      error = faked_exception Exception.new("general error")
       Hobo::ErrorHandlers::Friendly.new.handle(error)
       File.read(File.join(Dir.tmpdir, 'hobo_error.log')).should match /\(Exception\) general error/
     end
+
+    it "should return exit code according to exit_code_map" do
+      File.write("temp_log", "command output")
+      output = Struct.new(:path).new
+      output.path = "temp_log"
+
+      Hobo::ErrorHandlers::Friendly.new.handle(faked_exception Interrupt.new).should eq 1
+      Hobo::ErrorHandlers::Friendly.new.handle(faked_exception Hobo::ExternalCommandError.new("command", 128, output)).should eq 3
+      Hobo::ErrorHandlers::Friendly.new.handle(faked_exception Hobo::InvalidCommandOrOpt.new("command")).should eq 4
+      Hobo::ErrorHandlers::Friendly.new.handle(faked_exception Hobo::MissingArgumentsError.new("command", ["arg1"])).should eq 5
+      Hobo::ErrorHandlers::Friendly.new.handle(faked_exception Hobo::UserError.new("user error")).should eq 6
+      Hobo::ErrorHandlers::Friendly.new.handle(faked_exception Hobo::ProjectOnlyError.new).should eq 7
+      Hobo::ErrorHandlers::Friendly.new.handle(faked_exception Exception.new "general").should eq 128
+    end
   end
-end
+end

data/spec/hobo/help_formatter_spec.rb

@@ -1,4 +1,4 @@
-require 'hobo/help_formatter'
+require 'spec_helper'
 
 describe Hobo::HelpFormatter do
   help = nil
@@ -38,8 +38,8 @@ describe Hobo::HelpFormatter do
 
     help = Hobo::HelpFormatter.new slop
     help.command_map = map
-    HighLine.use_color = false
     Hobo.ui = Hobo::Ui.new
+    Hobo.ui.use_color false
   end
 
   describe "help" do
@@ -160,4 +160,4 @@ describe Hobo::HelpFormatter do
       end
     end
   end
-end
+end

data/spec/hobo/helpers/file_locator_spec.rb

@@ -1,4 +1,4 @@
-require 'hobo/helper/file_locator'
+require 'spec_helper'
 
 describe Hobo::Helper do
   describe "locate" do
@@ -8,4 +8,4 @@ describe Hobo::Helper do
     it "should chdir to file path before yielding"
     it "should yield once for each matching file"
   end
-end
+end

data/spec/hobo/helpers/shell_spec.rb

@@ -1,4 +1,4 @@
-require 'hobo/helper/shell'
+require 'spec_helper'
 
 describe Hobo::Helper do
   describe "bundle_shell" do
@@ -18,4 +18,4 @@ describe Hobo::Helper do
     it "should colour stderr output with red"
     it "should set ENV args for command if specified with :env"
   end
-end
+end

data/spec/hobo/helpers/vm_command_spec.rb

@@ -1,9 +1,4 @@
-require 'hobo/config'
-require 'hobo/logging'
-require 'hobo/ui'
-require 'hobo/patches/deepstruct'
-require 'hobo/helper/vm_command'
-
+require 'spec_helper'
 
 describe Hobo::Helper do
   before do
@@ -12,29 +7,59 @@ describe Hobo::Helper do
       :mysql => {
         :username => "test_user",
         :password => "test_pass"
+      },
+      :vm => {
+        :project_mount_path => '/'
       }
     })
+
+    Hobo.ui = Hobo::Ui.new
+
+    vmi_double = double(Hobo::Helper::VmInspector).as_null_object
+    vmi_double.should_receive(:ssh_config).and_return({
+      :ssh_host => 'fakehost',
+      :ssh_user => 'fakeuser',
+      :ssh_port => '999',
+      :ssh_identity => 'fakeidentity'
+    })
+
+    Hobo::Helper::VmCommand.class_eval do
+      class_variable_set '@@vm_inspector', vmi_double
+    end
   end
 
   describe "vm_command" do
     it "should create a new vm command wrapper with specified command" do
-      vm_command("my_command").to_s.should match /-- my_command/
+      vm_command("my_command", :pwd => '/').to_s.should match /-c my_command/
     end
 
+<<<<<<< HEAD
     it "should default to using a psuedo tty" do
-      vm_command("my_command").to_s.should match /\s-t\s/
+      vm_command("my_command", :pwd => '/').to_s.should match /\s-t\s/
     end
 
     it "should default to vagrant user" do
-      vm_command("my_command").to_s.should match /vagrant@/
+      vm_command("my_command", :pwd => '/').to_s.should match /vagrant@/
     end
 
     it "should default to project host name" do
-      vm_command("my_command").to_s.should match /@test_hostname/
+      vm_command("my_command", :pwd => '/').to_s.should match /@test_hostname/
+=======
+    it "should default to not using a psuedo tty" do
+      vm_command("my_command", :pwd => '/').to_s.should_not match /\s-t\s/
+    end
+
+    it "should default to ssh_config user" do
+      vm_command("my_command", :pwd => '/').to_s.should match /fakeuser@/
+    end
+
+    it "should default to ssh_config host name" do
+      vm_command("my_command", :pwd => '/').to_s.should match /@fakehost/
+>>>>>>> 0.0.6-bugfixes
     end
 
     it "should not wrap piped commands with echo by default" do
-      c = vm_command("my_command")
+      c = vm_command("my_command", :pwd => '/')
       c << "test"
       c.to_s.should_not match /^echo test/
     end
@@ -42,24 +67,32 @@ describe Hobo::Helper do
 
   describe "vm_mysql" do
     it "should use mysql command by default" do
-      vm_mysql.to_s.should match /-- mysql/
+      vm_mysql(:pwd => '/').to_s.should match /-c mysql/
     end
 
     it "should use project config mysql username & password if set" do
-      vm_mysql.to_s.should match /-- mysql.*-utest_user.*-ptest_pass/
+      vm_mysql(:pwd => '/').to_s.should match /-c mysql.*-utest_user.*-ptest_pass/
     end
 
-    it "should default to root/root if project config mysql credentials not set" do
+    it "should not pass user / pass if project config mysql credentials not set" do
       Hobo.project_config = DeepStruct.wrap({})
-      vm_mysql.to_s.should match /-- mysql.*-uroot.*-proot/
+<<<<<<< HEAD
+      vm_mysql(:pwd => '/').to_s.should match /-c mysql'$/
+    end
+
+    it "should allow specifying the database in options" do
+      vm_mysql(:pwd => '/', :db => "test_db").to_s.should match /-c mysql.*test_db'$/
+=======
+      vm_mysql(:pwd => '/').to_s.should match /-c mysql'/
     end
 
     it "should allow specifying the database in options" do
-      vm_mysql(:db => "test_db").to_s.should match /-- mysql.*test_db$/
+      vm_mysql(:pwd => '/', :db => "test_db").to_s.should match /-c mysql.*test_db'/
+>>>>>>> 0.0.6-bugfixes
     end
 
     it "should enable auto echo of piped commands" do
-      c = vm_mysql
+      c = vm_mysql(:pwd => '/')
       c << "SELECT 1"
       c.to_s.should match /^echo SELECT\\ 1/
     end
@@ -69,12 +102,12 @@ describe Hobo::Helper do
     it "should execute the command using the shell helper" do
       Hobo::Helper.class_eval do
         alias :old_shell :shell
-        def shell command
-          command.should match /ssh.* -- my_command/
+        def shell command, opts
+          command.to_s.should match /ssh.* -c my_command/
         end
       end
 
-      vm_shell "my_command"
+      vm_shell "my_command", :pwd => '/'
 
       Hobo::Helper.class_eval do
         remove_method :shell
@@ -82,4 +115,4 @@ describe Hobo::Helper do
       end
     end
   end
-end
+end