awsome 0.0.17 → 0.0.18

data/bin/awsome

@@ -20,8 +20,9 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-instances = Awsome::Ec2.describe_instances('instance-state-name' => 'running')
 requirements = Awsome::Requirements.from_yaml_file(requirements_file)
+filters = {'instance-state-name' => 'running'}.merge(requirements.filters)
+instances = Awsome::Ec2.describe_instances(filters)
 matchmaker = Awsome::Matchmaker.new(instances, requirements)
 executor = Awsome::Executor.new(matchmaker.matches)
 

data/lib/awsome/ec2.rb

@@ -47,6 +47,12 @@ module Awsome
       Awsome::Ec2::Instance.new(Awsome.execute(cmd, columns: @@run_instance_fields, filter: /^INSTANCE/).first)
     end
 
+    def self.create_tags(resource_id, tags)
+      tags = tags.collect { |k, v| v ? "--tag #{k}=#{v}" : "--tag #{k}" }
+      cmd = command('ec2-create-tags', resource_id, *tags)
+      Awsome.execute(cmd)
+    end
+
     @@describe_instance_fields = %w( 
       reservation_identifier
       reservation_id

data/lib/awsome/ec2/instance.rb

@@ -76,6 +76,10 @@ module Awsome
         Awsome::Ec2.terminate_instances(@properties['instance_id'])
       end
 
+      def create_tags(tags)
+        Awsome::Ec2.create_tags(@properties['instance_id'], tags)
+      end
+
       private 
         def reload!
           instance = Awsome::Ec2.describe_instances('instance-id' => @properties['instance_id']).first

data/lib/awsome/executor.rb

@@ -16,6 +16,7 @@ module Awsome
 
         run
         wait_for_ssh
+        tag_instances
         reattach_volumes
         deploy
         terminate
@@ -46,6 +47,12 @@ module Awsome
         end
       end
 
+      def tag_instances
+        instances_to_use do |instance, requirement|
+          instance.create_tags(requirement.tags)
+        end
+      end
+
       def reattach_volumes
         instances_to_use do |instance, requirement|
           instance.reattach_volumes(*requirement.volumes_to_attach(instance))

data/lib/awsome/instance_requirement.rb

@@ -20,6 +20,10 @@ module Awsome
       @properties['cnames'] || []
     end
 
+    def tags
+      @properties['tags'] || {}
+    end
+
     def volumes_to_attach(instance)
       (volumes - volumes_attached_to(instance)).collect { |v| @options.find_volume(v) }
     end

data/lib/awsome/requirements.rb

@@ -3,18 +3,58 @@ require 'yaml'
 module Awsome
   class Requirements
     attr_reader :options
+
     def initialize(requirements_hash)
       @requirements = requirements_hash.clone
       @options = Awsome::RequirementsOptions.new(@requirements)
     end
+    
     def self.from_yaml_file(filename)
       new(YAML::load(File.open(filename, 'r').read))
     end
+
     def instances
-      @requirements['instances'].collect do |instance_req| 
-        Awsome::InstanceRequirement.new(instance_req, @options) 
+      @requirements['instances'].collect do |req| 
+        instance = req.clone
+        inflate!(instance, instance.delete('traits'))
+        Awsome::InstanceRequirement.new(instance, @options) 
       end
     end
+
+    def filters
+      @requirements['filters'] || {}
+    end
+
+    def traits
+      @requirements['traits'] || {}
+    end
+
+    private 
+
+      def find_trait(name)
+        traits[name] || raise "no trait called #{name}"
+      end
+
+      # implements trait inheritance
+      def inflate!(instance, names)
+        inflated = req.clone
+
+        # prevents loops
+        merged = Set[]
+        while names && names.any?
+          name = names.shift
+          if merged.add?(name)
+            trait = find_trait(name).clone
+
+            # extract trait supertraits for merging
+            names += trait.delete('traits') || []
+
+            inflated = trait.merge(inflated)
+          end
+        end
+
+        inflated
+      end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsome
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors: