capistrano-aws 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15806a2d357af5a45189d7d7b4bc7d391624a7dfd8f026568b07f9891125a7cd
-  data.tar.gz: f6d462c93220344b750a71e1252d75b1710d292ab6d5685a0be73afceb069430
+  metadata.gz: b1c3b10ac2828ba8fa329df3458fd5f4df8f777f7a5f53b6d1774bfa0daf2518
+  data.tar.gz: 75f080dadf9cf60e262f16eb63733593eafaffa9211f89c66a5eafc50245c219
 SHA512:
-  metadata.gz: ebdb4cf5fe5dd62f39daa99513a88636557bf8593f23bd846b0acc304d0484e8670dc93df08340c988b547ea4b14b9e4ca0bf6e579857ef4a3b413744fadaa67
-  data.tar.gz: b5b2970b0275180caeff4daafbfc247a65314b687a379f72ca0e3b11a449c5a803becc1203ea5ef608c0592613f5651c9695aa0bb0b262c416464590094a247c
+  metadata.gz: 3b8459626eac2b171adb53979c0f0c17821c3fcd9bb0c7157f4803c1ad913ab6471eec93811d337e73df0eaf623634d5414090a9c0f6d08cba281dc447026a45
+  data.tar.gz: 17ec5886aa064ff07eb93a3f76529852d85695c02fd9c03476a7969c86d659377c5b96b70fbd9829419b3881d280d3232aa04abeffeaac1fb4082cefabec3b84

data/.gitignore

@@ -1,3 +1 @@
-.bundle
-Gemfile.lock
-vendor
+*.gem

data/README.md

@@ -18,7 +18,7 @@ gem 'capistrano-aws'
 
 Or install the gem system-wide:
 ```bash
-gem install cap-ec2
+gem install capistrano-aws
 ```
 
 In your `Capfile`:
@@ -63,6 +63,7 @@ The AWS credentials are loaded from your system. Check https://github.com/aws/aw
 
 The instances must be registered in each stage. In your `config/deploy/<stage_name>.rb`, add the following line:
 
+*This must be placed after you have configured your AWS settings*
 ```ruby
 aws_ec2_register
 ```

data/capistrano-aws.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name = 'capistrano-aws'
-  gem.version = '1.2.0'
+  gem.version = '1.2.1'
   gem.author = 'Fernando Carletti'
   gem.email = 'contact@fernandocarletti.net'
   gem.homepage = 'http://github.com/fernandocarletti/capistrano-aws'
@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0'
 
+  gem.add_dependency 'capistrano', '~> 3.1'
   gem.add_dependency 'aws-sdk-ec2', '~> 1'
   gem.add_dependency 'terminal-table', '~> 1.7'
   gem.add_dependency 'colorize', '~> 0.8'

data/lib/capistrano/aws.rb

@@ -1,13 +1,9 @@
 require 'capistrano/aws/ec2/ec2'
 require 'capistrano/dsl/aws'
+
 extend Capistrano::DSL::Aws
 
 SSHKit::Backend::Netssh.send(:include, Capistrano::DSL::Aws)
 
 load File.expand_path('../tasks/ec2.rake', __FILE__)
-
-namespace :load do
-  task :defaults do
-    load 'capistrano/aws/defaults.rb'
-  end
-end
+load File.expand_path("../tasks/defaults.rake", __FILE__)

data/lib/capistrano/aws/ec2/ec2.rb

@@ -22,25 +22,9 @@ module Capistrano
         end
 
         def instances
-          application = fetch(:aws_ec2_application)
-          raise 'application not set.' if application.nil?
-
           instances = {}
 
-          filters = [
-            {
-              name: "tag:#{fetch(:aws_ec2_application_tag)}",
-              values: [fetch(:aws_ec2_application)]
-            },
-            {
-              name: "tag:#{fetch(:aws_ec2_stage_tag)}",
-              values: [fetch(:aws_ec2_stage)]
-            },
-            {
-              name: 'instance-state-name',
-              values: ['running']
-            }
-          ]
+          filters = fetch(:aws_ec2_default_filters)
 
           filters.concat fetch(:aws_ec2_extra_filters)
 

