cap-rightscale 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/cap-rightscale.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-rightscale}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Satoshi Ohki"]
-  s.date = %q{2011-02-04}
+  s.date = %q{2011-02-05}
   s.description = %q{Capistrano extension that maps RightScale parameters to Roles.}
   s.email = %q{roothybrid7@gmail.com}
   s.extra_rdoc_files = [

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

@@ -55,7 +55,7 @@ start = Time.now
 
         host_list = use_rs_cache ? get_cache_instance.load_server_cache(role, @caller) : []  # Get cache
 
-        if host_list && host_list.size > 0
+        if host_list.size > 0
           [:array_id, :except_tags].each {|key| params.delete(key)}  # remove rightscale's parameters
           logger.info("restore cache of servers:\n#{host_list.pretty_inspect}")
           role(role, params) { host_list }  # set cache to role()
@@ -84,7 +84,7 @@ start = Time.now
           end
           host_list = RSUtils.valid_echo(host_list, logger) if validate_echo
 
-          if host_list && host_list.size > 0
+          if host_list.size > 0
             [:array_id, :except_tags].each {|key| params.delete(key)}  # remove rightscale's parameters
             role(role, params) { host_list }
             get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache
@@ -141,7 +141,7 @@ start = Time.now
           end
           host_list = RSUtils.valid_echo(host_list, logger) if validate_echo
 
-          if host_list && host_list.size > 0
+          if host_list.size > 0
             [:array_id, :except_tags].each {|key| params.delete(key)}  # remove rightscale's parameters
             role(role, params) { host_list }
             get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache
@@ -154,7 +154,8 @@ puts "Time: #{Time.now - start}"
       # Get servers matching tags in deployment
       # === Parameters
       # * _role_ - Capistrano role symbol (ex. :app, :web, :db)
-      # * _params[:tags]_ - ex. :tags => "xx_db:role=master", "xx_web:role", "xx_lb" (RightScale tags partial matchs 'namespece:predicate=value')
+      # * _params[:tags]_ - ex. :tags => "xx_db:role=master",
+      #     "xx_web:role", "xx_lb" (RightScale tags partial matchs 'namespece:predicate=value')
       # * _params[:deployment]_ - ex. :deployment => 1[https://my.rightscale.com/deployments/{id}]
       # * _params[:xxx]_ - ex. :user => "www", :port => 2345, etc...
       # === Examples
@@ -171,7 +172,7 @@ start = Time.now
 
         host_list = use_rs_cache ? get_cache_instance.load_server_cache(role, @caller) : []  # Get cache
 
-        if host_list && host_list.size > 0
+        if host_list.size > 0
           [:deployment, :tags, :except_tags].each {|key| params.delete(key)}  # remove rightscale's parameters
           logger.info("restore cache of servers:\n#{host_list.pretty_inspect}")
           role(role, params) { host_list }  # set cache to role()
@@ -202,7 +203,7 @@ start = Time.now
 
           host_list = RSUtils.valid_echo(host_list, logger) if validate_echo
 
-          if host_list && host_list.size > 0
+          if host_list.size > 0
             [:deployment, :tags, :except_tags].each {|key| params.delete(key)}  # remove rightscale's parameters
             role(role, params) { host_list }
             get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache

data/lib/cap-rightscale/utils/rs_utils.rb

@@ -10,7 +10,7 @@ class RSUtils
         path = "#{tmpdir}/#{_prefix}-#{ENV['USER']}-#{rand(0x100000000).to_s(36)}"
         Dir.mkdir(path, 0700)
       rescue Errno::EEXIST
-        warn(e)
+        STEDERR.puts(e)
         exit(1)
       end
     end
@@ -32,7 +32,7 @@ class RSUtils
       hosts.delete(nil)
       threads.clear
 
-      hosts
+      hosts || []
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-rightscale
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +09:00
+date: 2011-02-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency