hobo-inviqa 0.0.6 → 0.0.7.pre.rc1

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,46 @@ 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
 
-    it "should default to using a psuedo tty" do
-      vm_command("my_command").to_s.should match /\s-t\s/
+    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 vagrant user" do
-      vm_command("my_command").to_s.should match /vagrant@/
+    it "should default to ssh_config user" do
+      vm_command("my_command", :pwd => '/').to_s.should match /fakeuser@/
     end
 
-    it "should default to project host name" do
-      vm_command("my_command").to_s.should match /@test_hostname/
+    it "should default to ssh_config host name" do
+      vm_command("my_command", :pwd => '/').to_s.should match /@fakehost/
     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 +54,24 @@ 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/
+      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'/
     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 +81,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 +94,4 @@ describe Hobo::Helper do
       end
     end
   end
-end
+end

data/spec/hobo/lib/s3sync_spec.rb

@@ -1,7 +1,10 @@
-require 'hobo/logging'
-require 'hobo/lib/s3sync'
+require 'spec_helper'
 
 describe Hobo::Lib::S3Sync do
+  before do
+    AWS.stub!
+  end
+
   describe "sync" do
     it "should synchronize s3 files to local"
     it "should synchronize local files to s3"
@@ -10,4 +13,4 @@ describe Hobo::Lib::S3Sync do
     it "should remove files that do not exist in source"
     it "should update progress as files are transferred"
   end
-end
+end

data/spec/hobo/lib/seed/project_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'hobo'
 
 describe Hobo::Lib::Seed::Project do
   pwd = nil
@@ -12,7 +11,7 @@ describe Hobo::Lib::Seed::Project do
     Dir.chdir tmp_dir
     FileUtils.mkdir_p "project_path"
     FileUtils.touch "project_path/test"
-    Hobo.ui = Hobo::Ui.new
+    Hobo.ui = double(Hobo::Ui).as_null_object
     default_config = {
       :config_class => double(Hobo::Config::File).as_null_object,
       :replacer => double(Hobo::Lib::Seed::Replacer.new).as_null_object
@@ -79,4 +78,4 @@ describe Hobo::Lib::Seed::Project do
     it "should set hostname in config"
     it "should set asset bucket in config"
   end
-end
+end

data/spec/hobo/lib/seed/replacer_spec.rb

@@ -1,5 +1,4 @@
-require "spec_helper"
-require "hobo/lib/seed/replacer"
+require 'spec_helper'
 
 describe Hobo::Lib::Seed::Replacer do
   before do

data/spec/hobo/lib/seed/seed_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'hobo'
 
 describe Hobo::Lib::Seed::Seed do
   pwd = nil
@@ -9,7 +8,7 @@ describe Hobo::Lib::Seed::Seed do
     tmp_dir = Dir.mktmpdir
     pwd = Dir.pwd
     Dir.chdir tmp_dir
-    Hobo.ui = Hobo::Ui.new
+    Hobo.ui = double(Hobo::Ui).as_null_object
   end
 
   after do
@@ -91,4 +90,4 @@ describe Hobo::Lib::Seed::Seed do
       seed.version.should eq `cd seeds/seed_4 && git rev-parse --short HEAD`.strip
     end
   end
-end
+end

data/spec/hobo/logging_spec.rb

@@ -1,4 +1,4 @@
-require 'hobo/logging'
+require 'spec_helper'
 
 describe Hobo::Logging do
   before do
@@ -25,4 +25,4 @@ describe Hobo::Logging do
       Hobo::Logging.logger.level.should eq Logger::WARN
     end
   end
-end
+end

data/spec/hobo/metadata_spec.rb

@@ -1,4 +1,4 @@
-require 'hobo/metadata'
+require 'spec_helper'
 
 describe Hobo::Metadata do
   before do
@@ -53,4 +53,4 @@ describe Hobo::Metadata do
       Hobo::Metadata.store.should eq({ :type => "default" })
     end
   end
-end
+end

data/spec/hobo/null_spec.rb

@@ -1,4 +1,4 @@
-require 'hobo/null'
+require 'spec_helper'
 
 describe Hobo::Null do
   it "should return itself for any method call" do
@@ -28,4 +28,4 @@ describe Hobo::Null do
       maybe(1).should eq 1
     end
   end
-end
+end