cap-rightscale 0.3.12 → 0.3.13

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/cap-rightscale.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-rightscale}
-  s.version = "0.3.12"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Satoshi Ohki"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/cap-rightscale.rb",
     "lib/cap-rightscale/configuration.rb",
     "lib/cap-rightscale/configuration/rightscale.rb",
+    "lib/cap-rightscale/configuration/rightscale/cache.rb",
     "lib/cap-rightscale/configuration/rightscale/resource.rb",
     "lib/cap-rightscale/recipes.rb",
     "lib/cap-rightscale/recipes/rightscale.rb",
@@ -44,7 +45,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",
@@ -52,7 +53,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

@@ -1,16 +1,22 @@
 require 'cap-rightscale/utils/rs_utils'
+require 'cap-rightscale/configuration/rightscale/cache'
 require 'cap-rightscale/configuration/rightscale/resource'
 
 module Capistrano
   class Configuration
     module RightScale
+      attr_reader :domainname
       attr_writer :validate_echo, :use_nickname, :use_public_ip, :use_rs_cache
-      attr_accessor :domainname
+      attr_accessor :rs_cache_lifetime
 
       def get_rs_instance
         @rs_instance ||= Capistrano::RightScale::Resource.instance
       end
 
+      def get_cache_instance
+        @cache_instance ||= Capistrano::RightScale::Cache.instance
+      end
+
       def get_rs_confpath
         get_rs_instance.confpath
       end
@@ -32,7 +38,11 @@ module Capistrano
       end
 
       def rs_cache_lifetime(time)
-        @lifetime = time  # seconds
+        get_cache_instance.lifetime = time  # seconds
+      end
+
+      def set_domainname(domain)
+        @domainname = domain
       end
 
       # Get RightScale Server Array
@@ -55,20 +65,20 @@ start = Time.now
         _array_id = params[:array_id]
         params.delete(:array_id)  # remove rightscale's parameters
 
-        host_list = use_rs_cache ? get_server_cache(role) : []  # Get cache
+        host_list = use_rs_cache ? get_cache_instance.load_server_cache(role, @caller) : []  # Get cache
 
         if host_list && host_list.size > 0
           logger.info("restore cache of servers:\n#{host_list.pretty_inspect}")
           role(role, params) { host_list }  # set cache to role()
         else
           # Request RightScale API
-          array = get_rs_instance.__send__(:array, _array_id)
+          array = get_rs_instance.array(_array_id)
           logger.info("querying rightscale for server_array #{array.nickname}...")
-          dept = get_rs_instance.__send__(:deployment, array.deployment_href.match(/[0-9]+$/).to_s, :server_settings => 'true')
+          dept = get_rs_instance.deployment(array.deployment_href.match(/[0-9]+$/).to_s, :server_settings => 'true')
           deployment_name = dept.nickname
           logger.info("Deployment #{deployment_name}:")
 
-          host_list = get_rs_instance.__send__(:array_instances, array.id).select {|i| i[:state] == "operational"}.map do |instance|
+          host_list = get_rs_instance.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 << ".#{domainname}" if domainname && hostname.match(/#{domainname}/).nil?
             ip = use_public_ip ? instance[:ip_address] : instance[:private_ip_address]
@@ -80,7 +90,7 @@ start = Time.now
 
           if host_list && host_list.size > 0
             role(role, params) { host_list }
-            dump_server_cache(role, host_list) if use_rs_cache  # Dump cache
+            get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache
           end
         end
 puts "Time: #{Time.now - start}"
@@ -111,14 +121,14 @@ start = Time.now
         params.delete(:deployment)
         params.delete(:name_prefix) if params.has_key?(:name_prefix)
 
-        host_list = use_rs_cache ? get_server_cache(role) : []  # Get cache
+        host_list = use_rs_cache ? get_cache_instance.load_server_cache(role, @caller) : []  # Get cache
 
         if host_list && host_list.size > 0
           logger.info("restore cache of servers:\n#{host_list.pretty_inspect}")
           role(role, params) { host_list }  # set cache to role()
         else
           # Request RightScale API
-          dept = get_rs_instance.__send__(:deployment, _dept_id, :server_settings => 'true')
+          dept = get_rs_instance.deployment(_dept_id, :server_settings => 'true')
           logger.info("querying rightscale for servers #{_name_prefix} in deployment #{dept.nickname}...")
           srvs = dept.servers.select {|s| s[:state] == "operational"}
           srvs = srvs.select {|s| /#{_name_prefix}/ =~ s[:nickname]} if _name_prefix
@@ -135,7 +145,7 @@ start = Time.now
 
           if host_list && host_list.size > 0
             role(role, params) { host_list }
-            dump_server_cache(role, host_list) if use_rs_cache  # Dump cache
+            get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache
           end
         end
 puts "Time: #{Time.now - start}"
@@ -167,7 +177,7 @@ start = Time.now
         params.delete(:deployment)
         params.delete(:tags)
 
-        host_list = use_rs_cache ? get_server_cache(role) : []  # Get cache
+        host_list = use_rs_cache ? get_cache_instance.load_server_cache(role, @caller) : []  # Get cache
 
         if host_list && host_list.size > 0
           logger.info("restore cache of servers:\n#{host_list.pretty_inspect}")
@@ -202,7 +212,7 @@ start = Time.now
 
           if host_list && host_list.size > 0
             role(role, params) { host_list }
-            dump_server_cache(role, host_list) if use_rs_cache  # Dump cache
+            get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache
           end
         end
 puts "Time: #{Time.now - start}"
@@ -216,56 +226,6 @@ puts "Time: #{Time.now - start}"
           return true
         end
 
-        def get_server_cache(role)
-           @lifetime ||= 86400
-           server_cache = self.instance_variable_get("@#{role}_cache")
-
-           begin
-             cache_files = Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/#{@caller}*#{role}")
-
-             if cache_files.size > 0 && !server_cache
-               c = Marshal.load(open(cache_files.first) {|f| f.read})
-               self.instance_variable_set("@#{role}_cache", c)
-             end
-             server_cache = self.instance_variable_get("@#{role}_cache")
-             return [] unless server_cache # No cache entry
-
-             # get servers
-             if Time.now - server_cache[role][:cache] > @lifetime
-               server_list = []
-             elsif server_cache[role][:servers]
-               server_list = server_cache[role][:servers]
-             else
-               server_list = []
-             end
-           rescue => e
-             return [] unless server_cache
-           end
-
-           server_list
-        end
-
-        def dump_server_cache(role, servers)
-          h = {role => {:servers => servers, :cache => Time.now}}
-          obj_dump = Marshal.dump(h)
-
-          # Get cache directory
-          cache_dir = Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*").first
-          if cache_dir.nil?
-            RSUtils.mk_rs_cache_dir
-            cache_dir = Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*").first
-            exit if cache_dir.nil?
-          end
-          cache_file = File.join(cache_dir, "#{@caller}-#{role}")
-
-          begin
-            open(cache_file, "w") {|f| f.write(obj_dump)}
-          rescue => e
-            STDERR.puts("#{e.class}: #{e.pretty_inspect}")
-            warn("Backtrace:\n#{e.backtrace.pretty_inspect}")
-          end
-        end
-
         def validate_echo
           @validate_echo ||= false
         end

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

@@ -0,0 +1,64 @@
+require 'singleton'
+
+module Capistrano
+  module RightScale
+    class Cache
+      include Singleton
+
+      attr_accessor :lifetime
+      attr_reader :array, :array_instances, :deployment
+      def initialize
+        @lifetime = 86400
+      end
+
+      def load_server_cache(role, prefix=nil)
+         server_cache = self.instance_variable_get("@#{role}_cache")
+
+         begin
+           cache_files = Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/#{prefix}*#{role}.cache")
+
+           if cache_files.size > 0 && !server_cache
+             c = Marshal.load(open(cache_files.first) {|f| f.read})
+             self.instance_variable_set("@#{role}_cache", c)
+           end
+           server_cache = self.instance_variable_get("@#{role}_cache")
+           return [] unless server_cache # No cache entry
+
+           # get servers
+           if Time.now - server_cache[role][:cache] > lifetime
+             server_list = []
+           elsif server_cache[role][:servers]
+             server_list = server_cache[role][:servers]
+           else
+             server_list = []
+           end
+         rescue => e
+           return [] unless server_cache
+         end
+
+         server_list
+      end
+
+      def dump_server_cache(role, servers, prefix=nil)
+        h = {role => {:servers => servers, :cache => Time.now}}
+        obj_dump = Marshal.dump(h)
+
+        # Get cache directory
+        cache_dir = Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*").first
+        if cache_dir.nil?
+          RSUtils.mk_rs_cache_dir
+          cache_dir = Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*").first
+          exit if cache_dir.nil?
+        end
+        cache_file = File.join(cache_dir, "#{prefix}-#{role}.cache")
+
+        begin
+          open(cache_file, "w") {|f| f.write(obj_dump)}
+        rescue => e
+          STDERR.puts("#{e.class}: #{e.pretty_inspect}")
+          warn("Backtrace:\n#{e.backtrace.pretty_inspect}")
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-rightscale
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 12
-  version: 0.3.12
+  - 13
+  version: 0.3.13
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -19,7 +19,7 @@ date: 2011-02-04 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,11 +91,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  requirement: *id005
+  prerelease: false
   type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: capistrano
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -106,11 +106,11 @@ dependencies:
         - 2
         - 4
         version: "2.4"
-  name: capistrano
-  requirement: *id006
+  prerelease: false
   type: :runtime
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: rightresource
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -122,9 +122,9 @@ dependencies:
         - 3
         - 4
         version: 0.3.4
-  name: rightresource
-  requirement: *id007
+  prerelease: false
   type: :runtime
+  requirement: *id007
 description: Capistrano extension that maps RightScale parameters to Roles.
 email: roothybrid7@gmail.com
 executables: []
@@ -150,6 +150,7 @@ files:
 - lib/cap-rightscale.rb
 - lib/cap-rightscale/configuration.rb
 - lib/cap-rightscale/configuration/rightscale.rb
+- lib/cap-rightscale/configuration/rightscale/cache.rb
 - lib/cap-rightscale/configuration/rightscale/resource.rb
 - lib/cap-rightscale/recipes.rb
 - lib/cap-rightscale/recipes/rightscale.rb
@@ -188,7 +189,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