cap-rightscale 0.3.10 → 0.3.11

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/cap-rightscale.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-rightscale}
-  s.version = "0.3.10"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Satoshi Ohki"]
-  s.date = %q{2011-02-03}
+  s.date = %q{2011-02-04}
   s.description = %q{Capistrano extension that maps RightScale parameters to Roles.}
   s.email = %q{roothybrid7@gmail.com}
   s.extra_rdoc_files = [
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/roothybrid7/cap-rightscale}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Capistrano extension that maps RightScale parameters to Roles}
   s.test_files = [
     "spec/cap-rightscale_spec.rb",
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/cap-rightscale/configuration/rightscale.rb

@@ -1,10 +1,11 @@
-require 'cap-rightscale/utils/rs_utils.rb'
+require 'cap-rightscale/utils/rs_utils'
 require 'cap-rightscale/configuration/rightscale/resource'
 
 module Capistrano
   class Configuration
     module RightScale
       attr_writer :validate_echo, :use_nickname, :use_public_ip, :use_rs_cache
+      attr_accessor :domainname
 
       def get_rs_instance
         @rs_instance ||= Capistrano::RightScale::Resource.instance
@@ -34,10 +35,6 @@ module Capistrano
         @lifetime = time  # seconds
       end
 
-      def domainname(domain)
-        @domain = domain
-      end
-
       # Get RightScale Server Array
       # === Parameters
       # * _role_ - Capistrano role symbol (ex. :app, :web, :db)
@@ -73,7 +70,7 @@ start = Time.now
 
           host_list = get_rs_instance.__send__(:array_instances, array.id).select {|i| i[:state] == "operational"}.map do |instance|
             hostname = instance[:nickname].sub(/ #[0-9]+$/, "-%03d" % instance[:nickname].match(/[0-9]+$/).to_s.to_i)
-            hostname << ".#{_domain}" if _domain && hostname.match(/#{_domain}/).nil?
+            hostname << ".#{domainname}" if domainname && hostname.match(/#{domainname}/).nil?
             ip = use_public_ip ? instance[:ip_address] : instance[:private_ip_address]
 
             logger.info("Found server: #{hostname}(#{ip})")
@@ -128,7 +125,7 @@ start = Time.now
 
           host_list = srvs.map do |server|
             hostname = server[:nickname]
-            hostname << ".#{_domain}" if _domain && hostname.match(/#{_domain}/).nil?
+            hostname << ".#{domainname}" if domainname && hostname.match(/#{domainname}/).nil?
             ip = use_public_ip ? server[:settings][:ip_address] : server[:settings][:private_ip_address]
 
             logger.info("Found server: #{hostname}(#{ip})")
@@ -194,7 +191,7 @@ start = Time.now
           if found_ids.size > 0
             host_list = srvs.select {|s| found_ids.include?(s[:href].match(/[0-9]+$/).to_s)}.map do |server|
               hostname = server[:nickname]
-              hostname << ".#{_domain}" if _domain && hostname.match(/#{_domain}/).nil?
+              hostname << ".#{domainname}" if domainname && hostname.match(/#{domainname}/).nil?
               ip = use_public_ip ? server[:settings][:ip_address] : server[:settings][:private_ip_address]
 
               logger.info("Found server: #{hostname}(#{ip})")
@@ -290,10 +287,6 @@ puts "Time: #{Time.now - start}"
           @use_rs_cache = true if @use_rs_cache.nil?
           @use_rs_cache
         end
-
-        def _domain
-          @domain || nil
-        end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-rightscale
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 5
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +09:00
+date: 2011-02-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +31,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  prerelease: false
-  type: :development
+  name: rspec
   requirement: *id001
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +45,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
+  name: cucumber
   requirement: *id002
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +61,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  type: :development
+  name: bundler
   requirement: *id003
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,11 +77,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  prerelease: false
-  type: :development
+  name: jeweler
   requirement: *id004
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,11 +91,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
+  name: rcov
   requirement: *id005
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: capistrano
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -106,11 +106,11 @@ dependencies:
         - 2
         - 4
         version: "2.4"
-  prerelease: false
-  type: :runtime
+  name: capistrano
   requirement: *id006
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: rightresource
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -122,9 +122,9 @@ dependencies:
         - 3
         - 4
         version: 0.3.4
-  prerelease: false
-  type: :runtime
+  name: rightresource
   requirement: *id007
+  type: :runtime
 description: Capistrano extension that maps RightScale parameters to Roles.
 email: roothybrid7@gmail.com
 executables: []
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Capistrano extension that maps RightScale parameters to Roles