cap-rightscale 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/cap-rightscale.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-rightscale}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Satoshi Ohki"]
@@ -40,7 +40,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.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Capistrano extension that maps RightScale parameters to Roles}
   s.test_files = [
     "spec/cap-rightscale_spec.rb",
@@ -48,7 +48,6 @@ 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

@@ -10,12 +10,12 @@ module Capistrano
       end
 
       # register deploy host's /etc/hosts OR dns record(replace 's/ #/-000/' to ServerArray name)
-      def use_nick(bool=false)
+      def use_nickname(bool=false)
         @use_nick = bool
       end
 
-      def enable_hostname
-        @use_nick ||= false
+      def domainname(domain)
+        @domain = domain
       end
 
       def connect
@@ -23,13 +23,8 @@ module Capistrano
         @conn ||= RightResource::Connection.new do |c|
           c.login(:username => @auth["username"], :password => @auth["password"], :account => @auth["account"])
         end
-        RightResource::Base.connection = @conn
-      end
 
-      def check_role(role)
-        return false if ENV['HOSTS']
-        return false if ENV['ROLES'] && ENV['ROLES'].split(',').include?("#{role}") == false
-        return true
+        RightResource::Base.connection = @conn
       end
 
       # Get RightScale Server Array
@@ -56,6 +51,7 @@ start = Time.now
 
         host_list = ServerArray.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
           ip = instance[:private_ip_address]
           logger.info("Found server: #{hostname}(#{ip})")
           enable_hostname ? hostname : ip
@@ -92,6 +88,8 @@ start = Time.now
 
         host_list = srvs.map do |server|
           hostname = server[:nickname]
+          hostname << ".#{_domain}" if _domain
+puts hostname
           ip = server[:settings][:private_ip_address]
           logger.info("Found server: #{hostname}(#{ip})")
           enable_hostname ? hostname : ip
@@ -140,8 +138,9 @@ 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
             ip = server[:settings][:private_ip_address]
-            logger.info("Found server: #{server[:nickname]}(#{ip})")
+            logger.info("Found server: #{hostname}(#{ip})")
             enable_hostname ? hostname : ip
           end
 
@@ -150,6 +149,21 @@ start = Time.now
 puts "Time: #{Time.now - start}"
         host_list || []
       end
+
+      private
+        def enable_hostname
+          @use_nick ||= false
+        end
+
+        def _domain
+          @domain || nil
+        end
+
+        def check_role(role)
+          return false if ENV['HOSTS']
+          return false if ENV['ROLES'] && ENV['ROLES'].split(',').include?("#{role}") == false
+          return true
+        end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-rightscale
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -19,7 +19,7 @@ date: 2011-02-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +31,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: rspec
-  requirement: *id001
+  prerelease: false
   type: :development
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: cucumber
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +45,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: cucumber
-  requirement: *id002
+  prerelease: false
   type: :development
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: bundler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +61,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  requirement: *id003
+  prerelease: false
   type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,11 +77,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  name: jeweler
-  requirement: *id004
+  prerelease: false
   type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: rcov
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,9 +91,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  requirement: *id005
+  prerelease: false
   type: :development
+  requirement: *id005
 description: Capistrano extension that maps RightScale parameters to Roles.
 email: roothybrid7@gmail.com
 executables: []
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Capistrano extension that maps RightScale parameters to Roles