data/lib/capistrano/dsl/aws.rb

@@ -9,7 +9,7 @@ module Capistrano
       def aws_ec2_register(options = {})
         aws_ec2.instances.each do |_id, instance|
           ip = Capistrano::Aws::EC2.contact_point(instance)
-          roles = Capistrano::Aws::EC2.parse_tag(instance, fetch(:aws_ec2_roles_tag)).split(',')
+          roles = Capistrano::Aws::EC2.parse_tag(instance, fetch(:aws_ec2_roles_tag)).split(",").map(&:strip)
 
           server ip, options.merge(roles: roles, aws_instance_id: instance.id)
         end

data/lib/capistrano/tasks/defaults.rake

@@ -0,0 +1,48 @@
+namespace :load do
+  task :defaults do
+    # AWS regions to use.
+    set :aws_ec2_regions, ['us-east-1']
+
+    # Application name to match application tag.
+    set :aws_ec2_application, (proc { fetch(:application) })
+
+    # Stage to match stage tag.
+    set :aws_ec2_stage, (proc { fetch(:stage) })
+
+    # Tag to be used for Capistrano stage.
+    set :aws_ec2_stage_tag, 'Stage'
+
+    # Tag to be used to match the application.
+    set :aws_ec2_application_tag, 'Application'
+
+    # Tag to be used for Capistrano roles of the server (the tag value can be a comma separated list).
+    set :aws_ec2_roles_tag, 'Roles'
+
+    # Default filters used for all requests, set to an empty array [] to disable completely
+    set :aws_ec2_default_filters, (proc {
+      [
+        {
+          name: "tag:#{fetch(:aws_ec2_application_tag)}",
+          values: [fetch(:aws_ec2_application)]
+        },
+        {
+          name: "tag:#{fetch(:aws_ec2_stage_tag)}",
+          values: [fetch(:aws_ec2_stage)]
+        },
+        {
+          name: 'instance-state-name',
+          values: ['running']
+        }
+      ]
+    })
+
+    # Extra filters to be used to retrieve the instances. See the README.md for more information.
+    set :aws_ec2_extra_filters, []
+
+    # Tag to be used as the instance name in the instances table (aws:ec2:instances task).
+    set :aws_ec2_name_tag, 'Name'
+
+    # How to contact the instance (:public_ip, :public_dns, :private_ip).
+    set :aws_ec2_contact_point, :public_ip
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-aws
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Fernando Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
@@ -80,11 +94,12 @@ files:
 - LICENSE
 - README.md
 - capistrano-aws.gemspec
+- lib/capistrano-aws.rb
 - lib/capistrano/aws.rb
-- lib/capistrano/aws/defaults.rb
 - lib/capistrano/aws/ec2/ec2.rb
 - lib/capistrano/aws/ec2/instances_table.rb
 - lib/capistrano/dsl/aws.rb
+- lib/capistrano/tasks/defaults.rake
 - lib/capistrano/tasks/ec2.rake
 homepage: http://github.com/fernandocarletti/capistrano-aws
 licenses:
@@ -105,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Integrates capistrano with AWS.

data/lib/capistrano/aws/defaults.rb

@@ -1,26 +0,0 @@
-# AWS regions to use.
-set :aws_ec2_regions, ['us-east-1']
-
-# Application name to match application tag.
-set :aws_ec2_application, (proc { fetch(:application) })
-
-# Stage to match stage tag.
-set :aws_ec2_stage, (proc { fetch(:stage) })
-
-# Tag to be used for Capistrano stage.
-set :aws_ec2_stage_tag, 'Stage'
-
-# Tag to be used to match the application.
-set :aws_ec2_application_tag, 'Application'
-
-# Tag to be used for Capistrano roles of the server (the tag value can be a comma separated list).
-set :aws_ec2_roles_tag, 'Roles'
-
-# Extra filters to be used to retrieve the instances. See the README.md for more information.
-set :aws_ec2_extra_filters, []
-
-# Tag to be used as the instance name in the instances table (aws:ec2:instances task).
-set :aws_ec2_name_tag, 'Name'
-
-# How to contact the instance (:public_ip, :public_dns, :private_ip).
-set :aws_ec2_contact_point, :public_ip