cloud-maker 0.7.0 → 0.8.0

data/lib/cloud_maker/config.rb

@@ -407,6 +407,10 @@ module CloudMaker
     # precedence to all values set in this one. Arrays will be merged as
     # imported_array.concat(current_array).uniq.
     #
+    # "--" can be used as a knockout prefix, ie. "--foo" will delete the key "foo"
+    # when an array is merged, or "--" will delete the entire existing contents of
+    # the array.
+    #
     # It should be noted that this is not reference safe, ie. objects within
     # cloud_maker_config will end up referenced from this config object as well.
     #
@@ -414,11 +418,18 @@ module CloudMaker
     #
     # Returns nothing.
     def import(cloud_maker_config)
-      self.options = cloud_maker_config.options.deep_merge!(self.options)
-      self.includes = cloud_maker_config.includes.concat(self.includes).uniq
-      self.imports = cloud_maker_config.imports.concat(self.imports).uniq
-      self.cloud_config = cloud_maker_config.cloud_config.deep_merge!(self.cloud_config)
-      self.extra_options = cloud_maker_config.extra_options.deep_merge!(self.extra_options)
+      [:options, :includes, :imports, :cloud_config, :extra_options].each do |key|
+      key = key.to_sym
+      #toss both of these into a hash because deep_merge only works on hashes
+      cloud_maker_config_hash = {:value => cloud_maker_config.send(key)}
+      self_hash = {:value => self.send(key)}
+      self.send(
+        :"#{key}=",
+        cloud_maker_config_hash.deep_merge!(
+          self_hash, :preserve_unmergeables => false, :knockout_prefix => '--'
+        )[:value]
+      )
+      end
     end
   end
 end

data/lib/cloud_maker/ec2.rb

@@ -42,6 +42,9 @@ module CloudMaker
         'cname' => {
           'default' => '',
           'description' => "A dns entry you would like to CNAME to this instance."
+        },
+        'block_device_mappings' => {
+          'description' => "A hash of block devices mappings. ie. { /dev/sda1 => { volume_size => <value_in_GB>, snapshot_id => <id>, delete_on_termination => <boolean> } }"
         }
       }
     }
@@ -107,7 +110,8 @@ module CloudMaker
       else
         region = ec2 # .instances.create will just put things in the default region
       end
-      instance = region.instances.create(
+
+      config = {
         :image_id => cloud_maker_config['ami'],
         :iam_instance_profile => cloud_maker_config['iam_role'],
         :security_groups => cloud_maker_config['security_group'],
@@ -115,10 +119,21 @@ module CloudMaker
         :key_name => cloud_maker_config['key_pair'],
         :availability_zone => cloud_maker_config['availability_zone'],
         :user_data => user_data
-      )
+      }
+      config[:block_device_mappings] = cloud_maker_config['block_device_mappings'] if cloud_maker_config['block_device_mappings']
+
+      instance = region.instances.create(config)
 
       begin
-        instance.tags.set(cloud_maker_config['tags']) if cloud_maker_config['tags']
+        if cloud_maker_config['tags']
+          # we can only set tags to be strings so make sure we convert all of our tags
+          # to strings
+          string_tags = cloud_maker_config['tags'].inject({}) do |hash, pair|
+            hash[pair[0]] = pair[1].to_s
+            hash
+          end
+          instance.tags.set(string_tags)
+        end
       rescue AWS::EC2::Errors::InvalidInstanceID::NotFound => e
         retries ||= 0
         if retries < 5

data/lib/cloud_maker/shell_executor.rb

@@ -21,7 +21,7 @@ module CloudMaker
     end
 
     def execute
-      @result ||= `#{self.script}`.chomp
+      @result ||= `#{self.script}`.strip
     end
 
     def to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-maker
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -124,7 +124,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: CloudMaker is a tool for launching and configuring EC2 instances. It
+  works as an extension to the Ubuntu CloudInit system. It extends the configuration
+  format with a composition system and options to describe how you want an instance
+  to be launched. The goal of the project is to make building and launching instances
+  simple and repeatable. It accomplishes this by leveraging existing toolchains rather
+  than forcing people to learn a new and complicated system.
 email: nathan.baxter@airbnb.com
 executables:
 - cloud-maker