builderator 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41c837996139c2caf0e0d243fc3fca3aaee1104f
-  data.tar.gz: '0097d382431ab9d0c461b95cbfee4648b7c8fe98'
+  metadata.gz: 13b532b123dc6f16f2ee5e0745fe8cce7b017796
+  data.tar.gz: 8e9a775c7957c148d800722292a02e1d3522b93c
 SHA512:
-  metadata.gz: '083437ac7c570f71e9af19a2d63bed22c39e8d9486c06ca95e3c3924e4772058eded19d5f1585c1bb8e8c7abbc711e161216aa96cca94989aa23ff56830d8c34'
-  data.tar.gz: 8fea96556083b8b4ff137210124031292702c75db1980bfc2c30598b71efc242f66de7547d7b60f9e8eb5fd05d589b9f4a3aab1eb3c81f5ae7c4596a9c1a4745
+  metadata.gz: bd75b03cc02eb3ed839a6e296234a08a2cb6988f8e0a87435c273d6616197e01f2e67d606816170827eb994168add38d033de61f356b1b1df617c40bbe5384be
+  data.tar.gz: 7743193cdbfbacd0b27abb7328c7ad433787dbf0ad2e9000f867d5c34c2a991ce7e07eca24f927690346c1e420ece1185de1a8100a00284e31c87ffcb9bcef7d

data/lib/builderator/config/defaults.rb

@@ -74,6 +74,11 @@ module Builderator
 
             build.ssh_username 'ubuntu'
 
+            # Packer default is 300 seconds.  Specify as a string to give units
+            # such as s (seconds), ms (milliseconds), ns (nanoseconds), etc.
+            # Ints will be interpreted as ns.  Buyer beware.
+            build.ssh_timeout '300s'
+
             build.ami_name [Config.build_name, Config.version, Config.build_number].reject(&:nil?).join('-')
             build.ami_description Config.description
           end

data/lib/builderator/config/file.rb

@@ -252,6 +252,7 @@ module Builderator
 
             ## Access parameters
             attribute :ssh_username
+            attribute :ssh_timeout
             attribute :ssh_keypair_name
             attribute :ssh_private_key_file
             attribute :ssh_private_ip
@@ -315,6 +316,7 @@ module Builderator
             attribute :user_data
 
             attribute :ssh_username
+            attribute :ssh_timeout
             attribute :keypair_name
             attribute :private_key_path
 

data/lib/builderator/interface/packer.rb

@@ -158,12 +158,20 @@ module Builderator
           :environments_path => Config.local.environment_path,
           :chef_environment => Config.profile.current.chef.environment,
           :json => Config.profile.current.chef.node_attrs,
+          :staging_directory => Config.chef.staging_directory,
+          :execute_command => _chef_execute_command(true),
+          :install_command => _chef_install_command(true)
         }
       end
 
+      def _chef_execute_command(sudo = true)
+        template = sudo ? 'sudo ' : ''
+        "#{template}chef-solo --no-color -c #{Config.chef.staging_directory}/solo.rb -j #{Config.chef.staging_directory}/node.json"
+      end
+
       def _chef_install_command(sudo = true)
-        template = sudo ? 'sudo' : ''
-        format("curl -L https://www.chef.io/chef/install.sh | %s bash -s -- -v #{Config.chef.version}", template)
+        template = sudo ? 'sudo ' : ''
+        "curl -L https://www.chef.io/chef/install.sh | #{template}bash -s -- -v #{Config.chef.version}"
       end
     end
   end

data/lib/builderator/tasks/packer.rb

@@ -31,7 +31,7 @@ module Builderator
       desc 'build [PROFILE=default *ARGS]', 'Run a build with the installed version of packer'
       def build(profile = :default, *args)
         invoke :configure, [profile], options
-        run_with_input "#{Interface.packer.command} build - #{ args.join('') }", Interface.packer.render
+        run_with_input "#{Interface.packer.command} build #{options['debug'] ? '-debug -on-error=abort' : ''} - #{args.join('')}", Interface.packer.render
       end
 
       desc 'copy PROFILE', 'Copy AMIs generated by packer to other regions'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: thor-scmversion
   requirement: !ruby/object:Gem::Requirement