cap-ec2 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5de758bdde1c4ff1f1b7976e3e9c831b399ff31
-  data.tar.gz: 17a252437d8183443a230c7ff64a0e83bdda0823
+  metadata.gz: ef4ca63866b4eff00801d44dda99ea21e280a804
+  data.tar.gz: d2674ee27e54da4e47ff65e42afd0ee8cbe82150
 SHA512:
-  metadata.gz: d11cf987ba64b1eb66ca0cec01f70fe1141bbdc60ffcb836ec5774644cc30e2e72b06d24eb22fe1085253579ce0417f3bace43e59a64a14d96a2f1173405285c
-  data.tar.gz: 7376b1916b7a6e1a7a912c9a5788b8d305d53b3a5d0a506cab550704c637043090378c6171131e7da21c6b8c1680e1eb0cf1e40dc3d5f6025d244637e542f0f2
+  metadata.gz: 6b0f97b3297038ce7175f323e9f5a320143b499ff142b6b115dce29a32743a34e768a4030702d01fe42e26d8246973465b3f26562574210f98b97c050ce6e888
+  data.tar.gz: 9bf1860538d00091cb419fae33d5eafe5b8894be95fd88591aedd0754014f6b9676bc707a6f3c157776acb0b0ee2cae7bfa772a3d6dab5ece24e343bb9476efd

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Cap-EC2 changelog
 
+## 1.1.2
+
+* Allow using aws-sdk v3 [@magnusvk](https://github.com/magnusvk)
+* Fix NoMethodError undefined method call for Hash [@ur5us](https://github.com/ur5us)
+* Allow tag value delimiter to be configurable [@erez-rabih](https://github.com/erez-rabih)
+
 ## 1.1.1
 
 Require aws-sdk v2 instead of v1

data/README.md

@@ -47,7 +47,9 @@ set :ec2_config, 'config/ec2.yml'
 set :ec2_project_tag, 'Project'
 set :ec2_roles_tag, 'Roles'
 set :ec2_stages_tag, 'Stages'
+set :ec2_tag_delimiter, ","
 
+set :ec2_profile, 'myservice'       # use ~/.aws/credentials with profile_name
 set :ec2_access_key_id, nil
 set :ec2_secret_access_key, nil
 set :ec2_region, %w{} # REQUIRED
@@ -59,7 +61,7 @@ set :ec2_filter_by_status_ok?, nil
 #### Order of inheritance
 
 `cap-ec2` supports multiple methods of configuration. The order of inheritance is:
-YAML File > User Capistrano Config > Default Capistrano Config > ENV variables.
+YAML File > ~/.aws/credentials > User Capistrano Config > Default Capistrano Config > ENV variables.
 
 #### Regions
 
@@ -92,6 +94,12 @@ credentials) will be honored.
   Cap-EC2 will look for a tag with this name to determine which instances belong to
   a given role. The tag name defaults to "Roles".
 
+* tag_delimiter
+
+  When Cap-EC2 reads a tag value, this will be the default delimiter.
+  For example, for a Roles tag with web,db and tag_delimiter set to ,(comma)
+  the server will have the web and db roles.
+
 * filter_by_status_ok?
 
   If this is set to `true`, then Cap-EC2 will not return instances which do not have both EC2 status

data/cap-ec2.gemspec

@@ -6,8 +6,8 @@ require 'cap-ec2/version'
 Gem::Specification.new do |spec|
   spec.name          = "cap-ec2"
   spec.version       = CapEC2::VERSION
-  spec.authors       = ["Andy Sykes", "Robert Coleman"]
-  spec.email         = ["github@tinycat.co.uk", "github@robert.net.nz"]
+  spec.authors       = ["Andy Sykes", "Robert Coleman", "Forward3D Developers"]
+  spec.email         = ["github@tinycat.co.uk", "github@robert.net.nz", "developers@forward3d.com"]
   spec.description   = %q{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.}
   spec.summary       = %q{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.}
   spec.homepage      = "https://github.com/forward3d/cap-ec2"
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "aws-sdk", "~> 2.0"
+  spec.add_dependency "aws-sdk", ">= 2.0"
   spec.add_dependency "capistrano", ">= 3.0"
   spec.add_dependency "terminal-table"
   spec.add_dependency "colorize"

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

@@ -90,7 +90,7 @@ module CapEC2
     private
 
     def instance_has_tag?(instance, key, value)
-      (tag_value(instance, key) || '').split(',').map(&:strip).include?(value.to_s)
+      (tag_value(instance, key) || '').split(tag_delimiter).map(&:strip).include?(value.to_s)
     end
 
     def instance_status_ok?(instance)

data/lib/cap-ec2/tasks/ec2.rake

@@ -26,6 +26,7 @@ namespace :load do
     set :ec2_project_tag, 'Project'
     set :ec2_roles_tag, 'Roles'
     set :ec2_stages_tag, 'Stages'
+    set :ec2_tag_delimiter, ","
 
     set :ec2_access_key_id, nil
     set :ec2_secret_access_key, nil

data/lib/cap-ec2/utils.rb

@@ -1,3 +1,5 @@
+require 'aws-sdk'
+
 module CapEC2
   module Utils
 
@@ -20,8 +22,12 @@ module CapEC2
       fetch(:ec2_stages_tag)
     end
 
+    def tag_delimiter
+      fetch(:ec2_tag_delimiter)
+    end
+
     def tag_value(instance, key)
-      instance.tags.find({}) { |t| t[:key] == key.to_s }[:value]
+      instance.tags.find(-> { {} }) { |t| t[:key] == key.to_s }[:value]
     end
 
     def self.contact_point_mapping
@@ -40,13 +46,22 @@ module CapEC2
     end
 
     def load_config
+      if fetch(:ec2_profile)
+        credentials = Aws::SharedCredentials.new(profile_name: fetch(:ec2_profile)).credentials
+        if credentials
+          set :ec2_access_key_id, credentials.access_key_id
+          set :ec2_secret_access_key, credentials.secret_access_key
+        end
+      end
+
       config_location = File.expand_path(fetch(:ec2_config), Dir.pwd) if fetch(:ec2_config)
       if config_location && File.exists?(config_location)
-        config = YAML.load_file fetch(:ec2_config)
+        config = YAML.load(ERB.new(File.read(fetch(:ec2_config))))
         if config
           set :ec2_project_tag, config['project_tag'] if config['project_tag']
           set :ec2_roles_tag, config['roles_tag'] if config['roles_tag']
           set :ec2_stages_tag, config['stages_tag'] if config['stages_tag']
+          set :ec2_tag_delimiter, config['tag_delimiter'] if config['tag_delimiter']
 
           set :ec2_access_key_id, config['access_key_id'] if config['access_key_id']
           set :ec2_secret_access_key, config['secret_access_key'] if config['secret_access_key']

data/lib/cap-ec2/version.rb

@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Andy Sykes
 - Robert Coleman
+- Forward3D Developers
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -43,14 +44,14 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -100,6 +101,7 @@ description: Cap-EC2 is used to generate Capistrano namespaces and tasks from Am
 email:
 - github@tinycat.co.uk
 - github@robert.net.nz
+- developers@forward3d.com
 executables: []
 extensions: []
 extra_rdoc_files: []