builderator 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ba96400e257cab5d027e0660517fc8f9a441e7
-  data.tar.gz: 96427250ed38ca68e25c15e9929688a5b8b0eabd
+  metadata.gz: 4be75ea4f2312a202b61cde466231fb1199ec69b
+  data.tar.gz: cac52d00a1baffa7f896163ea2521bf33549df17
 SHA512:
-  metadata.gz: f805d125bf84917a960d10f53b26d34b2ba12553ee82385e45b2879ba21bfa58ce7b55d3519bf85b54ee99a060f20becda48b848d824431a402e6cde918b97b1
-  data.tar.gz: ea3ad354a1a0a9e37e7fab78cdb8b491d5010c2db4d374c7bd821f4fb2579a119dceba437938fab90f50ecd435bb7588a9b04ead36ddacb0565318da20e36dd8
+  metadata.gz: 0f35cc3cdc9c58b7af961b94fb4c4c27d839808e0bed7f5b65e9c277949b31ecb6ece6cc95fa0d7029bc4355cd79c628a3a417a37c6661609d44d6f3ab2ab6de
+  data.tar.gz: a2e37ccb5da6048e08c9f3f078dc5ad2437aeb7dc59f07b39274b27f323813b60b1b122a498552b105910f71de6019cd5fdebd01aa4f1c94624a423b04ccc417

data/Gemfile.lock

@@ -5,6 +5,7 @@ PATH
       aws-sdk (~> 2.0)
       berkshelf (~> 4.3)
       chef (~> 12.5)
+      childprocess (~> 0.5)
       dep_selector (~> 1.0)
       faraday_middleware (~> 0.10.0)
       ignorefile
@@ -15,12 +16,12 @@ GEM
   specs:
     addressable (2.4.0)
     ast (2.3.0)
-    aws-sdk (2.3.14)
-      aws-sdk-resources (= 2.3.14)
-    aws-sdk-core (2.3.14)
+    aws-sdk (2.4.3)
+      aws-sdk-resources (= 2.4.3)
+    aws-sdk-core (2.4.3)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.14)
-      aws-sdk-core (= 2.3.14)
+    aws-sdk-resources (2.4.3)
+      aws-sdk-core (= 2.4.3)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -57,41 +58,43 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.7.2)
-      chef-config (= 12.7.2)
-      chef-zero (~> 4.5)
+    chef (12.5.1)
+      chef-config (= 12.5.1)
+      chef-zero (~> 4.2, >= 4.2.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
-      mixlib-authentication (~> 1.4)
+      mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
-      net-ssh (>= 2.9, < 4.0)
+      net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.1.0)
-      proxifier (~> 1.0)
-      rspec-core (~> 3.4)
-      rspec-expectations (~> 3.4)
-      rspec-mocks (~> 3.4)
+      pry (~> 0.9)
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-      uuidtools (~> 2.1.5)
-    chef-config (12.7.2)
+    chef-config (12.5.1)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (4.6.2)
+    chef-zero (4.8.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
-      rack
+      rack (< 2)
       uuidtools (~> 2.1)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
     cleanroom (1.0.0)
-    dep-selector-libgecode (1.2.0)
+    coderay (1.1.1)
+    dep-selector-libgecode (1.3.0)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
@@ -101,8 +104,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.10)
-    ffi-yajl (2.2.3)
+    ffi (1.9.14)
+    ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
     hashie (3.4.4)
     highline (1.7.8)
@@ -110,16 +113,16 @@ GEM
     httpclient (2.7.2)
     ignorefile (1.1.0)
     ipaddress (0.8.3)
-    jmespath (1.2.4)
-      json_pure (>= 1.8.1)
-    json (1.8.3)
-    json_pure (1.8.3)
+    jmespath (1.3.1)
+    json (2.0.2)
     libyajl2 (1.2.0)
+    method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-archive (0.1.0)
+    mixlib-archive (0.2.0)
+      mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
-    mixlib-cli (1.6.0)
+    mixlib-cli (1.7.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
     mixlib-shellout (2.2.6)
@@ -128,7 +131,7 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
+    net-ssh (2.9.4)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -138,7 +141,7 @@ GEM
     nio4r (1.2.1)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    ohai (8.16.0)
+    ohai (8.17.1)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -154,12 +157,15 @@ GEM
       ast (~> 2.2)
     plist (3.1.0)
     powerpack (0.1.1)
-    proxifier (1.0.3)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.6.4)
     rainbow (2.1.0)
     rake (10.5.0)
-    retryable (2.0.3)
-    ridley (4.5.1)
+    retryable (2.0.4)
+    ridley (4.6.0)
       addressable
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
@@ -177,27 +183,27 @@ GEM
       retryable (~> 2.0)
       semverse (~> 1.1)
       varia_model (~> 0.4.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
+      rspec-support (~> 3.5.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.4.1)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -213,10 +219,11 @@ GEM
       rspec-its
       specinfra (~> 2.53)
     sfl (2.2)
+    slop (3.6.0)
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    specinfra (2.59.0)
+    specinfra (2.60.2)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
@@ -229,7 +236,7 @@ GEM
       thor
     timers (4.0.4)
       hitimes
-    unicode-display_width (1.0.5)
+    unicode-display_width (1.1.0)
     uuidtools (2.1.5)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.1.9

data/builderator.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aws-sdk', '~> 2.0'
   spec.add_dependency 'berkshelf', '~> 4.3'
+  spec.add_dependency 'childprocess', '~> 0.5'
   spec.add_dependency 'dep_selector', '~> 1.0'
   spec.add_dependency 'chef', '~> 12.5'
   spec.add_dependency 'faraday_middleware', '~> 0.10.0'

data/lib/builderator/config/file.rb

@@ -256,6 +256,7 @@ module Builderator
             attribute :availability_zone
             attribute :subnet_id
             attribute :private_ip_address
+            attribute :tags, :type => :hash
 
             attribute :instance_type
             attribute :security_groups, :type => :list

data/lib/builderator/patch/thor-actions.rb

@@ -1,3 +1,5 @@
+require 'bundler'
+require 'childprocess'
 require 'thor/actions'
 
 require_relative '../util'
@@ -39,6 +41,46 @@ class Thor
       end
     end
 
+    ##
+    # Run an external command without bundler's injected environment variables
+    # (e.g. keep vagrant happy in it's own little vendor full of unicorns)
+    ##
+    def run_without_bundler(command, config = {})
+      destination = relative_to_original_destination_root(destination_root, false)
+      desc = "#{command} from #{destination.inspect}"
+
+      if config[:with]
+        desc = "#{File.basename(config[:with].to_s)} #{desc}"
+        command = "#{config[:with]} #{command}"
+      end
+
+      say_status :run, desc, config.fetch(:verbose, true)
+      return if options[:pretend]
+
+      output = config.fetch(:stdout, STDOUT)
+
+      Bundler.with_clean_env do
+        if config.fetch(:childprocess, false)
+          process = ChildProcess.build(*command.split(' '))
+          process.io.inherit!
+
+          process.start
+          process.wait
+          return process.exit_code
+        end
+
+        IO.popen(command, 'r+') do |io|
+          ## Stream output
+          loop do
+            break if io.eof?
+
+            output.write(io.readpartial(4096))
+            output.flush
+          end
+        end
+      end
+    end
+
     ##
     # Make `template` load from a sane path and render in the context of Config
     ##

data/lib/builderator/tasks/vagrant.rb

@@ -3,6 +3,8 @@ require 'thor'
 require_relative '../interface/vagrant'
 require_relative '../patch/thor-actions'
 
+require_relative './berkshelf'
+
 module Builderator
   module Tasks
     ##
@@ -32,7 +34,8 @@ module Builderator
           command << " up --provider=#{Config.profile.current.vagrant.local.provider} "
           command << args.join(' ')
 
-          run command
+          return run(command) if Interface.vagrant.bundled?
+          run_without_bundler command
         end
       end
 
@@ -45,7 +48,8 @@ module Builderator
           command << " up --provider=#{Config.profile.current.vagrant.ec2.provider} "
           command << args.join(' ')
 
-          run command
+          return run(command) if Interface.vagrant.bundled?
+          run_without_bundler command
         end
       end
 
@@ -53,11 +57,15 @@ module Builderator
       def provision(profile = :default, *args)
         invoke :configure, [profile], options
 
+        invoke Berkshelf, :vendor, [], options
+        invoke :rsync, [profile], options
+
         inside Interface.vagrant.directory do
           command = Interface.vagrant.command
           command << " provision #{args.join(' ')}"
 
-          run command
+          return run(command) if Interface.vagrant.bundled?
+          run_without_bundler command
         end
       end
 
@@ -69,7 +77,8 @@ module Builderator
           command = Interface.vagrant.command
           command << " status #{args.join(' ')}"
 
-          run command
+          return run(command) if Interface.vagrant.bundled?
+          run_without_bundler command
         end
       end
 
@@ -81,8 +90,21 @@ module Builderator
           command = Interface.vagrant.command
           command << " ssh #{args.join(' ')}"
 
-          ## Connect to subprocesses STDIO
-          exec(command)
+          return run(command) if Interface.vagrant.bundled?
+          run_without_bundler command, :childprocess => true
+        end
+      end
+
+      desc 'rsync [PROFILE [ARGS ...]]', 'Sync resources to Vagrant VM(s)'
+      def rsync(profile = :default, *args)
+        invoke :configure, [profile], options
+
+        inside Interface.vagrant.directory do
+          command = Interface.vagrant.command
+          command << " rsync #{args.join(' ')}"
+
+          return run(command) if Interface.vagrant.bundled?
+          run_without_bundler command
         end
       end
 
@@ -96,7 +118,8 @@ module Builderator
           command << " destroy #{args.join(' ')}"
           command << ' -f' if options['force']
 
-          run command
+          return run(command) if Interface.vagrant.bundled?
+          run_without_bundler command
         end
       end
 
@@ -122,7 +145,8 @@ module Builderator
           command << " plugin install #{ pname }"
           command << " --plugin-version #{ plugin.version }" if plugin.has?(:version)
 
-          run command
+          return run(command) if Interface.vagrant.bundled?
+          run_without_bundler command
         end
       end
     end

data/rvm.env

@@ -1,14 +1,14 @@
-declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-0"
-declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-0:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
+declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2"
+declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
 declare -x HOME="/home/jenkins"
-declare -x HUDSON_COOKIE="9f5b176e-8e17-4db0-9dd4-67911f3f1a9c"
+declare -x HUDSON_COOKIE="de7bb2fb-26ab-4c83-96e0-e90cece37be6"
 declare -x IRBRC="/home/jenkins/.rvm/rubies/ruby-2.1.5/.irbrc"
 declare -x LANG="en_US.UTF-8"
 declare -x LC_ALL="en_US.UTF-8"
 declare -x MY_RUBY_HOME="/home/jenkins/.rvm/rubies/ruby-2.1.5"
 declare -x NLSPATH="/usr/dt/lib/nls/msg/%L/%N.cat"
 declare -x OLDPWD
-declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-0/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
+declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
 declare -x PWD="/home/jenkins/workspace/gem-public-builderator-master"
 declare -x RUBY_VERSION="ruby-2.1.5"
 declare -x SHLVL="1"
@@ -48,6 +48,6 @@ declare -x rvm_sticky_flag
 declare -x rvm_system_flag
 declare -x rvm_use_flag
 declare -x rvm_user_flag
-declare -x rvm_version="1.26.9 (1.26.9)"
+declare -x rvm_version="1.27.0 (1.27.0)"
 declare -x rvm_wrapper_name
 declare -x rvmsudo_secure_path="1"

data/template/Vagrantfile.erb

@@ -35,6 +35,7 @@ Vagrant.configure('2') do |config|
     ec2.iam_instance_profile_arn = '<%= profile.current.vagrant.ec2.iam_instance_profile_arn %>'
 
     ec2.ami = '<%= profile.current.vagrant.ec2.source_ami %>'
+    ec2.tags = <%= profile.current.vagrant.ec2.tags %>
   end
 
   # config.vm.network :forwarded_port, :host => 9200, :guest => 9200

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: dep_selector
   requirement: !ruby/object:Gem::Requirement