builderator 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6901f377be29e89f633b17b166ce6d2fc6198dfa
-  data.tar.gz: 9e8740901203c73291eaa3987a00216c94d4473f
+  metadata.gz: 1a2651a58b8b6c3d5d29079de1515bc01afba62d
+  data.tar.gz: c82cee97be2d711914d987c159d00ccdea1e04c5
 SHA512:
-  metadata.gz: 2014b58d27b7c2d851a20b68c18e5a046f6bfcfbd11caa6fd4e85a41b3b6221d25794ad17260d51a0155ec733a301e4da59bebf5005b0e57372f06cf89de377e
-  data.tar.gz: 82e74ba6e5e1fd372125399a96f931b1986bf8b2a313d58fc74cdcda05526878f8d3acc78f2733a1f988a42864cc1b97dc8493715a16c832677a10dd1e3524f0
+  metadata.gz: 9530719cd0a0f67c3be8a89e4b0e19f296b1a8e814276000118f51d6a4d0b2e4e4940d255ea3214ccf6caff62134ac79a8bc238b9fb3bc79ba387714d947148f
+  data.tar.gz: a24489f1eb8a3efef522962f703795208503ed3461ec96cebc4d9175fa161b532fdd635b73149bd9b55d1d99390e855be3301563c87a460949244bfbdb9b3129

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/lib/builderator/control/ami.rb

@@ -13,6 +13,7 @@ module Builderator
       module Owners
         SELF = 'self'.freeze
         UBUNTU = '099720109477'.freeze
+        AMAZON = 'amazon'.freeze
       end
 
       ## Filter fields defined in http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Builderator::Util.ec2.html#describe_images-instance_method

data/lib/builderator/tasks/ami.rb

@@ -32,6 +32,16 @@ module Builderator
                                    'virtualization-type' => options['virtualization_type'],
                                    'architecture' => options['architecture'] }.merge(Hash[*args])).image_id
       end
+
+      desc 'windows SEARCH', 'Print the latest AMI ID for a Windows image matching the SEARCH string'
+      def windows(search = 'Windows_Server-2012-R2_RTM-English-64Bit-Base*')
+        puts Control::AMI.latest(:owner => Builderator::Control::AMI::Owners::AMAZON,
+                                 'root-device-type' => options['root_device_type'],
+                                 'virtualization-type' => options['virtualization_type'],
+                                 'architecture' => options['architecture'],
+                                 'name' => search).image_id
+      end
+
     end
   end
 end

data/lib/builderator/tasks/clean.rb

@@ -88,6 +88,9 @@ module Builderator
         Control::Clean.exceptions.each do |e|
           say_status(*e.status)
         end
+
+        ## Mark the Jenkins job as fail if there were errors.
+        exit(1)
       end
     end
   end

data/lib/builderator/util.rb

@@ -13,19 +13,13 @@ module Builderator
 
       def filter(resources, filters = {})
         resources.select do |_, r|
-          filters.reduce(true) do |memo, (k, v)|
-            memo && r[:properties].include?(k.to_s) &&
-              r[:properties][k.to_s] == v
-          end
+          _filter_reduce(r, filters)
         end
       end
 
       def filter!(resources, filters = {})
         resources.select! do |_, r|
-          filters.reduce(true) do |memo, (k, v)|
-            memo && r[:properties].include?(k.to_s) &&
-              r[:properties][k.to_s] == v
-          end
+          _filter_reduce(r, filters)
         end
 
         resources
@@ -47,6 +41,19 @@ module Builderator
       def working_dir(relative = '.')
         Pathname.pwd.join(relative).expand_path
       end
+
+      private
+
+      def _filter_reduce(resource, filters)
+        filters.reduce(true) do |memo, (k, v)|
+          ## Allow for negation with a leading `~`
+          if v[0] == '~'
+            memo && (!resource[:properties].include?(k.to_s) || resource[:properties][k.to_s] != v[1..-1])
+          else
+            memo && resource[:properties].include?(k.to_s) && resource[:properties][k.to_s] == v
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake