cap-ec2 0.0.16 → 0.0.17

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDJiNjNjMDA5NzMyNmQ2NDE2N2RhMzViMDhiYjE1ZjU1ZWQ2MzUyNQ==
+  data.tar.gz: !binary |-
+    YTFkZDFkYjc0OGMwNTU1MmNkNzVkZGU4ODNlZWY3NGQ3NWVhZmZjNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTAxMjZmMjgxZDBlYmUzYWY4N2RmMTNjYjMwZmMxZDc2NDU3ZjJhY2U1OTlj
+    NmNmYmY0MGM4ZGMyZGI0NWY3M2Q4YWQ4NmVhZjE4MGMwMzA5ZTUwY2RhOTk3
+    MjcyZDg4YjNiOWZhNDk1NTBiNzAxZWEzOTA3ODdlODk0ZWYwMGQ=
+  data.tar.gz: !binary |-
+    NDVlNDFiNmJhZWI1MWNjM2Q1ZGE3N2UzOThmZDA4YTc5ZDY4NjVhMjI4Y2Ri
+    ZGEzMzAxZWY0NGU4OTE5ODg3MTc1MDUwZTAwNjUyN2NiZTY5MDIzM2U4ODZj
+    YTNkOWU2NTJlZWVjMDQxMGQ3NDUxOTFmMDMxYzI2MjJlYWE3NzE=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Cap-EC2 changelog
 
+## 0.0.17
+
+* Provide access to EC2 server tags within Capistrano recipes [@eightbitraptor](https://github.com/eightbitraptor)
+* Fix sorting of servers when there is no Name tag [@johnf](https://github.com/johnf)
+
 ## 0.0.16
 
 * Don't colorize status table output if STDOUT is not a TTY. [@jcoglan](https://github.com/jcoglan)

data/lib/cap-ec2/capistrano.rb

@@ -21,7 +21,8 @@ module Capistrano
 
       def ec2_role(name, options={})
         ec2_handler.get_servers_for_role(name).each do |server|
-          env.role(name, CapEC2::Utils.contact_point(server), options)
+          env.role(name, CapEC2::Utils.contact_point(server),
+                   options_with_instance_id(options, server))
         end
       end
 
@@ -29,9 +30,16 @@ module Capistrano
         Configuration.env
       end
 
+      private
+
+      def options_with_instance_id(options, server)
+        options.merge({aws_instance_id: server.instance_id})
+      end
+
     end
   end
 end
 
 self.extend Capistrano::DSL::Ec2
 
+Capistrano::Configuration::Server.send(:include, CapEC2::Utils::Server)

data/lib/cap-ec2/ec2-handler.rb

@@ -71,7 +71,13 @@ module CapEC2
             (fetch(:ec2_filter_by_status_ok?) ? instance_status_ok?(i) : true)
         end
       end
-      servers.flatten.sort_by {|s| s.tags["Name"]}
+      servers.flatten.sort_by {|s| s.tags["Name"] || ''}
+    end
+
+    def get_server(instance_id)
+      @ec2.reduce([]) do |acc, (_, ec2)|
+        acc << ec2.instances[instance_id]
+      end.flatten.first
     end
 
     private

data/lib/cap-ec2/utils.rb

@@ -1,6 +1,13 @@
 module CapEC2
   module Utils
 
+    module Server
+      def ec2_tags
+        id = self.properties.fetch(:aws_instance_id)
+        ec2_handler.get_server(id).tags
+      end
+    end
+
     def project_tag
       fetch(:ec2_project_tag)
     end

data/lib/cap-ec2/version.rb

@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 0.0.16
-  prerelease: 
+  version: 0.0.17
 platform: ruby
 authors:
 - Andy Sykes
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -133,33 +120,26 @@ files:
 homepage: https://github.com/forward3d/cap-ec2
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2024231783545522986
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2024231783545522986
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cap-EC2 is used to generate Capistrano namespaces and tasks from Amazon EC2
   instance tags, dynamically building the list of servers to be deployed to.
 test_files: []