capistrano-ec2_role_tag 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81dfdf6c725196bb1be1e49acf1bf8f083926b5e
-  data.tar.gz: 96b2d2232b3cd9df6ae7c553c4ea3811a3f6b3b9
+  metadata.gz: 00fb0df60ed2fa773aad2bf3502ca9a575f61166
+  data.tar.gz: 6df770a8817a2f70bf6c339dea3e93c12b53d17c
 SHA512:
-  metadata.gz: 1dd79fc390e21b72c3badf676c40190bda5912e77a006ef554bca790f0158d9843dd84bb496c21efa4156ed941bc20860154e842ab53b630d07dc59a8b90ad9b
-  data.tar.gz: 3bdbc0470ec737b1de31902f247151dc74eb14405a36c29b745daca290887f873d01a1eccd4c0efd98e1b8dd5ec600fe409d342888a087d1cdd3e700f5d29c99
+  metadata.gz: 719c12e9124970003dc5aad3f5a22683b30269e0d715107b9e38a7687abb51469224e8247def734d9f78ae84a8e4c5f02228ff5d35d10117d83782254f197ab1
+  data.tar.gz: 6c4a578dd10caf7a57eed2c5b876dde2292492572db60713348d06c89fc1b0b46107275fee3444ff40907f7391f935fab2bb7acb07a1e1faa637afe5c6c7d9a0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [In git](https://github.com/heosuax/capistrano-ec2_role_tag/compare/v0.0.2...HEAD)
 
+## [v0.1.0](https://github.com/heosuax/capistrano-ec2_role_tag/tree/v0.1.0)
+
+### New Features
+* Support capistrano 3
+* Using aws-sdk v2
+
 ## [v0.0.2](https://github.com/heosuax/capistrano-ec2_role_tag/tree/v0.0.2)
 
 ### New Features

data/Gemfile.lock

@@ -1,26 +1,25 @@
 PATH
   remote: .
   specs:
-    capistrano-ec2_role_tag (0.0.2)
-      aws-sdk (~> 1)
-      capistrano (~> 2)
+    capistrano-ec2_role_tag (0.1.0)
+      aws-sdk (~> 2)
+      capistrano (~> 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.66.0)
-      aws-sdk-v1 (= 1.66.0)
-    aws-sdk-v1 (1.66.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
+    aws-sdk (2.2.4)
+      aws-sdk-resources (= 2.2.4)
+    aws-sdk-core (2.2.4)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.2.4)
+      aws-sdk-core (= 2.2.4)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    capistrano (2.15.7)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
+    capistrano (3.4.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
     coderay (1.1.0)
     columnize (0.9.0)
     coveralls (0.8.10)
@@ -41,23 +40,17 @@ GEM
     docile (1.1.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
+    i18n (0.7.0)
+    jmespath (1.1.3)
     json (1.8.3)
     method_source (0.8.2)
     mime-types (2.99)
-    mini_portile2 (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
     net-ssh (3.0.1)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
     netrc (0.11.0)
-    nokogiri (1.6.7)
-      mini_portile2 (~> 2.0.0.rc2)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -92,6 +85,9 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
+    sshkit (1.8.1)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
@@ -105,14 +101,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.3.5)
+  bundler (~> 1.3, >= 1.3.5)
   capistrano-ec2_role_tag!
   coveralls (>= 0.7.0)
   pry
   pry-debugger
   pry-doc
   pry-stack_explorer
-  rake
+  rake (>= 10.0.0)
   redcarpet (>= 3)
   rspec (~> 2.14, >= 2.14.1)
   rubygems-tasks (~> 0.2, >= 0.2.4)

data/README.md

@@ -11,8 +11,8 @@
 Extend capistrano in AWS EC2 by getting private dns name of servers by stage, role
 
 ```ruby
-app_hosts = ec2_by_role("appworker")
-worker_hosts = ec2_by_role("backgroundworker")
+app_hosts = Capistrano::Configuration.ec2_by_role("appworker")
+worker_hosts = Capistrano::Configuration.ec2_by_role("backgroundworker")
 ```
 
 ## Installation
@@ -27,13 +27,17 @@ Just `require 'capistrano-ec2_role_tag'` in `Capfile` and then use it as:
 
 In `config/deploy/staging.rb` or `config/deploy/production.rb`
 ```ruby
-app_hosts = ec2_by_role("appworker")
-worker_hosts = ec2_by_role("backgroundworker")
+app_hosts = Capistrano::Configuration.ec2_by_role("appworker")
+worker_hosts = Capistrano::Configuration.ec2_by_role("backgroundworker")
 
 role :web, *allhost
 ...
 ```
 
+## TODO
+
+* Support authentication by API key
+
 ## Contributing
 
 1. Fork it ( https://github.com/heosuax/capistrano-ec2_role_tag/fork )

data/capistrano-ec2_role_tag.gemspec

@@ -7,10 +7,11 @@ Gem::Specification.new do |spec|
   spec.platform      = Gem::Platform::RUBY
   spec.name          = 'capistrano-ec2_role_tag'
   spec.version       = Capistrano::Ec2RoleTag::VERSION
-  spec.summary       = "Plugin to load server by AWS EC2 role"
-  spec.description   = spec.summary
+  spec.summary       = "Capistrano plugin to dynamically load server by AWS EC2 role"
+  spec.description   = "Capistrano plugin to dynamically load server by AWS EC2 role. \
+  Support a helper in capistrano deploy stage configuration file to get internal dns name by role and stage."
 
-  spec.required_ruby_version     = '>= 1.9.3'
+  spec.required_ruby_version     = '>= 2'
   spec.required_rubygems_version = '>= 1.8.0'
 
   spec.license       = 'MIT'
@@ -25,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.add_development_dependency 'bundler', '~> 1.3', '>= 1.3.5'
-  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'rake', '~> 10.0', '>= 10.0.0'
   spec.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.1'
   spec.add_development_dependency 'rubygems-tasks', '~> 0.2', '>= 0.2.4'
 
-  spec.add_runtime_dependency 'aws-sdk', '~> 1'
-  spec.add_runtime_dependency 'capistrano', '~> 2'
+  spec.add_runtime_dependency 'aws-sdk', '~> 2'
+  spec.add_runtime_dependency 'capistrano', '~> 3'
 end

data/lib/capistrano/ec2_role_tag/aws_ec2_loader.rb

@@ -1,13 +1,13 @@
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
 module Capistrano
   module Ec2RoleTag
     class AwsEc2Loader
       def initialize(options = {})
         if options[:region].nil?
-          @ec2 = AWS::EC2::Client.new(region: 'us-west-2')
+          @ec2 = Aws::EC2::Client.new(region: 'us-west-2')
         else
-          @ec2 = AWS::EC2::Client.new(region: options[:region])
+          @ec2 = Aws::EC2::Client.new(region: options[:region])
         end
       end
       def fetch(options = {})
@@ -15,17 +15,11 @@ module Capistrano
           {filters: [
             {name: "tag:Stage", values: [options[:stage].to_s]},
             {name: "tag:Role", values: [options[:role].to_s]},
-            {name: "instance-state-name", values: ["running"]}
+            {name: "state", values: ["running"]}
           ]})
-        return [] if apps.reservation_set.empty?
-
-        result = []
-        apps.reservation_set.each do |reservation|
-          next if reservation.instances_set.empty?
-          result += reservation.instances_set.map {|instance| instance.private_dns_name }
-        end
-
-        return result
+        return [] if apps.reservations.empty?
+        return [] if apps.reservations[0].instances.empty?
+        return apps.reservations[0].instances.map{|instance| instance.private_dns_name }
       end
     end
   end

data/lib/capistrano/ec2_role_tag/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Ec2RoleTag
-    VERSION = "0.0.6"
+    VERSION = "0.1.0"
   end
 end

data/lib/capistrano-ec2_role_tag.rb

@@ -13,11 +13,13 @@ module Capistrano
     end
   end
   class Configuration
-    def ec2_by_role(role)
-      if Capistrano::Ec2RoleTag.provider.nil?
-        Capistrano::Ec2RoleTag.configure { |configure| configure.stage = fetch(:stage) }
+    class << self
+      def ec2_by_role(role)
+        if Capistrano::Ec2RoleTag.provider.nil?
+          Capistrano::Ec2RoleTag.configure { |configure| configure.stage = fetch(:stage) }
+        end
+        Capistrano::Ec2RoleTag.provider.fetch(role)
       end
-      Capistrano::Ec2RoleTag.provider.fetch(role)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ec2_role_tag
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - An Vo Nguyen Thien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,14 +36,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -90,29 +96,31 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
-description: Plugin to load server by AWS EC2 role
+        version: '3'
+description: Capistrano plugin to dynamically load server by AWS EC2 role.   Support
+  a helper in capistrano deploy stage configuration file to get internal dns name
+  by role and stage.
 email:
 - an.vo@codebox.vn
 executables: []
@@ -150,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -161,7 +169,7 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Plugin to load server by AWS EC2 role
+summary: Capistrano plugin to dynamically load server by AWS EC2 role
 test_files:
 - spec/capistrano-ec2_role_tag_spec.rb
 - spec/spec_helper.rb