capify-ec2 1.3.6 → 1.3.7

data/Changelog.md

@@ -1,3 +1,8 @@
+## 1.3.7 (Jan 20, 2013)
+
+  - Make the behaviour for passing hash/filename consistent
+  - Fix ec2_role when role_name_or_hash is not a hash.
+
 ## 1.3.6 (Jan 17, 2013)
 
 Bugfixes:

data/lib/capify-ec2.rb

@@ -3,7 +3,6 @@ require 'fog'
 require 'colored'
 require File.expand_path(File.dirname(__FILE__) + '/capify-ec2/server')
 
-
 class CapifyEc2
 
   attr_accessor :load_balancer, :instances
@@ -18,23 +17,24 @@ class CapifyEc2
       @ec2_config = ec2_config
     when String
       @ec2_config = YAML.load_file ec2_config
-
-      # Maintain backward compatibility with previous config format
-      @ec2_config[:project_tags] ||= []
-      # User can change the Roles tag string
-      @ec2_config[:aws_roles_tag] ||= "Roles"
-      @ec2_config[:project_tags] << @ec2_config[:project_tag] if @ec2_config[:project_tag]
     else
       raise ArgumentError, "Invalid ec2_config: #{ec2_config.inspect}"
     end
 
+    # Maintain backward compatibility with previous config format
+    @ec2_config[:project_tags] ||= []
+    # User can change the Roles tag string
+    @ec2_config[:aws_roles_tag] ||= "Roles"
+    @ec2_config[:project_tags] << @ec2_config[:project_tag] if @ec2_config[:project_tag]
+    
     regions = determine_regions()
     
     @instances = []
     regions.each do |region|
-      servers = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => @ec2_config[:aws_access_key_id], 
-        :aws_secret_access_key => @ec2_config[:aws_secret_access_key], :region => region).servers
-      servers.each do |server|
+      Fog::Compute.new(:provider => 'AWS', 
+                       :aws_access_key_id => @ec2_config[:aws_access_key_id], 
+                       :aws_secret_access_key => @ec2_config[:aws_secret_access_key], 
+                       :region => region).servers.each do |server|
         @instances << server if server.ready?
       end
     end

data/lib/capify-ec2/capistrano.rb

@@ -77,23 +77,22 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
   
   def ec2_role(role_name_or_hash)
-    role      = role_name_or_hash.is_a?(Hash) ? role_name_or_hash : {:name => role_name_or_hash,:options => {}}
-    variables = role_name_or_hash[:variables] || {}
+    role = role_name_or_hash.is_a?(Hash) ? role_name_or_hash : {:name => role_name_or_hash, :options => {}, :variables => {}}
         
     instances = capify_ec2.get_instances_by_role(role[:name])
-
     if role[:options] && role[:options].delete(:default)
       instances.each do |instance|
         define_role(role, instance)
       end
-    end    
+    end
+
     regions = capify_ec2.determine_regions
     regions.each do |region|
       define_regions(region, role)
     end unless regions.nil?
 
-    define_role_roles(role, instances, variables)
-    define_instance_roles(role, instances, variables)
+    define_role_roles(role, instances)
+    define_instance_roles(role, instances)
   end  
 
   def define_regions(region, role)
@@ -110,26 +109,27 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
-  def define_instance_roles(role, instances, variables)
+  def define_instance_roles(role, instances)
     instances.each do |instance|
       task instance.name.to_sym do
         remove_default_roles
-        define_role(role, instance, variables)
+        define_role(role, instance)
       end
     end
   end
 
-  def define_role_roles(role, instances, variables)
+  def define_role_roles(role, instances)
     task role[:name].to_sym do
       remove_default_roles
       instances.each do |instance|
-        define_role(role, instance, variables)
+        define_role(role, instance)
       end
     end 
   end
 
-  def define_role(role, instance, variables = {})
+  def define_role(role, instance)
     options     = role[:options] || {}
+    variables   = role[:variables] || {}
     
     cap_options = options.inject({}) do |cap_options, (key, value)| 
       cap_options[key] = true if value.to_s == instance.name
@@ -139,7 +139,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     ec2_options = instance.tags["Options"] || ""
     ec2_options.split(%r{,\s*}).compact.each { |ec2_option|  cap_options[ec2_option.to_sym] = true }
     
-    variables.each { |name, value| set name, value }
+    variables.each { |key, value| set key, value }
+
     role role[:name].to_sym, instance.contact_point, cap_options
   end
   

data/lib/capify-ec2/version.rb

@@ -1,6 +1,6 @@
 module Capify
   module Ec2
-    VERSION = "1.3.6"
+    VERSION = "1.3.7"
   end
 end
 

metadata

@@ -1,79 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capify-ec2
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.3.7
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 6
-  version: 1.3.6
 platform: ruby
-authors: 
+authors:
 - Noah Cantor
 - Siddharth Dawara
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Grabs roles from ec2's tags and autogenerates capistrano tasks
-email: 
+email:
 - noah.cantor@forward.co.uk
 - siddharth.dawara@forward.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Changelog.md
 - Gemfile
@@ -87,36 +81,26 @@ files:
 - readme.md
 homepage: http://github.com/forward/capify-ec2
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: capify-ec2
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Grabs roles from ec2's tags and autogenerates capistrano tasks
 test_files: []
-