roark 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.0 (06/20/2013):
+
+* Adding --tag
+* Change Cloud Formation Template argument from -t to -c 
+
 ## 0.1.0 (06/18/2013):
 
 * Sanitize stack name to remove invalid characters.

data/README.md

@@ -41,11 +41,13 @@ Create AMI
 
     roark create -n NAME_OF_AMI
                  -r AWS_REGION \
-                 -t PATH_TO_CLOUD_FORMATION_TEMPLATE \
+                 -c PATH_TO_CLOUD_FORMATION_TEMPLATE \
                  -p 'Parameter1=value1' \
                  -p 'Parameter2=value2' \
                  -a '123456789012' \
-                 -a '123456789013'
+                 -a '123456789013' \
+                 -t 'ami_tag_1=val1' \
+                 -t 'ami_tag_2=val2' \
 
 Destroy AMI
 
@@ -68,7 +70,7 @@ Download the template:
 
 Create an AMI:
 
-    roark create -n roark-example-ami -t example.json
+    roark create -n roark-example-ami -c example.json
 
 ## Contributing
 

data/lib/roark/ami.rb

@@ -110,6 +110,15 @@ module Roark
       end
     end
 
+    def add_tags(tags)
+      begin
+        tag tags
+      rescue AWS::Errors::Base => e
+        return Response.new :code => 1, :message => e.message
+      end
+      Response.new :code => 0, :message => 'Tagging completed successfully.'
+    end
+
     def authorize_account_ids(account_ids)
       begin
         authorize account_ids
@@ -149,6 +158,10 @@ module Roark
       ec2_ami_authorizations.add :ami_id => @ami_id, :account_ids => account_ids
     end
 
+    def tag(tags)
+      ec2_ami_tags.add :ami_id => @ami_id, :tags => tags
+    end
+
     def instance
       @instance ||= Instance.new :aws => @aws, :name => instance_name
     end
@@ -161,6 +174,10 @@ module Roark
       @ec2_ami_authorizations ||= Roark::Aws::Ec2::AmiAuthorizations.new @aws
     end
 
+    def ec2_ami_tags
+      @ec2_ami_tags ||= Roark::Aws::Ec2::AmiTags.new @aws
+    end
+
     def ec2_destroy_ami
       @ec2_destroy_ami ||= Roark::Aws::Ec2::DestroyAmi.new @aws
     end

data/lib/roark/ami_create_workflow.rb

@@ -4,6 +4,7 @@ module Roark
     def initialize(args)
       @account_ids = args[:account_ids]
       @ami         = args[:ami]
+      @tags        = args[:tags]
       @parameters  = args[:parameters]
       @template    = args[:template]
       @logger      = Roark.logger
@@ -11,7 +12,7 @@ module Roark
 
     def execute
       %w(create_instance wait_for_instance stop_instance wait_for_instance_to_stop
-         create_ami wait_for_ami destroy_instance authorize_account_ids).each do |m|
+         create_ami wait_for_ami destroy_instance add_tags authorize_account_ids).each do |m|
         response = self.send m.to_sym
         return response unless response.success?
       end
@@ -47,6 +48,10 @@ module Roark
       @ami.destroy_instance
     end
 
+    def add_tags
+      @ami.add_tags @tags
+    end
+
     def authorize_account_ids
       @ami.authorize_account_ids @account_ids
     end

data/lib/roark/aws/ec2/ami_tags.rb

@@ -0,0 +1,22 @@
+module Roark
+  module Aws
+    module Ec2
+      class AmiTags
+        def initialize(connection)
+          @connection = connection
+          @logger     = Roark.logger
+        end
+
+        def add(args)
+          ami_id = args[:ami_id]
+          tags   = args[:tags]
+
+          tags.each_pair do |key,value|
+            @logger.info "Tagging AMI with '#{key}=#{value}'."
+            @connection.ec2.images[ami_id].tag key, :value => value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/roark/aws/ec2.rb

@@ -1,4 +1,5 @@
 require 'roark/aws/ec2/ami_state'
+require 'roark/aws/ec2/ami_tags'
 require 'roark/aws/ec2/ami_authorizations'
 require 'roark/aws/ec2/create_ami'
 require 'roark/aws/ec2/destroy_ami'

data/lib/roark/cli/create.rb

@@ -5,7 +5,10 @@ module Roark
       include Shared
 
       def initialize
-        @options = { :account_ids => [], :parameters => {}, :region => 'us-east-1' }
+        @options = { :account_ids => [],
+                     :parameters  => {},
+                     :region      => 'us-east-1',
+                     :tags        => {} }
         @logger  = Roark.logger
       end
 
@@ -27,6 +30,7 @@ module Roark
 
         ami_create_workflow = Roark::AmiCreateWorkflow.new :account_ids => @options[:account_ids],
                                                            :ami         => ami,
+                                                           :tags        => @options[:tags],
                                                            :template    => template,
                                                            :parameters  => @options[:parameters]
         response = ami_create_workflow.execute
@@ -47,6 +51,10 @@ module Roark
             @options[:account_ids] << o
           end
 
+          opts.on("-c", "--cloud_formation_template [CLOUD_FORMATION_TEMPLATE]", "Path to Cloud Formation template") do |o|
+            @options[:template] = o
+          end
+
           opts.on("-n", "--name [NAME]", "Name of AMI") do |o|
             @options[:name] = o
           end
@@ -60,8 +68,9 @@ module Roark
             @options[:region] = o
           end
 
