hobo in hobo-inviqa-0.0.10.pre.rc10

- old
+ new

@@ -1,21 +1,17 @@
 #!/usr/bin/env ruby
 
 # Hack to allow testing with Aruba (for now)
 $:.push File.expand_path(File.join("..", "..", "lib"), __FILE__)
 
-# Hack to override Gemfile to that of hobo (otherwise it'll use project specific one!)
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-require 'hobo/patches/rubygems'
-require 'bundler'
-Bundler.setup(:default)
-
 # Suppress Net/SSH/Simple warning on windows
+# Note that $HOBO_ARGV is used as an indicator in the gemspec as to whether it needs to build a filelist
+#   Removing it or moving it after the bundler setup will cause "fatal: Not a git repository" errors
 $SUPPRESS_32BIT_WARNING=1
-
 $HOBO_ARGV = ARGV
 
+require 'hobo/init/bundler_context'
 require 'hobo'
 
 # Default main classes
 error_handler = Hobo::ErrorHandlers::Friendly.new
 Hobo.ui = Hobo::Ui.new
@@ -43,20 +39,21 @@
     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.'
+  on '--skip-host-checks', 'Skip host checks'
 end
 
 Hobo.logger.formatter = proc do |severity, datetime, progname, msg|
   "#{datetime.strftime("%Y-%m-%d %H:%M:%S")}: #{severity}: #{msg}\n"
 end
 
 opts = slop.to_hash
 Hobo.ui.interactive = !(opts[:'non-interactive'] == true)
 
 begin
-  Hobo::Lib::HostCheck.check(:filter => /not_using_system_ruby/, :raise => true)
+  Hobo::Lib::HostCheck.check(:filter => /not_using_system_ruby/, :raise => true) unless opts[:'skip-host-checks']
   Hobo.cli = Hobo::Cli.new(slop: slop)
   Hobo.cli.start
 rescue Exception => error
   exit error_handler.handle(error)
 end