hobo-inviqa 0.0.9.pre.rc1 → 0.0.9.pre.rc2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDMyYjk4NWFmYzI3OWI5MDc4NDMwZTRiNzZmYWU0M2NlMjYyN2M3NA==
+    NmFkZDZkYmVlOTQ4MzE1MjRlYzdkNTdhN2U5NDI1ODBmZGI4YmIxOA==
   data.tar.gz: !binary |-
-    ZDM5MmEyZDNiNzk0MGIyNTQ2NmVjYTIxYTNkYTg5ZDg3ZTUxMTllOA==
+    M2UwNWI1NDFiYWM3MjY3MGZhZjY3YTNhZmJhYTQ2OTI3N2IzMjJiYg==
 SHA512:
   metadata.gz: !binary |-
-    NTM5YzRkNGI2NzQ3YjVkOTExOWVhOTc3MWRkMzQ4OTg0OGY0YmJiMzkxYjkx
-    ZWRlZTc4ZDljMGUxNzY2YWU1MDY0Y2RkYjY2NTRmOGVhMzk5NjNmNDZjODVm
-    MTM4YTFhYmY2YmY4OWM4MjM5MTI2M2MxNzJhODAxNDg5ODM1N2Q=
+    NGQ1MzJmZmYwYmQ3NjIwMjZjOGFmZDMyNTFkZWYxYTY0YTM0YzgxZTE0YjE1
+    MWZkMzQ3NmRhYWNiYTg5NTljNGJlM2QwN2RmNWRkOTcyMGQzZmUyYWFlNzcw
+    M2JjYTZkMWZlOWZjNTI1MDM4YjIyZDA3MDViYTRkZDE3YzIxZDY=
   data.tar.gz: !binary |-
-    Zjc0ZDRlZjVkMWZkZjllMzliYmFhYWUxZTg2YTliOWIzZmJiZTU0ZTA2Nzdh
-    MzdiNTVmNGMyMmEzYmZiNjE5YmE3MDIzMDdhODIyZjNkMTBmODBiOGEwYTQy
-    ZmE2YjYxM2FhNDZhMzE2OWZlOWViN2VkYjgzM2I4N2Y1ODUxYWY=
+    ZmUzMjhmNDNmMTg0YmM4Y2NkNmIxOTI4MTk1YmYyMzhiMTE1NzU2MmY3YWU3
+    NTdmODk4N2UwNzViODAxNDBkMzZhYjRjOTZkMmE2NTBlMDMwYjUzMTUyMDhm
+    MmVkNDdkMjAxNjU2MjJmZDQ4NmFmOGViZDQzY2JkOTE3OTViOGE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hobo-inviqa (0.0.9.pre.rc1)
+    hobo-inviqa (0.0.9.pre.rc2)
       aws-sdk (~> 1.34.0)
       bundler (~> 1.5.2)
       deepstruct (~> 0.0.5)
@@ -46,9 +46,12 @@ GEM
     diff-lcs (1.2.5)
     fakefs (0.5.0)
     ffi (1.9.3)
