capistrano-rack 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d066e18263d780bab15ff95203f2b3a38abe981
-  data.tar.gz: 2d9a77c0398e9b1c2dcf4f580039f5fa1098f7cf
+  metadata.gz: 3e6f3618f6ffe51d2586c8bf09c98039c984acd2
+  data.tar.gz: 6cc80001f2afaf300a60e198b9466ab786921c5b
 SHA512:
-  metadata.gz: 80f9422987ec6385f054536536a1905b301048dcfadb1f66590a1fe2b6883771537e30b449e957c435f153f216001dbec32008b11d888e6f0d2f1e082488e13e
-  data.tar.gz: 0e669b7195804499fa26e5e9f549a404fed7fb39a9d912925d0852a371cda36a0fe9078f14f9210b5d5d5b9e4ab0c3f8d6b60413a87cdb19a5fe0c65753cf21a
+  metadata.gz: 6655301c242d37ac5ab2fcb22bd839592161a16c379f8eee9837e643c6473ccc22556b049ba80721080e96737d59df045601f17078aebadeec9d484dcaac118e
+  data.tar.gz: 3a1a98c0052f14a75fa0a7d687160e8a0c1780045b55f26b828b7d7695dc72a4045117c1e2ee659128d8d52c697d72316c5a65bc2682d0b9921edc43ef64e523

data/Gemfile

@@ -5,4 +5,3 @@ gemspec
 
 gem 'capistrano'
 gem 'fog'
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-rack (0.1.0)
+    capistrano-rack (0.2.0)
       capistrano (~> 3.4, >= 3.0.0)
       fog (~> 1.35)
 
@@ -45,7 +45,7 @@ GEM
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       nokogiri
-    fog-aliyun (0.0.10)
+    fog-aliyun (0.1.0)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       ipaddress (~> 0.8)

data/README.md

@@ -18,7 +18,7 @@ require 'capistrano/rack'
 
 And then execute:
 
-	$ bundle && bundle exec rake
+    $ bundle && bundle exec rake
 
 Make sure to have a `~/.rack/config` in your `$HOME` directory with these properties:
 
@@ -32,25 +32,75 @@ If you are already a [**Rackspace CLI**](https://developer.rackspace.com/docs/ra
 
 ## Usage
 
-You can use `capistrano-rack` recipe in your deployment script like this:
+`capistrano-rack` recipe supports two Rackspace Cloud services:
+
+### Next Generation Cloud Servers™
+
+To deploy to your Next Gen Cloud servers:
 
 ```ruby
-rackspace_servers(:roles, '^regex')
+rackspace_servers(roles=[], regex_str='^myservers-', addr_type=:private, config_file=nil, connection_options={})
 ```
 
-where `regex` is a regular expression to filter throught the names of your servers.
+Where:
+* `roles`: your [Capistrano Roles](http://capistranorb.com/).
+* `regex_str`: a regular expression to filter throught your Next Gen Cloud servers.
+* `addr_type`: type of IP addresses (`:public` or `:private`).
+* `config_file`: Rackspace configuration file.
+* `connection_options`: Optional connection parameters.
+
+### Auto Scale
 
-If you want to use a different configuration file for Rackspace, `rackspace_servers()` have an additional parameter:
+To deploy to your Scaling Group:
 
 ```ruby
-rackspace_servers(:roles, '^regex', '/path/to/my/config/file')
+rackspace_autoscale(roles=[], group_name='', addr_type=:private, config_file=nil, connection_options={})
 ```
 
+Where:
+* `roles`: your [Capistrano Roles](http://capistranorb.com/).
+* `group_name`: Name of your Scaling Group.
+* `addr_type`: type of IP addresses (`:public` or `:private`).
+* `config_file`: Rackspace configuration file.
+* `connection_options`: Optional connection parameters.
+
+### Optional Connection Parameters
+
+<table>
+    <tr><th>Key</th><th>Description</th></tr>
+    <tr>
+        <td>:connect_timeout</td>
+        <td>Connection timeout (default: 60 seconds)</td>
+    </tr>
+    <tr>
+        <td>:read_timeout</td>      
+        <td>Read timeout for connection (default: 60 seconds)</td>  </tr>
+    <tr>
+        <td>:write_timeout</td>
+        <td>Write timeout for connection (default: 60 seconds)</td>
+    </tr>
+    <tr>
+        <td>:proxy</td>
+        <td>Proxy for HTTP and HTTPS connections</td>
+    </tr>
+    <tr>
+        <td>:ssl_ca_path</td>
+        <td>Path to SSL certificate authorities</td>
+    </tr>
+    <tr>
+        <td>:ssl_ca_file</td>
+        <td>SSL certificate authority file</td>
+    </tr>
+    <tr>
+        <td>:ssl_verify_peer</td>
+        <td>SSL verify peer (default: true)</td>
+    </tr>   
+</table>
+
 ## Contributing
 
 Bug reports and pull requests are welcome. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
-
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+This gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/capistrano/rack.rb

@@ -3,9 +3,6 @@ require 'fog'
 require 'capistrano'
 require 'capistrano/rack/version'
 
-#
-# Properties Reader
-#
 class PropertiesReader
   def initialize(file)
     @file = file
@@ -27,35 +24,56 @@ class PropertiesReader
   
 end
 
+class RackspaceOptions
+  def self.get(config_file=nil)
+    props_reader = PropertiesReader.new(config_file || "#{ENV['HOME']}/.rack/config")
+    return {
+      :rackspace_api_key => props_reader.get("api-key"),
+      :rackspace_username => props_reader.get("username"),
+      :rackspace_region => props_reader.get("region")
+    }
+  end
+end
+
 module Capistrano
   module Rack
-    #
-    # Retrieves a list of Rackspace instances containing a tag list
-    # which matches a supplied hash. Matching instances are applied
-    # to the Cap server list.
-    #
-    # Usage: servers {'app' => 'zumba', 'stack' => 'web'}
-    #
-    def rackspace_servers(role=nil, regex_string='', config_file=nil)
-      props_reader = PropertiesReader.new(config_file || "#{ENV['HOME']}/.rack/config")
-      rackspace = Fog::Compute.new(
-        {
-          :provider => 'Rackspace',
-          :rackspace_api_key => props_reader.get("api-key"),
-          :rackspace_username => props_reader.get("username"),
-          :rackspace_region => props_reader.get("region"),
-          :version => :v2,
-          :connection_options => {}
-        })
-      response = rackspace.list_servers
-      response.body['servers'].select do |rackspace_server|
-        if !rackspace_server["name"].match(/#{regex_string}/).nil?
-          # Iterate over the list of private IP addresses
-          rackspace_server['addresses']['private'].select do |private_addr|
-            server (private_addr['addr']), %w{role || :app}
-          end
-        end
+    def rackspace_servers(roles=[], regex_str='', addr_type=:private, config_file=nil, connection_options={})
+      @compute_service = Fog::Compute.new(RackspaceOptions.get(config_file)
+                                          .merge({
+                                                   :provider => 'Rackspace',
+                                                   :version => :v2,
+                                                   :connection_options => connection_options
+                                                 }))
+      # List all servers and filter them based on the passed 'regex_str' parameter
+      @compute_service.list_servers.body['servers']
+        .select { |server| !server['name'].match(/#{regex_str}/).nil? }
+        .flat_map { |s| s["addresses"][addr_type.to_s] }
+        .select { |iface| iface['version'] == 4 }
+        .map { |iface| iface['addr'] }
+        .each { |server_addr| server (server_addr), roles || %w{:app} }
+    end
+
+    def rackspace_autoscale(roles=[], group_name='', addr_type=:private, config_file=nil, connection_options={})
+      rackspace_options = RackspaceOptions.get(config_file)
+      
+      if !connection_options.empty? then
+        rackspace_options.merge!({:connection_options => connection_options})
       end
+      
+      @compute_service = Fog::Compute.new(rackspace_options.merge({
+                                                                   :provider => 'Rackspace',
+                                                                   :version => :v2
+                                                                 }))
+      @autoscale_service = Fog::Rackspace::AutoScale.new(rackspace_options)
+
+      # Get the servers Ids inside the specified group name
+      @autoscale_service.groups.find { |g| g.group_config.name == group_name }.state['active']
+        .map { |server| server['id'] }
+        .map { |id| @compute_service.servers.get id }
+        .flat_map { |h| h.addresses[addr_type.to_s] }
+        .select { |iface| iface['version'] == 4 }
+        .map { |iface| iface['addr'] }
+        .each { |server_addr| server (server_addr), roles || %w{:app} }
     end
     
   end

data/lib/capistrano/rack/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Rack
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Faissal Elamraoui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano