hobo-inviqa 0.0.10.pre.rc9 → 0.0.10.pre.rc10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTZmMTNkODk0NmUzMmUxMzc3MWVmMmQ2YTJiZjMzNzZmODIxYmI0OQ==
+    ZDY4ZDE1ZjE3NGQ0NGY1M2Q5MDRiZjJmMTIwZjA3YTYwOTlmYjIwMQ==
   data.tar.gz: !binary |-
-    YjcxZTYyNDUyY2NkOWZiN2NiNjUwYTYzMTYyN2QxZDc2YjUxNDAzOA==
+    YzVlNGM2YTI2OTRlNzNlODYyNjVkZTVjYWI4ZjJjODE4ZGI0MmJjMw==
 SHA512:
   metadata.gz: !binary |-
-    ODA0YTE0ZDhkNGJjNWE5YzJjZGQ5OGQwNWJmOGY5M2ZhMmIzZmQxY2Q1MWVl
-    OGMzYWJhOGM1ZDg0OTFiMzVmZDY2ZWIxZWM3MTVjMWUxYWRjNGFjMjBmODYy
-    YzQxMmViZmIxMjM3YTJkMGQwMWJjY2MxOWVkMjFlYzA4ZGYwNjk=
+    MjM3NTUzMmQ3NjBmZThjNWI2MDZkZmIzNTFhMDYwZGRmOWE1ZDAxNjFhMjE5
+    ZDA0MjQxNjJiNmNkZmIzYmYyYjE4ZGViNzMyMjMyNTZiYzA1NTc1ODBmMDFj
+    YjlmMmRkZWFhNTdjMDMzN2JlZGE0OTEwMjUyY2YyMTAxNjI5OTk=
   data.tar.gz: !binary |-
-    OGVmMDZkZDU2MWVhOWI3ZjQwZWQ5MTM1MWM2ZjkyNTcxMDgxYzJjMGIzMzFk
-    OGQ4OTVjZWMzOTdiMjAzODVmOGEwZDc5Y2MzYTZjYjVlMzhjMDFmYWU5NTg0
-    N2MwYzM3NTE2OTE0MTE4ODZjMTEyYWYwZDgyNGI5NDBkZWEyM2E=
+    MzkzYWM3ODlkYjYzZDVkN2IwN2M3MTk5MGM5YzM1NzI4OTczNDlmMTE5OTlm
+    OGYxNDQ2YWVhZTViMjI2NzYxZDVjZjRjY2EyNTcyNTNlY2EwODk3M2M3M2Yx
+    NGYwMDA4MDQ5Yjk4ZmIxN2ZkNmZiODIxYjI3MTQ3M2Q4NTRiOTk=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hobo-inviqa (0.0.10.pre.rc9)
+    hobo-inviqa (0.0.10.pre.rc10)
       aws-sdk (~> 1.34.0)
       bundler (~> 1.5.2)
       deepstruct (~> 0.0.5)

data/bin/hobo

@@ -3,17 +3,13 @@
 # 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
@@ -45,6 +41,7 @@ slop = Slop.parse! do
   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|
@@ -55,7 +52,7 @@ 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

data/hobo.gemspec

@@ -13,7 +13,9 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Inviqan toolbelt}
   spec.homepage      = ""
 
-  spec.files         = `git ls-files`.split($/)
+  # This file will get interpretted at runtime due to Bundler.setup
+  # Without the $HOBO_ARGV check (set in bin/hobo) fatal: not a git repository errors show up
+  spec.files         = `git ls-files`.split($/) unless $HOBO_ARGV
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -30,8 +32,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "teerb", "~> 0.0.1"
   spec.add_dependency "net-ssh-simple", "~> 1.6.3"
   spec.add_dependency "pry", "~> 0.9.12"
+
+  # Not actually a dep! gem insists on installing 1.6.2.rc2 however!
   spec.add_dependency "nokogiri", "= 1.6.1"
 
+  # This prevents Bundler.setup from complaining that rubygems did not install dev deps
+  # If you want to run dev deps you need to ensure HOBO_ENV=dev is set for bundle install & bundle exec
   if ENV['HOBO_ENV'] == 'dev'
     spec.add_development_dependency "aruba", "~> 0.5.4"
     spec.add_development_dependency "rspec", "~> 2.14.1"

