cap-ec2 0.0.9 → 0.0.10

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Cap-EC2 changelog
 
+## 0.0.10
+
+* Allow configurable setting of the EC2 contact point [@christianblunden](https://github.com/christianblunden)
+
 ## 0.0.9
 
 * Handle no configured regions, (or specifically nil).

data/README.md

@@ -51,6 +51,7 @@ set :ec2_stages_tag, 'Stages'
 set :ec2_access_key_id, nil
 set :ec2_secret_access_key, nil
 set :ec2_region, %w{}
+set :ec2_contact_point, nil
 ```
 
 #### Order of inheritance
@@ -198,6 +199,26 @@ trivial to add.
 You can now define your tasks for these roles in exactly the same way as you would if you weren't
 using this gem.
 
+### Contacting instances
+
+By default, Cap-EC2 will attempt to communicate with the EC2 instance using the following instance
+interfaces in order:
+
+1. Public DNS (`:public_dns`)
+2. Public IP (`:public_ip`)
+3. Private IP (`:private_ip`)
+
+This can be configured using the Capistrano variable `:ec2_contact_point`, and supplying one
+of the above symbols. For example:
+
+```ruby
+set :ec2_contact_point, :private_ip
+```
+
+This would cause Cap-EC2 to try communicating with the instance on its private IP address. If you leave
+this variable unset, the behaviour is as in previous Cap-EC2 instances (falling through the lookup list
+as specified above).
+
 ## Utility tasks
 
 Cap-EC2 adds a few utility tasks to Capistrano for displaying information about the instances that

data/lib/cap-ec2/utils.rb

@@ -1,5 +1,6 @@
 module CapEC2
   module Utils
+
     def project_tag
       fetch(:ec2_project_tag)
     end
@@ -12,7 +13,18 @@ module CapEC2
       fetch(:ec2_stages_tag)
     end
 
+    def self.contact_point_mapping
+      {
+        :public_dns => :public_dns_name,
+        :public_ip => :public_ip_address,
+        :private_ip => :private_ip_address
+      }
+    end
+
     def self.contact_point(instance)
+      ec2_interface = contact_point_mapping[fetch(:ec2_contact_point)]
+      return instance.send(ec2_interface) if ec2_interface
+
       instance.public_dns_name || instance.public_ip_address || instance.private_ip_address
     end
 

data/lib/cap-ec2/version.rb

@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
+  prerelease: 
 platform: ruby
 authors:
 - Andy Sykes
@@ -9,90 +10,102 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Cap-EC2 is used to generate Capistrano namespaces and tasks from Amazon
@@ -104,7 +117,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -120,26 +133,33 @@ files:
 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: 2648474451787322254
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2648474451787322254
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+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,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a4bbb116bfecc7c7bbe859dcaac7ece035a536f4
-  data.tar.gz: cb31dd71930db40f5199aadcbcc7455d7f1f4d01
-SHA512:
-  metadata.gz: c1832d4c81a4572db12ea5e0a62cdb4ff5112988a50bc6c41d879d140510229e447dbdfe294dc65a0a54ed7acf53ff18d26288eb1d3c02433cf609f537f888cc
-  data.tar.gz: 2abbaa814e856240ae4c0cc6e27eda3794be56f35ef2e75ae4a8a8b2a1f51fc18a8870b92a858c2a7136e624f22dd99fb14e79b7d93f6723a7ccba8ce581ab81