composer 0.0.6 → 0.0.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+## 0.0.7:
+
+* Catch and re-raise ec2 errors
+* Ensure key is included in arguments
+
 ## 0.0.6:
 
 * Added proxy support through https_proxy variable

data/lib/composer/aws/ec2.rb

@@ -9,6 +9,8 @@ module Composer
 
       def key_pairs
         ec2.regions[@region].key_pairs
+      rescue ::AWS::EC2::Errors::AuthFailure => e
+        raise Composer::AwsEc2Error.new e.message
       end
       
       private

data/lib/composer/cli.rb

@@ -38,7 +38,7 @@ module Composer
     end
 
     def validate_options
-      required_keys = [:key, :name, :region]
+      required_keys = [:key, :name, :region, :secret]
       missing_keys = required_keys - @opts.keys
 
       unless missing_keys.empty?

data/lib/composer/exceptions.rb

@@ -34,4 +34,7 @@ module Composer
   class SimpleDeployConfigExists < ComposerException
   end
 
+  class AwsEc2Error < ComposerException
+  end 
+
 end

data/lib/composer/version.rb

@@ -1,3 +1,3 @@
 module Composer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/aws/ec2_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Composer::AWS::EC2 do
+  before do
+    @us_west_1_mock = mock 'region'
+    @ec2_stub    = stub 'ec2', :regions => { 'us-west-1' => @us_west_1_mock }
+    @logger_stub = stub 'logger'
+    @config_stub = stub 'config', :logger => @logger_stub,
+                                  :region => 'us-west-1'
+    ::AWS::EC2.stub :new => @ec2_stub
+  end
+
+  it "should call key pairs on the given region" do
+    @us_west_1_mock.stub :key_pairs => ['test-key']
+    ec2 = Composer::AWS::EC2.new :config => @config_stub
+    ec2.key_pairs.should == ['test-key']
+  end
+
+  it "should reraise ec2 errors as composer errors" do
+    exception = ::AWS::EC2::Errors::AuthFailure.new 'test msg'
+    @us_west_1_mock.should_receive(:key_pairs).
+                    and_raise exception
+    ec2 = Composer::AWS::EC2.new :config => @config_stub
+    lambda { ec2.key_pairs }.should raise_error Composer::AwsEc2Error
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70095561528160 !ruby/object:Gem::Requirement
+  requirement: &70214088611600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095561528160
+  version_requirements: *70214088611600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70095561527580 !ruby/object:Gem::Requirement
+  requirement: &70214088610860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095561527580
+  version_requirements: *70214088610860
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70095561526320 !ruby/object:Gem::Requirement
+  requirement: &70214088610280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70095561526320
+  version_requirements: *70214088610280
 description: I deploy and manage AWS resources.
 email:
 - brett@weav.net
@@ -85,6 +85,7 @@ files:
 - lib/composer/verify/ruby.rb
 - lib/composer/verify/secret.rb
 - lib/composer/version.rb
+- spec/aws/ec2_spec.rb
 - spec/compose_spec.rb
 - spec/config_spec.rb
 - spec/spec_helper.rb
@@ -102,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2440372189325897542
+      hash: 1399452483979458246
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2440372189325897542
+      hash: 1399452483979458246
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -119,6 +120,7 @@ signing_key:
 specification_version: 3
 summary: I deploy and manage AWS resources.
 test_files:
+- spec/aws/ec2_spec.rb
 - spec/compose_spec.rb
 - spec/config_spec.rb
 - spec/spec_helper.rb