composer 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.0.5:
+
+* Fixed region logic in key pairs
+
 ## 0.0.4:
 
 * Encrypt chef-repo and app by default

data/lib/composer/aws/ec2.rb

@@ -4,10 +4,11 @@ module Composer
       def initialize(args)
         @config = args[:config]
         @logger = @config.logger
+        @region = @config.region
       end
 
       def key_pairs
-        ec2.key_pairs
+        ec2.regions[@region].key_pairs
       end
       
       private

data/lib/composer/verify/key.rb

@@ -3,6 +3,7 @@ module Composer
     class Key
       def initialize(args)
         @config = args[:config]
+        @region = @config.region
         @logger = @config.logger
       end
 
@@ -11,10 +12,11 @@ module Composer
 
         key_pairs = ec2.key_pairs.entries.map { |k| k.name }
 
+        @logger.debug "Check for key_pairs in #{@region}."
         @logger.debug "Existing keypairs: #{key_pairs.join ', '}"
 
         unless key_pairs.include? key
-          raise InvalidKeyPair.new "Key #{key} does not exist in target region."
+          raise InvalidKeyPair.new "Key #{key} does not exist in #{@region}."
         end
       end
 

data/lib/composer/version.rb

@@ -1,3 +1,3 @@
 module Composer
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70179448305860 !ruby/object:Gem::Requirement
+  requirement: &70135633813960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179448305860
+  version_requirements: *70135633813960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70179448305180 !ruby/object:Gem::Requirement
+  requirement: &70135633812960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179448305180
+  version_requirements: *70135633812960
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70179448304120 !ruby/object:Gem::Requirement
+  requirement: &70135633812400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70179448304120
+  version_requirements: *70135633812400
 description: I deploy and manage AWS resources.
 email:
 - brett@weav.net
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3287206967553428281
+      hash: -926317595969483121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3287206967553428281
+      hash: -926317595969483121
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16