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

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDY4ZDE1ZjE3NGQ0NGY1M2Q5MDRiZjJmMTIwZjA3YTYwOTlmYjIwMQ==
+    ODFmN2E4OWI3NzI5Mzg5ODk2MzY0YmM1MzZlNzQ4YmUyMjEyNDM2MA==
   data.tar.gz: !binary |-
-    YzVlNGM2YTI2OTRlNzNlODYyNjVkZTVjYWI4ZjJjODE4ZGI0MmJjMw==
+    OTIzOGRlNjAzZmVmMjBhYTVhN2VjZDBlMzBlYmI2YmI3OWUxODA0Nw==
 SHA512:
   metadata.gz: !binary |-
-    MjM3NTUzMmQ3NjBmZThjNWI2MDZkZmIzNTFhMDYwZGRmOWE1ZDAxNjFhMjE5
-    ZDA0MjQxNjJiNmNkZmIzYmYyYjE4ZGViNzMyMjMyNTZiYzA1NTc1ODBmMDFj
-    YjlmMmRkZWFhNTdjMDMzN2JlZGE0OTEwMjUyY2YyMTAxNjI5OTk=
+    MjE1ZWJhODFmNWI5NDA2ZTE0ZGQwN2IwMjNiZmE4NmQ3MTczMDlhYmQwZTA1
+    ZmEyNGFmOWExZDc3MTg0NDBiMTRmZDJiNjM5NmQ1NWI1MmMyNTZiNzE4NzVl
+    MGIwMDAxMDU2NTFiODVlNjQ5MTc5OGM1MzRjOTVkNDA5NmY0Zjk=
   data.tar.gz: !binary |-
-    MzkzYWM3ODlkYjYzZDVkN2IwN2M3MTk5MGM5YzM1NzI4OTczNDlmMTE5OTlm
-    OGYxNDQ2YWVhZTViMjI2NzYxZDVjZjRjY2EyNTcyNTNlY2EwODk3M2M3M2Yx
-    NGYwMDA4MDQ5Yjk4ZmIxN2ZkNmZiODIxYjI3MTQ3M2Q4NTRiOTk=
+    ZjEwZjcyNDU2MGI3MjE5OTk2Y2RjYWQ2ZjM0MzYwOGFjZGUxZWFkYzAxNTIy
+    YzdkNjk4MDYzOGIwMzIyZmRiN2RlNmNjZDFmOGFiNDdkNmU0ZjUzYTYwYTE3
+    OGJjYjZiZjFlMGRhYzQ2N2RmOWU1ZTI0MGNkMzU1NjQyNzFmZjU=

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    hobo-inviqa (0.0.10.pre.rc10)
+    hobo-inviqa (0.0.10.pre.rc11)
       aws-sdk (~> 1.34.0)
-      bundler (~> 1.5.2)
+      bundler (>= 1.5.2)
       deepstruct (~> 0.0.5)
       highline (~> 1.6.20)
       net-ssh-simple (~> 1.6.3)
-      nokogiri (= 1.6.1)
       pry (~> 0.9.12)
       rake (~> 10.1.1)
       rake-hooks (~> 1.2.3)
@@ -26,7 +25,7 @@ GEM
     blockenspiel (0.4.5)
     coderay (1.1.0)
     deepstruct (0.0.5)
-    hashie (2.1.0)
+    hashie (2.1.1)
     highline (1.6.21)
     json (1.8.1)
     method_source (0.8.2)

data/Rakefile

@@ -1,5 +1,7 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+ENV['HOBO_BUILD'] = '1'
+
 desc "Build and install"
 task :build_install => [:build, :install]

data/bin/hobo

@@ -3,58 +3,73 @@
 # Hack to allow testing with Aruba (for now)
 $:.push File.expand_path(File.join("..", "..", "lib"), __FILE__)
 
-# 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
+# TODO bundler context detection
+def init_hobo
+  require 'hobo/init/bundler_context' unless $HOBO_BUNDLE_MODE
+  require 'hobo'
 
-require 'hobo/init/bundler_context'
-require 'hobo'
-
-# Default main classes
-error_handler = Hobo::ErrorHandlers::Friendly.new
-Hobo.ui = Hobo::Ui.new
-Hobo.logger = Logger.new(STDOUT)
-Hobo.logger.level = Logger::WARN
-
-# Low level / early arg parsing
-# Anything that can alter ui / logger / cli should be here
-# Early termination args should also go here
-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))
-    Hobo.logger.level = Logger::DEBUG
-  end
+  # Default main classes
+  error_handler = Hobo::ErrorHandlers::Friendly.new
+  Hobo.ui = Hobo::Ui.new
+  Hobo.logger = Logger.new(STDOUT)
+  Hobo.logger.level = Logger::WARN
+
+  # Low level / early arg parsing
+  # Anything that can alter ui / logger / cli should be here
+  # Early termination args should also go here
+  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))
+      Hobo.logger.level = Logger::DEBUG
+    end
+
+    on '--ansi', 'Enable / disable ansi output', :invertable => true do
+      Hobo.ui.use_color self.to_hash[:ansi]
+    end
+
+    on '--log-level=', 'Set log level' do
+      level = self.to_hash[:'log-level'].upcase
+      Hobo.logger.level = Logger.const_get(level) if [ 'DEBUG', 'INFO' ].include? level
+    end
 
-  on '--ansi', 'Enable / disable ansi output', :invertable => true do
-    Hobo.ui.use_color self.to_hash[:ansi]
+    on '--non-interactive', 'Run non-interactively. Defaults will be automatically used where possible.'
+    on '--skip-host-checks', 'Skip host checks'
   end
 
-  on '--log-level=', 'Set log level' do
-    level = self.to_hash[:'log-level'].upcase
-    Hobo.logger.level = Logger.const_get(level) if [ 'DEBUG', 'INFO' ].include? level
+  Hobo.logger.formatter = proc do |severity, datetime, progname, msg|
+    "#{datetime.strftime("%Y-%m-%d %H:%M:%S")}: #{severity}: #{msg}\n"
   end
 
-  on '--non-interactive', 'Run non-interactively. Defaults will be automatically used where possible.'
-  on '--skip-host-checks', 'Skip host checks'
-end
+  opts = slop.to_hash
+  Hobo.ui.interactive = !(opts[:'non-interactive'] == true)
 
-Hobo.logger.formatter = proc do |severity, datetime, progname, msg|
-  "#{datetime.strftime("%Y-%m-%d %H:%M:%S")}: #{severity}: #{msg}\n"
+  begin
+    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
 end
 
-opts = slop.to_hash
-Hobo.ui.interactive = !(opts[:'non-interactive'] == true)
+require 'hobo/patches/rubygems'
+require 'bundler'
 
-begin
-  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)
+# 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
+$HOBO_BUNDLE_MODE = (!!ENV['BUNDLE_GEMFILE'] && Bundler.environment.specs.to_hash['hobo-inviqa'])
+
+if $HOBO_BUNDLE_MODE
+  init_hobo
+else
+  Bundler.with_clean_env do
+    init_hobo
+  end
 end

data/hobo.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   # 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.files         = `git ls-files`.split($/) if ENV['HOBO_BUILD'] == '1'
   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"]
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "highline", "~> 1.6.20"
   spec.add_dependency "rake", "~> 10.1.1"
   spec.add_dependency "rake-hooks", "~> 1.2.3"
-  spec.add_dependency "bundler", "~> 1.5.2"
+  spec.add_dependency "bundler", ">= 1.5.2"
   spec.add_dependency "deepstruct", "~> 0.0.5"
   spec.add_dependency "semantic", "~> 1.3.0"
   spec.add_dependency "aws-sdk", "~> 1.34.0"
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   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"
+  #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

data/lib/hobo/cli.rb

@@ -116,8 +116,14 @@ module Hobo
     end
 
     def perform_host_checks
+      checks = [
+        'vagrant.*',
+        '.*present'
+      ]
+      checks.push 'latest_hobo_version' unless $HOBO_BUNDLE_MODE
+
       @host_check.check(
-        :filter => /vagrant.*|.*present|latest_hobo_version/,
+        :filter => /#{checks.join('|')}/,
         :raise => true
       )
     end
@@ -127,7 +133,7 @@ module Hobo
       slop.on '-h', '--help', 'Display help'
 
       slop.on '-v', '--version', 'Print version information' do