-          opts.on("-t", "--template [TEMPLATE]", "Path to Cloud Formation template") do |o|
-            @options[:template] = o
+          opts.on("-t", "--tag [TAG]", "AMI tag name and it's value separated by '='. Can be specified multiple times.") do |o|
+            data = o.split('=')
+            @options[:tags].merge!({ data.first => data[1] })
           end
 
           opts.on("--aws-access-key [KEY]", "AWS Access Key") do |o|

data/lib/roark/version.rb

@@ -1,3 +1,3 @@
 module Roark
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/ami_create_workflow_spec.rb

@@ -8,9 +8,11 @@ describe Roark::AmiCreateWorkflow do
     Roark.logger.stub :info => true
     @ami_mock            = mock 'ami mock'
     @account_ids = ['123456789012', '123456789013']
+    @tags        = { 'tag1' => 'val1', 'tag2' => 'val2' }
     @ami_create_workflow = Roark::AmiCreateWorkflow.new :account_ids => @account_ids,
                                                         :ami         => @ami_mock,
                                                         :parameters  => { 'key' => 'val' },
+                                                        :tags        => @tags,
                                                         :template    => 'template'
   end
 
@@ -25,6 +27,7 @@ describe Roark::AmiCreateWorkflow do
     @ami_mock.should_receive(:wait_for_ami).and_return @response_stub
     @ami_mock.should_receive(:destroy_instance).and_return @response_stub
     @ami_mock.should_receive(:authorize_account_ids).with(@account_ids).and_return @response_stub
+    @ami_mock.should_receive(:add_tags).with(@tags).and_return @response_stub
     expect(@ami_create_workflow.execute.success?).to be_true
   end
 

data/spec/ami_spec.rb

@@ -227,6 +227,21 @@ describe Roark::Ami do
         expect(@ami.authorize_account_ids(account_ids).success?).to be_true
       end
     end
+
+    describe "#add_tags" do
+      it "should call tag with the given tags" do
+        @ami.ami_id = 'ami-12345678'
+        tags = { 'test1' => 'val1', 'test2' => 'val2' }
+        ec2_ami_tags_mock = mock 'ami tags'
+        Roark::Aws::Ec2::AmiTags.should_receive(:new).
+                                 with(@aws_mock).
+                                 and_return ec2_ami_tags_mock
+        ec2_ami_tags_mock.should_receive(:add).
+                           with :ami_id      => "ami-12345678",
+                                :tags        => tags
+        expect(@ami.add_tags(tags).success?).to be_true
+      end
+    end
   end
 
 end

data/spec/aws/ec2/ami_tags_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Roark::Aws::Ec2::AmiTags do
+
+  describe "#add" do
+    it "should tag an image with the given hash of tags" do
+      Roark.logger stub 'logger stub'
+      Roark.logger.stub :info => true, :warn => true
+      tags             = { 'name1' => 'val1', 'name2' => 'val2' }
+      image_mock       = mock 'image'
+      images_stub      = stub :images => { 'ami-12345678' => image_mock }
+      connection_stub  = stub 'connection', :ec2 => images_stub
+      tags.each_pair do |key, value|
+        image_mock.should_receive(:tag).with(key, :value => value)
+      end
+
+      @ami_tags = Roark::Aws::Ec2::AmiTags.new connection_stub
+      @ami_tags.add :ami_id => 'ami-12345678', :tags => tags
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roark
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70191115678740 !ruby/object:Gem::Requirement
+  requirement: &70360117909580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70191115678740
+  version_requirements: *70360117909580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70191115678320 !ruby/object:Gem::Requirement
+  requirement: &70360117909160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191115678320
+  version_requirements: *70360117909160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70191115677860 !ruby/object:Gem::Requirement
+  requirement: &70360117908700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191115677860
+  version_requirements: *70360117908700
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70191115677360 !ruby/object:Gem::Requirement
+  requirement: &70360117908200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: 1.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *70191115677360
+  version_requirements: *70360117908200
 description: Library and CLI to build AMIs from Instances created via Cloud Formation.
 email:
 - brett@weav.net
@@ -85,6 +85,7 @@ files:
 - lib/roark/aws/ec2.rb
 - lib/roark/aws/ec2/ami_authorizations.rb
 - lib/roark/aws/ec2/ami_state.rb
+- lib/roark/aws/ec2/ami_tags.rb
 - lib/roark/aws/ec2/create_ami.rb
 - lib/roark/aws/ec2/destroy_ami.rb
 - lib/roark/aws/ec2/instance_status.rb
@@ -104,6 +105,7 @@ files:
 - spec/aws/connection_spec.rb
 - spec/aws/ec2/ami_authorizations_spec.rb
 - spec/aws/ec2/ami_state_spec.rb
+- spec/aws/ec2/ami_tags_spec.rb
 - spec/aws/ec2/create_ami_spec.rb
 - spec/aws/ec2/destroy_ami_spec.rb
 - spec/create_stack_spec.rb
@@ -126,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2496970937823058822
+      hash: -847601442206879501
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2496970937823058822
+      hash: -847601442206879501
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -149,6 +151,7 @@ test_files:
 - spec/aws/connection_spec.rb
 - spec/aws/ec2/ami_authorizations_spec.rb
 - spec/aws/ec2/ami_state_spec.rb
+- spec/aws/ec2/ami_tags_spec.rb
 - spec/aws/ec2/create_ami_spec.rb
 - spec/aws/ec2/destroy_ami_spec.rb
 - spec/create_stack_spec.rb