cap-rightscale 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/cap-rightscale.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-rightscale}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Satoshi Ohki"]

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

@@ -1,5 +1,6 @@
 require 'cap-rightscale/utils/rs_utils.rb'
 require 'cap-rightscale/configuration/rightscale/resource'
+require 'cap-rightscale/configuration/rightscale/variable'
 require 'ping'
 require 'thread'
 
@@ -58,7 +59,6 @@ start = Time.now
 
         # Set rightscale's parameters
         _array_id = params[:array_id]
-
         params.delete(:array_id)  # remove rightscale's parameters
 
         host_list = use_rs_cache ? get_server_cache(role) : []  # Get cache
@@ -82,7 +82,7 @@ start = Time.now
             logger.info("Found server: #{hostname}(#{ip})")
             use_nickname ? hostname : ip
           end
-          host_list = _valid_echo(host_list) if validate_echo
+          host_list = RSUtils.valid_echo(host_list) if validate_echo
 
           if host_list && host_list.size > 0
             role(role, params) { host_list }
@@ -137,7 +137,7 @@ start = Time.now
             logger.info("Found server: #{hostname}(#{ip})")
             use_nickname ? hostname : ip
           end
-          host_list = _valid_echo(host_list) if validate_echo
+          host_list = RSUtils.valid_echo(host_list) if validate_echo
 
           if host_list && host_list.size > 0
             role(role, params) { host_list }
@@ -203,7 +203,7 @@ start = Time.now
               logger.info("Found server: #{hostname}(#{ip})")
               use_nickname ? hostname : ip
             end
-            host_list = _valid_echo(host_list) if validate_echo
+            host_list = RSUtils.valid_echo(host_list) if validate_echo
           end
 
           if host_list && host_list.size > 0
@@ -274,26 +274,6 @@ puts "Time: #{Time.now - start}"
           end
         end
 
-        def _valid_echo(host_list)
-          hosts = host_list
-          threads = []
-          hosts.each do |host|
-            threads << Thread.new {Ping.pingecho(host)}
-          end
-          threads.each_with_index do |t,i|
-              unless t.value
-                logger.info("Server dead: #{hosts[i]}")
-                hosts[i] = nil
-              else
-                logger.info("Server alive: #{hosts[i]}")
-              end
-          end
-          hosts.delete(nil)
-          threads.clear
-
-          hosts
-        end
-
         def validate_echo
           @validate_echo ||= false
         end

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

@@ -1,13 +1,37 @@
+require 'ping'
+require 'thread'
+
 class RSUtils
-  def self.mk_rs_cache_dir(prefix=nil)
-    tmpdir = Dir.tmpdir
-    _prefix = prefix || "cap-rightscale"
-    begin
-      path = "#{tmpdir}/#{_prefix}-#{ENV['USER']}-#{rand(0x100000000).to_s(36)}"
-      Dir.mkdir(path, 0700)
-    rescue Errno::EEXIST
-      logger.warn(e)
-      exit(1)
+  class << self
+    def mk_rs_cache_dir(prefix=nil)
+      tmpdir = Dir.tmpdir
+      _prefix = prefix || "cap-rightscale"
+      begin
+        path = "#{tmpdir}/#{_prefix}-#{ENV['USER']}-#{rand(0x100000000).to_s(36)}"
+        Dir.mkdir(path, 0700)
+      rescue Errno::EEXIST
+        logger.warn(e)
+        exit(1)
+      end
+    end
+
+    def valid_echo(host_list)
+      hosts = host_list
+      threads = []
+      hosts.each do |host|
+        threads << Thread.new {Ping.pingecho(host)}
+      end
+      threads.each_with_index do |t,i|
+          unless t.value
+            logger.info("Server dead: #{hosts[i]}")
+            hosts[i] = nil
+          else
+            logger.info("Server alive: #{hosts[i]}")
+          end
+      end
+      hosts.delete(nil)
+      threads.clear
+
+      hosts
     end
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-rightscale
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Satoshi Ohki