+    ffi (1.9.3-x86-mingw32)
     formatador (0.2.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    gherkin (2.12.2-x86-mingw32)
+      multi_json (~> 1.3)
     guard (2.2.5)
       formatador (>= 0.2.4)
       listen (~> 2.1)
@@ -90,6 +93,11 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry (0.9.12.6-x86-mingw32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
     rake (10.1.1)
     rake-hooks (1.2.3)
       rake
@@ -112,9 +120,11 @@ GEM
     thor (0.18.1)
     timers (1.1.0)
     uuidtools (2.1.4)
+    win32console (1.3.2-x86-mingw32)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   aruba (~> 0.5.4)

data/bin/hobo

@@ -3,10 +3,10 @@
 # Hack to allow testing with Aruba (for now)
 $:.push File.expand_path(File.join("..", "..", "lib"), __FILE__)
 
+# Suppress Net/SSH/Simple warning on windows
+#$SUPPRESS_32BIT_WARNING=1
+
 require 'hobo'
-require 'slop'
-require 'teerb'
-require 'tmpdir'
 
 $HOBO_ARGV = ARGV
 
@@ -19,6 +19,8 @@ Hobo.logger.level = Logger::WARN
 # Options parsed here will be hidden from the main app
 slop = Slop.parse! do
   on '--debug', 'Enable debugging' do
+    require 'teerb'
+    require 'tmpdir'
     error_handler = Hobo::ErrorHandlers::Debug.new
     debug_log = File.open(File.join(Dir.tmpdir, 'hobo_debug.log'), 'w+')
     Hobo.logger = Logger.new(TeeRb::IODelegate.new(STDOUT, debug_log))
@@ -33,6 +35,8 @@ slop = Slop.parse! do
     level = self.to_hash[:'log-level'].upcase
     Hobo.logger.level = Logger.const_get(level) if [ 'DEBUG', 'INFO' ].include? level
   end
+
+  on '--non-interactive', 'Run non-interactively. Defaults will be automatically used where possible.'
 end
 
 Hobo.logger.formatter = proc do |severity, datetime, progname, msg|

data/features/hobo/basic.feature

@@ -31,4 +31,13 @@ Feature: Basics
 
   Scenario: --non-interactive should cause default options to be used
     When I run `hobo test non-interactive --non-interactive`
-    Then the output should contain "Used defaults"
+    Then the output should contain "Used defaults"
+
+  Scenario: --all should list all tasks
+    When I run `hobo --all`
+    Then the output should contain "hobo-debug"
+
+  Scenario: --skip-host-checks should skip host checks
+    Given "test_files/vagrant_fail/" is appended to the PATH environment variable
+    When I run `hobo --skip-host-checks`
+    Then the output should not contain "Hobo has detected a problem"

data/features/hobo/subcommands.feature

@@ -12,5 +12,4 @@ Feature: Subcommands
   Scenario: Subcommand should execute
     When I run `hobo test non-interactive` interactively
     And I type "Testing"
-    Then the output should contain "Subcommand test"
-    And the output should contain "Testing"
+    Then the output should contain "Testing"

data/features/step_definitions/env.rb

@@ -0,0 +1,6 @@
+require 'fileutils'
+
+Given(/^"(.*?)" is appended to the (.*) environment variable$/) do |value, env|
+  set_env(env, (ENV[env] || "") + ":" + value)
+  puts ENV[env]
+end

data/lib/hobo.rb

@@ -1,11 +1,13 @@
 # External deps
+require 'slop'
 require 'rake'
 require 'rake/hooks'
 require 'tempfile'
 require 'shellwords'
 require 'deepstruct'
-require 'os'
-require 'bundler'
+require 'logger'
+require 'highline'
+require 'fileutils'
 
 # DSL enhancements
 require 'hobo/metadata'
@@ -26,14 +28,8 @@ require 'hobo/error_handlers/exit_code_map'
 require 'hobo/error_handlers/debug'
 require 'hobo/error_handlers/friendly'
 require 'hobo/config/file'
-require 'hobo/logging'
 require 'hobo/config'
 
-# Asset applicators
-require 'hobo/asset_applicator'
-require 'hobo/asset_applicators/sqldump'
-require 'hobo/asset_applicators/files'
-
 # Asset sync
 require 'hobo/lib/s3/sync'
 require 'hobo/lib/s3/local/file'
@@ -50,6 +46,11 @@ require 'hobo/helper/vm_command'
 require 'hobo/lib/vm/inspector'
 require 'hobo/lib/vm/command'
 
+# Asset applicators
+require 'hobo/asset_applicator'
+require 'hobo/asset_applicators/sqldump'
+require 'hobo/asset_applicators/files'
+
 # Libs
 require 'hobo/lib/seed/project'
 require 'hobo/lib/seed/replacer'

data/lib/hobo/cli.rb

@@ -1,6 +1,3 @@
-require 'slop'
-require 'deepstruct'
-
 module Hobo
 
   class << self
@@ -20,6 +17,7 @@ module Hobo
       @slop = opts[:slop] || Slop.new
       @help_formatter = opts[:help] || Hobo::HelpFormatter.new(@slop)
       @help_opts = {}
+      @host_check = opts[:host_check] || Hobo::Lib::HostCheck
     end
 
     def start args = ARGV
@@ -104,16 +102,15 @@ module Hobo
     end
 
     def perform_host_checks
-      Hobo::Lib::HostCheck.check(
-          :filter => /vagrant.*|.*present|latest_hobo_version/,
-          :raise => true
+      @host_check.check(
+        :filter => /vagrant.*|.*present|latest_hobo_version/,
+        :raise => true
       )
     end
 
     def define_global_opts slop
       slop.on '-a', '--all', 'Show hidden commands'
       slop.on '-h', '--help', 'Display help'
-      slop.on '--non-interactive', 'Run non-interactively. Defaults will be automatically used where possible.'
       slop.on '--skip-host-checks', 'Skip host checks'
 
       slop.on '-v', '--version', 'Print version information' do

data/lib/hobo/config/file.rb

@@ -1,10 +1,8 @@
-require 'yaml'
-require 'deepstruct'
-
 module Hobo
   module Config
     class File
       def self.save(file, config)
+        require 'yaml'
         config = config.unwrap if config.public_methods.include? :unwrap
         dir = ::File.dirname file
         FileUtils.mkdir_p dir unless ::File.exists? dir
@@ -14,6 +12,7 @@ module Hobo
       end
 
       def self.load(file)
+        require 'yaml'
         config = ::File.exists?(file) ? YAML.load_file(file) : {}
         raise "Invalid hobo configuration (#{file})" unless config
         return DeepStruct.wrap(config)

data/lib/hobo/error_handlers/friendly.rb

@@ -1,11 +1,10 @@
-require 'tmpdir' # Needed for Dir.tmpdir
-
 module Hobo
   module ErrorHandlers
     class Friendly
       include Hobo::ErrorHandlers::ExitCodeMap
 
       def handle error
+        require 'tmpdir'
         log_file = File.join(Dir.tmpdir, 'hobo_error.log')
 
         # Not possible to match Interrupt class unless we use class name as string for some reason!

data/lib/hobo/help_formatter.rb

@@ -1,8 +1,3 @@
-require 'slop'
-require 'highline'
-require 'hobo/ui'
-require 'hobo/patches/slop'
-
 module Hobo
   class HelpFormatter
     attr_accessor :command_map

data/lib/hobo/helper/file_locator.rb

@@ -1,5 +1,3 @@
-require 'open3'
-
 module Hobo
   module Helper
     def locate(pattern, opts = {}, &block)

data/lib/hobo/helper/http_download.rb

@@ -1,9 +1,8 @@
-require 'net/http'
-require 'uri'
-
 module Hobo
   module Helper
     def http_download url, target_file, opts = {}
+      require 'net/http'
+      require 'uri'
       opts = { :progress => Hobo.method(:progress) }.merge(opts)
       uri = URI.parse(url)
       size = 0

data/lib/hobo/helper/shell.rb

@@ -1,6 +1,3 @@
-require 'open3'
-require 'tempfile'
-
 module Hobo
   module Helper
 
@@ -20,6 +17,9 @@ module Hobo
     end
 
     def shell *args, &block
+      require 'open3'
+      require 'tempfile'
+
       def chunk_line_iterator stream
         begin
           until (chunk = stream.readpartial(1024)).nil? do

data/lib/hobo/helper/vm_command.rb

@@ -1,6 +1,3 @@
-require 'tempfile'
-require 'net/ssh/simple'
-
 module Hobo
   module Helper
 
@@ -27,10 +24,6 @@ module Hobo
     def vm_command command = nil, opts = {}
       ::Hobo::Lib::Vm::Command.new command, opts
     end
-
-    private
-
-
   end
 end
 

data/lib/hobo/lib/host_check/deps.rb

@@ -4,7 +4,7 @@ module Hobo
       def ssh_present opts
         advice = "The SSH command could not be located on your system.\n\n"
 
-        if OS.windows?
+        if Hobo.windows?
           advice += "To make SSH available you must re-install git using the installer from http://git-scm.com/downloads ensuring you select the 'Use git and unix tools everywhere' option."
         else
           advice += "Please install openssh using your package manager."

data/lib/hobo/lib/host_check/git.rb

@@ -3,7 +3,7 @@ module Hobo
     module HostCheck
       def git_present opts
         advice = "The Git command could not be detected on your system.\n\n"
-        if OS.windows?
+        if Hobo.windows?
           advice += "Please install it from http://git-scm.com/downloads ensuring you select the 'Use git and unix tools everywhere' option."
         else
           advice += "Please install it using your package manager."
@@ -46,7 +46,7 @@ EOF
       end
 
       def git_autocrlf_disabled opts
-        return unless OS.windows?
+        return unless Hobo.windows?
 
         advice = <<-EOF
 You're using git with the core.autocrlf option enabled.

data/lib/hobo/lib/host_check/hobo.rb

@@ -1,10 +1,11 @@
-require 'net/http'
-require 'semantic'
+
+
 
 module Hobo
   module Lib
     module HostCheck
       def latest_hobo_version opts
+        require 'semantic'
 
         installed = ::Semantic::Version.new Hobo::VERSION
 
@@ -25,6 +26,8 @@ module Hobo
       private
 
       def get_latest_hobo_version
+        require 'semantic'
+        require 'net/http'
         one_day = 3600 * 24
         file = File.join(Hobo.config_path, 'latest')
         if !File.exists? file or File.mtime(file) < Time.now - one_day

data/lib/hobo/lib/host_check/ruby.rb

@@ -2,7 +2,7 @@ module Hobo
   module Lib
     module HostCheck
       def not_using_system_ruby opts
-        return if OS.windows?
+        return if Hobo.windows?
         advice = <<-EOF
 You're using a system ruby install which can cause issues with installing Gems and running some older projects.
 
@@ -21,7 +21,7 @@ EOF
       end
 
       def system_paths_for_ruby opts
-        return if OS.windows?
+        return if Hobo.windows?
 
         advice = <<-EOF
 The ordering of your system paths may cause a problem with Gems.

data/lib/hobo/lib/host_check/vagrant.rb

@@ -1,9 +1,8 @@
-require 'semantic'
-
 module Hobo
   module Lib
     module HostCheck
       def vagrant_version opts
+        require 'semantic'
         begin
           version = shell "vagrant --version", :capture => true
           version.gsub!(/^Vagrant /, '')

data/lib/hobo/lib/s3/sync.rb

@@ -1,6 +1,3 @@
-require 'aws-sdk'
-require 'fileutils'
-
 module Hobo
   module Lib
     module S3
@@ -8,6 +5,8 @@ module Hobo
         include Hobo::Logging
 
         def initialize opts = {}
+          require 'aws-sdk'
+
           @opts = {
             :access_key_id => nil,
             :secret_access_key => nil,

data/lib/hobo/lib/seed/replacer.rb

@@ -1,5 +1,3 @@
-require 'find'
-
 module Hobo
   module Lib
     module Seed
@@ -20,6 +18,7 @@ module Hobo
         private
 
         def search_replace(path, tokens, &block)
+          require 'find'
           files = []
           excludes = Regexp.new(EXCLUDES.join("|"))
           Find.find(path) do |candidate|

data/lib/hobo/lib/seed/seed.rb

@@ -1,5 +1,3 @@
-require 'tempfile'
-
 module Hobo
   module Lib
     module Seed
@@ -23,10 +21,11 @@ module Hobo
             Hobo::Helper.shell "git clone . #{tmp_path}"
           end
 
-          Hobo.ui.success "Exporting seed submodules"
-
           Dir.chdir tmp_path do
-            Hobo::Helper.shell "git submodule update --init"
+            Hobo.ui.success "Cloning submodules"
+            Hobo::Helper.shell "git submodule update --init", :realtime => true, :indent => 2
+
+            Hobo.ui.success "Exporting seed"
             Hobo::Helper.shell "git archive master | tar -x -C #{path.shellescape}"
 
             # Export submodules
@@ -36,6 +35,7 @@ module Hobo
               matches = line.match /^\s*[a-z0-9]+ (.+) \(.*\)/
               next unless matches
               submodule_path = matches[1]
+              Hobo.ui.success "Exporting '#{submodule_path}' seed submodule"
               Hobo::Helper.shell "cd #{tmp_path}/#{submodule_path.shellescape} && git archive HEAD | tar -x -C #{path}/#{submodule_path.shellescape}"
             end
           end
@@ -49,7 +49,8 @@ module Hobo
           if File.exists? File.join(@seed_path, 'HEAD')
             Dir.chdir @seed_path do
               logger.info "Updating seed in #{@seed_path}"
-              Hobo::Helper.shell 'git', 'fetch', '--all'
+              # Need to be specific here as GH for windows adds an invalid "upstream" remote to all repos
+              Hobo::Helper.shell 'git', 'fetch', 'origin'
             end
           else
             logger.info "Cloning seed from #{@url} to #{@seed_path}"

data/lib/hobo/lib/vm/command.rb

@@ -37,6 +37,7 @@ module Hobo
         # TODO Migrate all vm_shell functionality this direction
         def run
           return if @command.nil?
+          require 'net/ssh/simple'
           opts = @@vm_inspector.ssh_config.merge(@opts)
 
           Net::SSH::Simple.sync do

data/lib/hobo/lib/vm/inspector.rb

@@ -16,10 +16,10 @@ module Hobo
 
             locator_file = File.basename(tmp.path)
 
-            pattern = OS.windows? ? 'vboxsf' : Hobo.project_path.shellescape
+            pattern = Hobo.windows? ? 'vboxsf' : Hobo.project_path.shellescape
 
             sed = 's/.* on \(.*\) type.*/\1\/%%/g'.gsub('%%', locator_file)
-            locator_results = VmCommand.new(
+            locator_results = Command.new(
                 "mount | grep #{pattern} | sed -e\"#{sed}\" | xargs md5sum",
                 :capture => true,
                 :pwd => '/'

data/lib/hobo/logging.rb

@@ -1,5 +1,3 @@
-require 'logger'
-
 module Hobo
   class << self
     attr_accessor :logger

data/lib/hobo/patches/deepstruct.rb

@@ -1,5 +1,3 @@
-require 'deepstruct'
-
 # Copied from the DeepStruct gem
 # Modified to return Null on unknown key
 module DeepStruct

data/lib/hobo/patches/rake.rb

@@ -1,5 +1,3 @@
-require 'rake'
-
 module Rake
   class Task
     attr_accessor :opts

data/lib/hobo/patches/slop.rb

@@ -1,5 +1,3 @@
-require 'slop'
-
 class Slop
   attr_accessor :long_desc, :arg_list, :hidden, :desc, :unparsed
 

data/lib/hobo/tasks/assets.rb

@@ -1,5 +1,3 @@
-require 'hobo/lib/s3/sync'
-
 desc "Project asset commands"
 project_only
 namespace :assets do

data/lib/hobo/tasks/deps.rb

@@ -1,11 +1,10 @@
-require 'bundler'
-
 desc "Dependency related tasks"
 hidden true
 namespace :deps do
 
   desc "Install Gem dependencies"
   task :gems do
+    require 'bundler'
     locate "*Gemfile" do
       Hobo.ui.title "Installing Gem dependencies"
       Bundler.with_clean_env do
@@ -66,6 +65,7 @@ namespace :deps do
 
   desc "Install chef dependencies"
   task :chef => [ "deps:gems" ] do
+    require 'bundler'
     locate "*Cheffile" do
       Hobo.ui.title "Installing chef dependencies via librarian"
       Bundler.with_clean_env do

data/lib/hobo/tasks/system/completions.rb

@@ -18,7 +18,7 @@ function __hobo_completion -d "Create hobo completions"
   set -l hobo_cache_file "$cache_dir/$hashed_pwd"
 
   if not test -f "$hobo_cache_file"
-    hobo system completions fish > "$hobo_cache_file"
+    hobo system completions fish --skip-host-checks > "$hobo_cache_file"
   end
 
   cat "$hobo_cache_file"

data/lib/hobo/tasks/vm.rb

@@ -11,7 +11,7 @@ namespace :vm do
     opts = { :realtime => true, :indent => 2 }
     color = Hobo.ui.supports_color? ? '--color' : '--no-color'
 
-    if OS.windows?
+    if Hobo.windows?
       opts[:env] = { 'VAGRANT_HOME' => windows_short(dir) } if ENV['HOME'].match(/\s+/) && !ENV['VAGRANT_HOME']
     end
 

data/lib/hobo/ui.rb

@@ -1,5 +1,3 @@
-require 'highline'
-
 module Hobo
   class << self
     attr_accessor :ui
@@ -38,7 +36,7 @@ module Hobo
     end
 
     def supports_color?
-      return @output_io.tty? unless OS.windows?
+      return @output_io.tty? unless Hobo.windows?
       return (ENV['ANSICON'] || ENV['TERM'] == 'xterm') && @output_io.tty? # ANSICON or MinTTY && output is TTY
     end
 

data/lib/hobo/util.rb

@@ -1,5 +1,3 @@
-require 'ruby-progressbar'
-
 module Hobo
   class << self
 
@@ -14,6 +12,8 @@ module Hobo
     end
 
     def progress file, increment, total, type, opts = {}
+      require 'ruby-progressbar'
+
       opts = {
         :title => File.basename(file),
         :total => total,
@@ -48,5 +48,10 @@ module Hobo
         :secret_access_key => maybe(Hobo.user_config.aws.secret_access_key) || ENV['AWS_SECRET_ACCESS_KEY']
       }
     end
+
+    def windows?
+      require 'rbconfig'
+      !!(RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/)
+    end
   end
 end

data/lib/hobo/version.rb

@@ -1,3 +1,3 @@
 module Hobo
-  VERSION = '0.0.9-rc1'
+  VERSION = '0.0.9-rc2'
 end

data/spec/hobo/cli_spec.rb

@@ -16,7 +16,8 @@ describe Hobo::Cli do
 
     Hobo.ui = double(Hobo::Ui).as_null_object
     help = double(Hobo::HelpFormatter).as_null_object
-    cli = Hobo::Cli.new help: help
+    host_check = double(Hobo::Lib::HostCheck).as_null_object
+    cli = Hobo::Cli.new help: help, host_check: host_check
 
     hobofile = File.read(File.join(File.dirname(__FILE__), '../../Hobofile'))
 
@@ -24,8 +25,6 @@ describe Hobo::Cli do
     FakeFS.activate!
 
     File.write('Hobofile', hobofile)
-
-    double(Hobo::Lib::HostCheck).as_null_object
   end
 
   after do
@@ -102,11 +101,6 @@ describe Hobo::Cli do
     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(test_args(['--non-interactive']))
-  end
-
   it "should show help if no args or opts passed" do
     help.should_receive(:help)
     cli.start(test_args([]))
@@ -153,13 +147,7 @@ describe Hobo::Cli do
   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")
+    Hobo.ui.should_receive(:info).with("'ls' '--help'")
     cli.start ["test", "unparsed", "--", "ls", "--help"]
   end
 

data/spec/hobo/helpers/vm_command_spec.rb

@@ -15,7 +15,7 @@ describe Hobo::Helper do
 
     Hobo.ui = Hobo::Ui.new
 
-    vmi_double = double(Hobo::Helper::VmInspector).as_null_object
+    vmi_double = double(Hobo::Lib::Vm::Inspector).as_null_object
     vmi_double.should_receive(:ssh_config).and_return({
       :ssh_host => 'fakehost',
       :ssh_user => 'fakeuser',
@@ -23,7 +23,7 @@ describe Hobo::Helper do
       :ssh_identity => 'fakeidentity'
     })
 
-    Hobo::Helper::VmCommand.class_eval do
+    Hobo::Lib::Vm::Command.class_eval do
       class_variable_set '@@vm_inspector', vmi_double
     end
   end
@@ -33,18 +33,6 @@ describe Hobo::Helper do
       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", :pwd => '/').to_s.should match /\s-t\s/
-    end
-
-    it "should default to vagrant user" do
-      vm_command("my_command", :pwd => '/').to_s.should match /vagrant@/
-    end
-
-    it "should default to project host name" do
-      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
@@ -55,7 +43,6 @@ describe Hobo::Helper do
 
     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
@@ -76,19 +63,11 @@ describe Hobo::Helper do
 
     it "should not pass user / pass if project config mysql credentials not set" do
       Hobo.project_config = DeepStruct.wrap({})
-<<<<<<< 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(: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

data/spec/hobo/lib/{s3sync_spec.rb → s3/sync_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Hobo::Lib::S3Sync do
+describe Hobo::Lib::S3::Sync do
   before do
     AWS.stub!
   end

data/test_files/vagrant_fail/vagrant

@@ -0,0 +1,2 @@
+#!/bin/bash
+exit 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo-inviqa
 version: !ruby/object:Gem::Version
-  version: 0.0.9.pre.rc1
+  version: 0.0.9.pre.rc2
 platform: ruby
 authors:
 - Mike Simons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -297,6 +297,7 @@ files:
 - features/hobo/help.feature
 - features/hobo/subcommands.feature
 - features/seed/plant.feature
+- features/step_definitions/env.rb
 - features/step_definitions/seed.rb
 - features/support/env.rb
 - hobo.gemspec
@@ -362,7 +363,7 @@ files:
 - spec/hobo/helpers/file_locator_spec.rb
 - spec/hobo/helpers/shell_spec.rb
 - spec/hobo/helpers/vm_command_spec.rb
-- spec/hobo/lib/s3sync_spec.rb
+- spec/hobo/lib/s3/sync_spec.rb
 - spec/hobo/lib/seed/project_spec.rb
 - spec/hobo/lib/seed/replacer_spec.rb
 - spec/hobo/lib/seed/seed_spec.rb
@@ -374,6 +375,7 @@ files:
 - spec/hobo/ui_spec.rb
 - spec/hobo/util_spec.rb
 - spec/spec_helper.rb
+- test_files/vagrant_fail/vagrant
 homepage: ''
 licenses: []
 metadata: {}
@@ -403,6 +405,7 @@ test_files:
 - features/hobo/help.feature
 - features/hobo/subcommands.feature
 - features/seed/plant.feature
+- features/step_definitions/env.rb
 - features/step_definitions/seed.rb
 - features/support/env.rb
 - spec/hobo/asset_applicator_spec.rb
@@ -415,7 +418,7 @@ test_files:
 - spec/hobo/helpers/file_locator_spec.rb
 - spec/hobo/helpers/shell_spec.rb
 - spec/hobo/helpers/vm_command_spec.rb
-- spec/hobo/lib/s3sync_spec.rb
+- spec/hobo/lib/s3/sync_spec.rb
 - spec/hobo/lib/seed/project_spec.rb
 - spec/hobo/lib/seed/replacer_spec.rb
 - spec/hobo/lib/seed/seed_spec.rb