data/lib/hobo.rb

@@ -65,4 +65,4 @@ require 'hobo/lib/host_check/hobo'
 require 'hobo/lib/host_check'
 
 # App
-require 'hobo/cli'
+require 'hobo/cli'

data/lib/hobo/cli.rb

@@ -69,7 +69,7 @@ module Hobo
       return 0
     end
 
-    # Displat help and exit
+    # Display help and exit
     # @param [Hash] Options to apss to help formatter.
     # Options are mostly used for filtering
     def show_help(opts = {})
@@ -125,7 +125,6 @@ module Hobo
     def define_global_opts slop
       slop.on '-a', '--all', 'Show hidden commands'
       slop.on '-h', '--help', 'Display help'
-      slop.on '--skip-host-checks', 'Skip host checks'
 
       slop.on '-v', '--version', 'Print version information' do
         Hobo.ui.info "Hobo version #{Hobo::VERSION}"

data/lib/hobo/init/bundler_context.rb

@@ -0,0 +1,23 @@
+# Hack to override Gemfile to that of hobo (otherwise it'll use project specific one!)
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'shellwords'
+require 'hobo/version'
+
+# gem install != bundle install
+# Gem may well skip some deps that bundler wants
+bundler_check = File.join(ENV['HOME'], '.hobo', 'bundler_check')
+unless File.exists?(bundler_check) && File.read(bundler_check).strip == Hobo::VERSION
+  `bundle check --gemfile=#{ENV['BUNDLE_GEMFILE'].shellescape}`
+  unless $?.success?
+    puts "Hobo has detected missing dependencies. Please wait while they're installed"
+    `bundle install --gemfile=#{ENV['BUNDLE_GEMFILE'].shellescape}`
+    Kernel.exec('hobo', *$HOBO_ARGV)
+  end
+  File.write(bundler_check, Hobo::VERSION)
+end
+
+require 'hobo/patches/rubygems'
+require 'bundler'
+
+Bundler.setup(:default)

data/lib/hobo/lib/host_check.rb

@@ -3,7 +3,6 @@ module Hobo
     module HostCheck
       class << self
         include Hobo::Lib::HostCheck
-
         def check opts = {}
           opts = {
             :filter => nil,

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

@@ -6,7 +6,7 @@ module Hobo
         begin
           version = shell "vagrant --version", :capture => true
           version.gsub!(/^Vagrant /, '')
-          version = ::Semantic::Version.new version
+          version = ::Semantic::Version.new version.strip
           minimum_version = ::Semantic::Version.new "1.3.5"
 
           advice = <<-EOF

data/lib/hobo/tasks/deps.rb

@@ -4,7 +4,6 @@ namespace :deps do
 
   desc "Install Gem dependencies"
   task :gems do
-    require 'bundler'
     locate "*Gemfile" do
       Hobo.ui.title "Installing Gem dependencies"
       shell "bundle", "install", realtime: true, indent: 2

data/lib/hobo/tasks/vm.rb

@@ -19,9 +19,7 @@ namespace :vm do
     args.push color
     args.push opts
 
-    Bundler.with_clean_env do
-      shell *args
-    end
+    shell *args
   end
 
   def windows_short dir

data/lib/hobo/version.rb

@@ -1,3 +1,3 @@
 module Hobo
-  VERSION = '0.0.10-rc9'
+  VERSION = '0.0.10-rc10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo-inviqa
 version: !ruby/object:Gem::Version
-  version: 0.0.10.pre.rc9
+  version: 0.0.10.pre.rc10
 platform: ruby
 authors:
 - Mike Simons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -233,6 +233,7 @@ files:
 - lib/hobo/helper/http_download.rb
 - lib/hobo/helper/shell.rb
 - lib/hobo/helper/vm_command.rb
+- lib/hobo/init/bundler_context.rb
 - lib/hobo/lib/host_check.rb
 - lib/hobo/lib/host_check/deps.rb
 - lib/hobo/lib/host_check/git.rb