-        Hobo.ui.info "Hobo version #{Hobo::VERSION}"
+        Hobo.ui.info "Hobo version #{Hobo::VERSION}#{" (Bundle mode)" if $HOBO_BUNDLE_MODE}"
         halt
       end
     end

data/lib/hobo/init/bundler_context.rb

@@ -2,22 +2,25 @@
 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}`
+begin
+  Bundler.setup(:default)
+rescue Bundler::GemNotFound => e
+  puts 'Missing dependencies detected!'
+  print 'These will automatically be installed now, please wait'
+  rval = nil
+  IO::popen("bundle install --gemfile=#{ENV['BUNDLE_GEMFILE'].shellescape}") do |io|
+    while line = io.gets
+      print '.'
+    end
+    puts ' done'
+    io.close
+    rval = $?.to_i
+  end
+
+  if rval == 0
     Kernel.exec('hobo', *$HOBO_ARGV)
+  else
+    throw e
   end
-  File.write(bundler_check, Hobo::VERSION)
 end
-
-require 'hobo/patches/rubygems'
-require 'bundler'
-
-Bundler.setup(:default)

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

@@ -5,7 +5,7 @@ module Hobo
         require 'semantic'
         begin
           version = shell "vagrant --version", :capture => true
-          version.gsub!(/^Vagrant /, '')
+          version.gsub!(/^Vagrant[^0-9]+/, '')
           version = ::Semantic::Version.new version.strip
           minimum_version = ::Semantic::Version.new "1.3.5"
 

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

@@ -86,6 +86,9 @@ module Hobo
             Hobo.ui.error "  This can sometimes be caused by missing AWS credentials"
           rescue AWS::S3::Errors::NoSuchBucket
             Hobo.ui.error "  Asset bucket #{Hobo.project_config.asset_bucket} does not exist!"
+          rescue AWS::S3::Errors::AccessDenied
+            Hobo.ui.error "  Your AWS key does not have access to the #{Hobo.project_config.asset_bucket} S3 bucket!"
+            Hobo.ui.error "  Please request access to this bucket from your TTL or via an internal support request"
           rescue AWS::Errors::MissingCredentialsError
             Hobo.ui.warning "  AWS credentials not set!"
             Hobo.ui.warning "  Either set the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY env vars or run `hobo config` to set them jsut for hobo."

data/lib/hobo/tasks/deps.rb

@@ -5,9 +5,12 @@ namespace :deps do
   desc "Install Gem dependencies"
   task :gems do
     locate "*Gemfile" do
-      Hobo.ui.title "Installing Gem dependencies"
-      shell "bundle", "install", realtime: true, indent: 2
-      Hobo.ui.separator
+      required = shell("bundle", "check", :exit_status => true) != 0
+      if required
+        Hobo.ui.title "Installing Gem dependencies"
+        shell "bundle", "install", realtime: true, indent: 2
+        Hobo.ui.separator
+      end
     end
   end
 
@@ -62,7 +65,6 @@ 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"
       bundle_shell "librarian-chef", "install", "--verbose", :realtime => true, :indent => 2 do |line|

data/lib/hobo/tasks/vm.rb

@@ -63,9 +63,12 @@ namespace :vm do
   desc "Start VM without provision"
   task :start => [ "deps:gems", "deps:chef", "deps:vagrant_plugins" ] do
     vagrantfile do
-      Hobo.ui.title "Starting vagrant VM"
-      vagrant_exec 'up', '--no-provision'
-      Hobo.ui.separator
+      state = shell("vagrant --machine-readable status | grep ,state, | cut -d, -f4", :capture => true).strip
+      unless state == 'running'
+        Hobo.ui.title "Starting vagrant VM"
+        vagrant_exec 'up', '--no-provision'
+        Hobo.ui.separator
+      end
     end
   end
 

data/lib/hobo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo-inviqa
 version: !ruby/object:Gem::Version
-  version: 0.0.10.pre.rc10
+  version: 0.0.10.pre.rc11
 platform: ruby
 authors:
 - Mike Simons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -70,14 +70,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
@@ -178,20 +178,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.12
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
 description: Inviqan toolbelt
 email:
 - msimons@inviqa.com