roark 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,7 +1,12 @@
+## 0.2.1 (06/27/2013):
+
+* Internal Updates.
+* Exposing logging from AMI class.
+
 ## 0.2.0 (06/20/2013):
 
 * Adding --tag
-* Change Cloud Formation Template argument from -t to -c 
+* Change Cloud Formation Template argument from -t to -c
 
 ## 0.1.0 (06/18/2013):
 

data/README.md

@@ -46,8 +46,8 @@ Create AMI
                  -p 'Parameter2=value2' \
                  -a '123456789012' \
                  -a '123456789013' \
-                 -t 'ami_tag_1=val1' \
-                 -t 'ami_tag_2=val2' \
+                 -t 'AMITag1=val1' \
+                 -t 'AMITag2=val2'
 
 Destroy AMI
 

data/lib/roark/ami.rb

@@ -8,8 +8,8 @@ module Roark
       @ami_id = args[:ami_id]
       @name   = args[:name]
 
-      @region   = @aws.region
-      @logger   = Roark.logger
+      @region = @aws.region
+      @logger = Roark.logger
     end
 
     def create_instance(args)

data/lib/roark/ami_create_workflow.rb

@@ -2,12 +2,11 @@ module Roark
   class AmiCreateWorkflow
 
     def initialize(args)
-      @account_ids = args[:account_ids]
+      @account_ids = Array(args[:account_ids])
       @ami         = args[:ami]
-      @tags        = args[:tags]
+      @tags        = args.fetch :tags, {}
       @parameters  = args[:parameters]
       @template    = args[:template]
-      @logger      = Roark.logger
     end
 
     def execute

data/lib/roark/cli/create.rb

@@ -15,23 +15,23 @@ module Roark
       def create
         option_parser.parse!
 
-        validate_required_options [:name, :template]
+        validate_required_options [:name, :cloud_formation_template]
 
         validate_account_ids_format
 
-        unless File.exists? @options[:template]
-          @logger.error "Template #{@options[:template]} does not exist."
+        unless File.exists? @options[:cloud_formation_template]
+          @logger.error "Template #{@options[:cloud_formation_template]} does not exist."
           exit 1
         end
 
-        template = File.read @options[:template]
+        template = File.read @options[:cloud_formation_template]
 
         ami = Roark::Ami.new :aws => aws, :name => @options[:name]
 
         ami_create_workflow = Roark::AmiCreateWorkflow.new :account_ids => @options[:account_ids],
                                                            :ami         => ami,
                                                            :tags        => @options[:tags],
-                                                           :template    => template,
+                                                           :template    => cloud_formation_template,
                                                            :parameters  => @options[:parameters]
         response = ami_create_workflow.execute
 
@@ -52,7 +52,7 @@ module Roark
           end
 
           opts.on("-c", "--cloud_formation_template [CLOUD_FORMATION_TEMPLATE]", "Path to Cloud Formation template") do |o|
-            @options[:template] = o
+            @options[:cloud_formation_template] = o
           end
 
           opts.on("-n", "--name [NAME]", "Name of AMI") do |o|

data/lib/roark/version.rb

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

data/roark.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["brett@weav.net"]
   spec.description   = %q{Library and CLI to build AMIs from Instances created via Cloud Formation.}
   spec.summary       = %q{Howard Roark, master architect and builder of AMIs.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/intuit/roark"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 
-  spec.add_runtime_dependency "aws-sdk", "1.11.2"
+  spec.add_runtime_dependency "aws-sdk", "~> 1.11.2"
 end

data/spec/ami_create_workflow_spec.rb

@@ -6,7 +6,7 @@ describe Roark::AmiCreateWorkflow do
     @response_stub = mock 'response'
     Roark.logger logger_stub
     Roark.logger.stub :info => true
-    @ami_mock            = mock 'ami mock'
+    @ami_mock    = mock 'ami mock'
     @account_ids = ['123456789012', '123456789013']
     @tags        = { 'tag1' => 'val1', 'tag2' => 'val2' }
     @ami_create_workflow = Roark::AmiCreateWorkflow.new :account_ids => @account_ids,
@@ -37,4 +37,13 @@ describe Roark::AmiCreateWorkflow do
                                                     :template   => 'template').and_return @response_stub
     expect(@ami_create_workflow.execute.success?).to be_false
   end
+
+  it "should set the tags and accounts to empty if not set" do
+    @ami_create_workflow = Roark::AmiCreateWorkflow.new :ami        => @ami_mock,
+                                                        :parameters => { 'key' => 'val' },
+                                                        :template   => 'template'
+    expect(@ami_create_workflow.instance_variable_get(:@tags)).to eq({})
+    expect(@ami_create_workflow.instance_variable_get(:@account_ids)).to eq([])
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roark
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70360117909580 !ruby/object:Gem::Requirement
+  requirement: &70130675617320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70360117909580
+  version_requirements: *70130675617320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70360117909160 !ruby/object:Gem::Requirement
+  requirement: &70130675615460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360117909160
+  version_requirements: *70130675615460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70360117908700 !ruby/object:Gem::Requirement
+  requirement: &70130675613960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +43,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360117908700
+  version_requirements: *70130675613960
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70360117908200 !ruby/object:Gem::Requirement
+  requirement: &70130675612880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *70360117908200
+  version_requirements: *70130675612880
 description: Library and CLI to build AMIs from Instances created via Cloud Formation.
 email:
 - brett@weav.net
@@ -113,7 +113,7 @@ files:
 - spec/response_spec.rb
 - spec/spec_helper.rb
 - spec/stack_spec.rb
-homepage: ''
+homepage: https://github.com/intuit/roark
 licenses:
 - MIT
 post_install_message: 
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -847601442206879501
+      hash: -2493666366236783940
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -847601442206879501
+      hash: -2493666366236783940
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16