builderator 1.0.0.pre.rc.11 → 1.0.0.pre.rc.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf1ff4752407eced7f1dd5c07af238d24c41280
-  data.tar.gz: ccb0ad24f980d175184137da45db73ed444b14ab
+  metadata.gz: c2184d9659c752e4065a951a7595f97100ee3c2a
+  data.tar.gz: d9a1df4bacc66c29925fa806a09a60a2994aa848
 SHA512:
-  metadata.gz: 01a1036f93281154e9ca3a667662b831ef984f8c86c3e4c3329b20922879f470dc33af2480eab8cf86ab59e0f7a91325ef8b5a3f054c25faa04be55b9795565c
-  data.tar.gz: b46a4d1cdc6f8072fbd0cc086b815a207aef4c3bb5115d82c69f4ead25cd0ab64c91237f6a25cd0fbc60fa7232d137ef77b486b2b43da6379f3301a88eaca86b
+  metadata.gz: 1cafe2ac4672a9a9abeca0512fd083993d0df5c7ab425bda592e25b1e3c3f930d1f2a48bc6be7dff90878a8a0b07d632314f7b5573114250fa3657880d85b17b
+  data.tar.gz: 316460b33e0eb304a4e974282e4305a0a1239b9b8e36d3c4cedb35fe37399b79a604c0ccf06428871a392dc9169a0259e18db610572c8e7d5cfc068a8c287f32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    builderator (1.0.0.pre.rc.10)
+    builderator (1.0.0.pre.rc.11)
       aws-sdk (~> 2.0)
       berkshelf (~> 3.2)
       chef (~> 12.0)
@@ -16,12 +16,12 @@ GEM
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    aws-sdk (2.2.24)
-      aws-sdk-resources (= 2.2.24)
-    aws-sdk-core (2.2.24)
+    aws-sdk (2.2.26)
+      aws-sdk-resources (= 2.2.26)
+    aws-sdk-core (2.2.26)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.24)
-      aws-sdk-core (= 2.2.24)
+    aws-sdk-resources (2.2.26)
+      aws-sdk-core (= 2.2.26)
     berkshelf (3.3.0)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 1.2)
@@ -56,8 +56,9 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.7.2)
-      chef-config (= 12.7.2)
+    chef (12.8.1)
+      bundler (>= 1.10)
+      chef-config (= 12.8.1)
       chef-zero (~> 4.5)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -80,7 +81,7 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (12.7.2)
+    chef-config (12.8.1)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-zero (4.5.0)
@@ -136,7 +137,7 @@ GEM
     nio4r (1.2.1)
     octokit (3.8.0)
       sawyer (~> 0.6.0, >= 0.5.3)
-    ohai (8.10.0)
+    ohai (8.12.0)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -145,6 +146,7 @@ GEM
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 2.0)
+      plist
       rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
@@ -206,16 +208,16 @@ GEM
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.2.1)
-    serverspec (2.30.1)
+    serverspec (2.31.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.48)
+      specinfra (~> 2.53)
     sfl (2.2)
     solve (1.2.1)
       dep_selector (~> 1.0)
       semverse (~> 1.1)
-    specinfra (2.53.0)
+    specinfra (2.53.1)
       net-scp
       net-ssh (>= 2.7, < 3.1)
       net-telnet

data/VERSION

@@ -1 +1 @@
-1.0.0-rc.11
+1.0.0-rc.12

data/docs/versioning.md

@@ -53,7 +53,7 @@ SCM providers must extend the `Builderator::Control::Version::SCM` module, and m
   - `:tags` `nil` or an array of semver strings
 * `self.supported?` Return `true` if the provider supports the build environment (e.g. the `Git` provider checks that `pwd` is a git repository), else return `false`.
 
-To enable a provider module, pass it to `SCM.register`. See [blob/auto-version/lib/builderator/control/version/git.rb] for an example.
+To enable a provider module, pass it to `SCM.register`. See [Builderator::Control::Version::Git](blob/auto-version/lib/builderator/control/version/git.rb) for an example.
 
 ## This looks like `thor-scmversion`
 

data/lib/builderator/interface/packer.rb

@@ -24,9 +24,16 @@ module Builderator
           :provisioners => []
         }.tap do |json|
           Config.profile.current.packer.build.each do |_, build|
-            json[:builders] << build.to_hash.tap do |b|
+            build_hash = build.to_hash.tap do |b|
               b[:tags] = Config.profile.current.tags
             end
+
+            ## Support is missing for several regions in some versions of Packer
+            # Moving this functionality into a task until we can confirm that Packer
+            # has full support again.
+            build_hash.delete(:ami_regions)
+
+            json[:builders] << build_hash
           end
 
           ## Initialize the staging directory

data/lib/builderator/tasks.rb

@@ -86,8 +86,10 @@ module Builderator
       # Helper/utility commands
       ##
       desc 'config', 'Print compiled configuration'
-      def config
+      def config(key = nil)
         invoke Tasks::Version, :current, [], options
+
+        return puts Config.compiled.send(key).to_json unless key.nil?
         puts Config.compiled.to_json
       end
 

data/lib/builderator/tasks/packer.rb

@@ -1,5 +1,7 @@
+require 'aws-sdk'
 require 'thor'
 
+require_relative '../control/data'
 require_relative '../interface/packer'
 require_relative '../patch/thor-actions'
 
@@ -20,6 +22,8 @@ module Builderator
       desc 'configure [PROFILE=default]', 'Generate a packer configuration'
       def configure(profile = :default)
         Config.profile.use(profile)
+
+        invoke Tasks::Version, :current, [], options
         puts Interface.packer.render if options['debug']
       end
 
@@ -28,6 +32,110 @@ module Builderator
         invoke :configure, [profile], options
         run_with_input "#{Interface.packer.command} build - #{ args.join('') }", Interface.packer.render
       end
+
+      desc 'copy PROFILE', 'Copy AMIs generated by packer to other regions'
+      def copy(profile)
+        invoke :configure, [profile], options
+
+        images.each do |image_name, (image, build)|
+          parameters = {
+            :source_region => Config.aws.region,
+            :source_image_id => image.image_id,
+            :name => image_name,
+            :description => image.description
+          }
+
+          build.ami_regions.each do |region|
+            say_status :copy, "image #{image_name} (#{image.image_id}) from #{Config.aws.region} to #{region}"
+            Util.ec2(region).copy_image(parameters)
+          end
+        end
+
+        invoke :wait, [profile], options
+        invoke :tag, [profile], options
+      end
+
+      desc 'tag PROFILE', 'Tag AMIs in other regions'
+      def tag(profile)
+        invoke :configure, [profile], options
+
+        images.each do |image_name, (image, build)|
+          filters = [{
+            :name => 'name',
+            :values => [image_name]
+          }]
+
+          ## Add some additional tags about the regional source
+          image.tags << {
+            :key => 'source_region',
+            :value => Config.aws.region
+          }
+          image.tags << {
+            :key => 'source_ami',
+            :value => image.image_id
+          }
+
+          build.ami_regions.each do |region|
+            regional_image = Util.ec2(region).describe_images(:filters => filters).images.first
+
+            say_status :tag, "AMI #{image_name} (#{regional_image.image_id}) in #{region}"
+            Util.ec2(region).create_tags(:resources => [regional_image.image_id], :tags => image.tags)
+          end
+        end
+      end
+
+      desc 'wait PROFILE', 'Wait for copied AMIs to become available in another region'
+      def wait(profile)
+        invoke :configure, [profile], options
+
+        waiting = true
+
+        images.each do |image_name, (image, build)|
+          say_status :wait, "for #{image.image_id} (#{image_name}) to be available in #{build.ami_regions.join(', ')}", :yellow
+        end
+
+        while waiting
+          waiting = false
+
+          images.each do |image_name, (image, build)|
+            filters = [{
+              :name => 'name',
+              :values => [image_name]
+            }]
+
+            build.ami_regions.each do |region|
+              regional_image = Util.ec2(region).describe_images(:filters => filters).images.first
+
+              ## It takes a few seconds for the new AMI to show up in the `describe_images` response-set
+              state = regional_image.nil? ? 'unknown' : regional_image.state
+              image_id = regional_image.nil? ? 'unknown' : regional_image.image_id
+
+              waiting = (state != 'available') || waiting
+              status_color = case state
+                             when 'pending', 'unknown' then :yellow
+                             when 'available' then :green
+                             else :red
+                             end
+
+              say_status :image, "#{image_id} (#{image.name}) is #{state} in #{region}", status_color
+            end
+          end
+
+          ## If waiting == false, loop immediately to break
+          sleep(10) if waiting
+        end
+
+        say_status :complete, 'All copied images are available'
+      end
+
+      private
+
+      ## Find details for generated images in current region
+      def images
+        @images ||= Config.profile.current.packer.build.each_with_object({}) do |(_, build), memo|
+          memo[build.ami_name] = [Control::Data.lookup(:image, :name => build.ami_name).first, build]
+        end
+      end
     end
   end
 end

data/lib/builderator/tasks/vagrant.rb

@@ -18,6 +18,8 @@ module Builderator
       desc 'configure [PROFILE]', 'Write a Vagrantfile into the project workspace'
       def configure(profile = :default)
         Config.profile.use(profile)
+        invoke Tasks::Version, :current, [], options
+
         Interface.vagrant.write
       end
 

data/lib/builderator/util.rb

@@ -60,16 +60,20 @@ module Builderator
       ##
       # AWS Clients
       ##
-      def ec2
-        @ec2 ||= Aws::EC2::Client.new(:region => Config.aws.region)
+      def ec2(region = Config.aws.region)
+        clients["ec2-#{region}"] ||= Aws::EC2::Client.new(:region => region)
       end
 
-      def asg
-        @asg ||= Aws::AutoScaling::Client.new(:region => Config.aws.region)
+      def asg(region = Config.aws.region)
+        clients["asg-#{region}"] ||= Aws::AutoScaling::Client.new(:region => region)
       end
 
       private
 
+      def clients
+        @clients ||= {}
+      end
+
       def _filter_reduce(resource, filters)
         filters.reduce(true) do |memo, (k, v)|
           ## Allow for negation with a leading `~`

data/template/Vagrantfile.erb

@@ -41,7 +41,8 @@ Vagrant.configure('2') do |config|
   # Use the standard data directory for Chef
   ##
   config.vm.provision :shell,
-                      :inline => 'mkdir -p <%= chef.staging_directory %>/cache && chown vagrant:vagrant -R <%= chef.staging_directory %>',
+                      :inline => "sudo mkdir -p #{Config.chef.staging_directory}/cache && "\
+                                 "sudo chown $(whoami) -R #{Config.chef.staging_directory}",
                       :privileged => true
 
   ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.11
+  version: 1.0.0.pre.rc.12
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake