cap-ec2 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Cap-EC2 changelog
 
+## 0.0.7
+
+* Removed monkey patching of `Capistrano::TaskEnhancements` [@rjocoleman](https://github.com/rjocoleman)
+* Instances don't always have a name tag, would cause `ec2:status` to blow up [@rjocoleman](https://github.com/rjocoleman)
+
+## 0.0.6
+
+* Unbreak listing instances
+
+## 0.0.5
+
+* Don't return terminated instances when looking up instances from EC2
+* Fix documentation to refer to correct tag for Stages [@shaneog](https://github.com/shaneog)
+
 ## 0.0.4
 
 * If you modified any of the tag names, the `ec2:status` table would blow up

data/lib/cap-ec2/capistrano.rb

@@ -12,24 +12,27 @@ require_relative 'instance'
 # Load extra tasks
 load File.expand_path("../tasks/ec2.rake", __FILE__)
 
-# Monkey patch into Capistrano v3
-
 module Capistrano
-  module TaskEnhancements
+  module DSL
+    module Ec2
 
-    def ec2_handler
-      @ec2_handler ||= CapEC2::EC2Handler.new(env.fetch(:ec2_config, "config/ec2.yml"))
-    end
+      def ec2_handler
+        @ec2_handler ||= CapEC2::EC2Handler.new(env.fetch(:ec2_config, "config/ec2.yml"))
+      end
     
-    def ec2_role(name, options={})
-      ec2_handler.get_servers_for_role(name).each do |server|
-        env.role(name, server.contact_point, options)
+      def ec2_role(name, options={})
+        ec2_handler.get_servers_for_role(name).each do |server|
+          env.role(name, server.contact_point, options)
+        end
       end
-    end
     
-    def env
-      Configuration.env
-    end
+      def env
+        Configuration.env
+      end
     
+    end
   end
 end
+
+self.extend Capistrano::DSL::Ec2
+

data/lib/cap-ec2/status-table.rb

@@ -39,7 +39,7 @@ module CapEC2
     def instance_to_row(instance, index)
       [
         sprintf("%02d:", index),
-        instance.tags["Name"].green,
+        (instance.tags["Name"] || '').green,
         instance.id.red,
         instance.instance_type.cyan,
         instance.contact_point.blue.bold,

data/lib/cap-ec2/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3058574493266036746
+      hash: 1426469508856454138
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3058574493266036746
+      hash: 1426469508856454138
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23