cap-ec2 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Cap-EC2 changelog
 
+## 0.0.4
+
+* If you modified any of the tag names, the `ec2:status` table would blow up
+* Fixed a bug with stages
+
 ## 0.0.3
 
 * Rename the default tag name used for determining to 'Stages' from 'Stage'

data/lib/cap-ec2/capistrano.rb

@@ -4,6 +4,7 @@ require 'aws-sdk'
 require 'colored'
 require 'terminal-table'
 require 'yaml'
+require_relative 'utils'
 require_relative 'ec2-handler'
 require_relative 'status-table'
 require_relative 'instance'

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

@@ -1,5 +1,6 @@
 module CapEC2
   class EC2Handler
+    include CapEC2::Utils
     
     def initialize(ec2_config = "config/ec2.yml")
       @ec2_config = YAML.load_file ec2_config
@@ -15,7 +16,8 @@ module CapEC2
     
     def status_table
       CapEC2::StatusTable.new(
-        defined_roles.map {|r| get_servers_for_role(r)}.flatten.uniq {|i| i.instance_id}
+        defined_roles.map {|r| get_servers_for_role(r)}.flatten.uniq {|i| i.instance_id},
+        @ec2_config
       )
     end
     
@@ -47,18 +49,6 @@ module CapEC2
       Capistrano::Configuration.env.fetch(:application).to_s
     end
     
-    def project_tag
-      @ec2_config["project_tag"] || "Project"
-    end
-    
-    def roles_tag
-      @ec2_config["roles_tag"] || "Roles"
-    end
-    
-    def stages_tag
-      @ec2_config["stages_tag"] || "Stages"
-    end
-    
     def tag(tag_name)
       "tag:#{tag_name}"
     end

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

@@ -1,8 +1,10 @@
 module CapEC2
   class StatusTable
+    include CapEC2::Utils
     
-    def initialize(instances)
+    def initialize(instances, ec2_config)
       @instances = instances
+      @ec2_config = ec2_config
       output
     end
     
@@ -15,7 +17,7 @@ module CapEC2
         "DNS".bold,
         "Zone".bold,
         "Roles".bold,
-        "Stage".bold
+        "Stages".bold
       ]
     end
     
@@ -42,8 +44,8 @@ module CapEC2
         instance.instance_type.cyan,
         instance.contact_point.blue.bold,
         instance.availability_zone.magenta,
-        instance.tags["Roles"].yellow,
-        instance.tags["Stage"].yellow
+        instance.tags[roles_tag].yellow,
+        instance.tags[stages_tag].yellow
       ]
     end
   end

data/lib/cap-ec2/utils.rb

@@ -0,0 +1,15 @@
+module CapEC2
+  module Utils
+    def project_tag
+      @ec2_config["project_tag"] || "Project"
+    end
+    
+    def roles_tag
+      @ec2_config["roles_tag"] || "Roles"
+    end
+    
+    def stages_tag
+      @ec2_config["stages_tag"] || "Stages"
+    end 
+  end
+end

data/lib/cap-ec2/version.rb

@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Andy Sykes
@@ -13,6 +14,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -114,30 +127,38 @@ files:
 - lib/cap-ec2/instance.rb
 - lib/cap-ec2/status-table.rb
 - lib/cap-ec2/tasks/ec2.rake
+- lib/cap-ec2/utils.rb
 - lib/cap-ec2/version.rb
 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: 4028895032890582237
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4028895032890582237
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 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: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzU3OWQxZWU3OTAxMmE0MjUyMWU4MTFhOTM0NWJkNTcxNTY4NzYwYQ==
-  data.tar.gz: !binary |-
-    MWJiODFiNDUyMzQ1YzU2MTM3MDRmOWE5ZmMwODM5NWU0NDI5NjZiNg==
-SHA512:
-  metadata.gz: !binary |-
-    NmJiNWE2MTZlYTA1Mjk3Y2VlMWFmYzg0OWI1NDNiNjJlMDgxNDFjZGQwODg4
-    MTM2OTJjMGUxMzM3ODFkMzQ4OTMzNTIxNzY2MDUyZmEwNGY1NWNmZmQ1OTZi
-    OWQ1MTdmZWFkODgxMjkwNTQ0ZmM4YzRiM2RiZWVlNmVmZmRkNWY=
-  data.tar.gz: !binary |-
-    YTQyNmY3OWM0ZGE5Zjg4NzE4NjNlNTdlMzFmMGExMmMzNTZkMTE2NGU4ZTE3
-    ODU5MmJjNjJiZDk5NzczZjRhNTQ1NGEwNDE2OWUxZDE3NmYyYmY0MjQzOWYw
-    OWJkMDM3M2I1OWZmNTVmMmU3NTEwYTRlZWY3ZjM1ZTdlNmYzNDE=