cap-rightscale 0.0.12 → 0.1.0

data/Rakefile

@@ -21,6 +21,8 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Satoshi Ohki"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  gem.add_runtime_dependency 'capistrano', '> 2.5'
+  gem.add_runtime_dependency 'rightresource', '> 0.3.4'
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.1.0

data/cap-rightscale.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-rightscale}
-  s.version = "0.0.12"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Satoshi Ohki"]
-  s.date = %q{2011-02-02}
+  s.date = %q{2011-02-03}
   s.description = %q{Capistrano extension that maps RightScale parameters to Roles.}
   s.email = %q{roothybrid7@gmail.com}
   s.extra_rdoc_files = [
@@ -41,7 +41,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",
@@ -49,6 +49,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
@@ -57,12 +58,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<capistrano>, ["> 2.5"])
+      s.add_runtime_dependency(%q<rightresource>, ["> 0.3.4"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<capistrano>, ["> 2.5"])
+      s.add_dependency(%q<rightresource>, ["> 0.3.4"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -70,6 +75,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<capistrano>, ["> 2.5"])
+    s.add_dependency(%q<rightresource>, ["> 0.3.4"])
   end
 end
 

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

@@ -1,3 +1,6 @@
+require 'cap-rightscale/utils/rs_utils.rb'
+require 'ping'
+
 module Capistrano
   class Configuration
     module RightScale
@@ -9,6 +12,14 @@ module Capistrano
         @rs_confpath = path
       end
 
+      def rs_cache_lifetime(time)
+        @lifetime = time  # seconds
+      end
+
+      def validate_echo(bool=false)
+        @pingecho = bool
+      end
+
       # register deploy host's /etc/hosts OR dns record(replace 's/ #/-000/' to ServerArray name)
       def use_nickname(bool=false)
         @use_nick = bool
@@ -18,15 +29,6 @@ module Capistrano
         @domain = domain
       end
 
-      def connect
-        @auth ||= open(get_rs_confpath) {|f| YAML.load(f)}
-        @conn ||= RightResource::Connection.new do |c|
-          c.login(:username => @auth["username"], :password => @auth["password"], :account => @auth["account"])
-        end
-
-        RightResource::Base.connection = @conn
-      end
-
       # Get RightScale Server Array
       # === Parameters
       # * _role_ - Capistrano role symbol (ex. :app, :web, :db)
@@ -39,25 +41,46 @@ module Capistrano
         return [] unless check_role(role)
         raise ArgumentError, ":array_id is not included in params!![#{params}]" unless params.has_key?(:array_id)
 
-start = Time.now
-        connect
         logger.info("SETTING ROLE: #{role}")
-        array = ServerArray.show(params[:array_id])
-        logger.info("querying rightscale for server_array #{array.nickname}...")
-        deployment_name = Deployment.show(array.deployment_href.match(/[0-9]+$/).to_s).nickname
-        logger.info("Deployment #{deployment_name}:")
+
+        # Set rightscale's parameters
+        _array = params[:array_id]
 
         params.delete(:array_id)  # remove rightscale's parameters
 
-        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
-        end
-        role(role, params) { host_list } if host_list
+        host_list = get_server_cache(role)  # 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
+start = Time.now
+          connect
+          array = ServerArray.show(_array)
+          logger.info("querying rightscale for server_array #{array.nickname}...")
+          deployment_name = Deployment.show(array.deployment_href.match(/[0-9]+$/).to_s).nickname
+          logger.info("Deployment #{deployment_name}:")
+
+          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]
+            if @pingecho
+              next unless Ping.pingecho(ip)
+            end
+
+            logger.info("Found server: #{hostname}(#{ip})")
+            enable_hostname ? hostname : ip
+          end
+          host_list.delete(nil)
 puts "Time: #{Time.now - start}"
+          if host_list && host_list.size > 0
+            role(role, params) { host_list }
+            dump_server_cache(role, host_list)  # Dump cache
+          end
+        end
+
         host_list || []
       end
 
@@ -74,27 +97,48 @@ puts "Time: #{Time.now - start}"
         return [] unless check_role(role)
         raise ArgumentError, ":deployment is not included in params!![#{params}]" unless params.has_key?(:deployment)
 
-start = Time.now
-        connect
         logger.info("SETTING ROLE: #{role}")
-        dept = Deployment.show(params[:deployment], :server_settings => 'true')
-        logger.info("querying rightscale for servers #{params[:name_prefix]} in deployment #{dept.nickname}...")
-        srvs = dept.servers.select {|s| s[:state] == "operational"}
-        srvs = srvs.select {|s| /#{params[:name_prefix]}/ =~ s[:nickname]} if params[:name_prefix]
 
-        # remove rightscale's parameters
+        # Set rightscale's parameters
+        _dept = params[:deployment]
+        _name_prefix = params[:name_prefix]
+
         params.delete(:deployment)
         params.delete(:name_prefix) if params.has_key?(:name_prefix)
 
-        host_list = srvs.map do |server|
-          hostname = server[:nickname]
-          hostname << ".#{_domain}" if _domain
-          ip = server[:settings][:private_ip_address]
-          logger.info("Found server: #{hostname}(#{ip})")
-          enable_hostname ? hostname : ip
-        end
-        role(role, params) { host_list } if host_list
+        host_list = get_server_cache(role)  # 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
+start = Time.now
+          connect
+          dept = Deployment.show(_dept, :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
+
+          host_list = srvs.map do |server|
+            hostname = server[:nickname]
+            hostname << ".#{_domain}" if _domain
+            ip = server[:settings][:private_ip_address]
+            if @pingecho
+              next unless Ping.pingecho(ip)
+            end
+
+            logger.info("Found server: #{hostname}(#{ip})")
+            enable_hostname ? hostname : ip
+          end
+          host_list.delete(nil)
 puts "Time: #{Time.now - start}"
+          if host_list && host_list.size > 0
+            role(role, params) { host_list }
+            dump_server_cache(role, host_list)  # Dump cache
+          end
+        end
+
         host_list || []
       end
 
@@ -112,44 +156,122 @@ puts "Time: #{Time.now - start}"
         raise ArgumentError, ":tags is not included in params!![#{params}]" unless params.has_key?(:tags)
         raise ArgumentError, ":deployment is not included in params!![#{params}]" unless params.has_key?(:deployment)
 
-start = Time.now
-        connect
         logger.info("SETTING ROLE: #{role}")
-        dept = Deployment.show(params[:deployment], :server_settings => 'true')
-        logger.info("querying rightscale for servers matching tags #{params[:tags]} in deployment #{dept.nickname}...")
-        srvs = dept.servers.select {|s| s[:state] == "operational"}
 
-        ts_params = {:resource_type => "ec2_instance", :tags => [params[:tags]]}
-        ts = Tag.search(ts_params).
-          select {|s| s.state == "operational"}.
-          select {|s| s.deployment_href.match(/[0-9]+$/).to_s == params[:deployment].to_s}
+        # Set rightscale's parameters
+        _dept = params[:deployment]
+        _tags = params[:tags]
 
-        # diff servers in deployment and servers matching tags in deployment
-        srvs_ids = srvs.map {|s| s[:href].match(/[0-9]+$/).to_s}
-        ts_ids = ts.map {|s| s.href.sub("/current", "").match(/[0-9]+$/).to_s}
-        found_ids = srvs_ids & ts_ids
-
-        # remove rightscale's parameters
         params.delete(:deployment)
         params.delete(:tags)
 
-        host_list = []
-        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: #{hostname}(#{ip})")
-            enable_hostname ? hostname : ip
-          end
+        host_list = get_server_cache(role)  # Get cache
 
-          role(role, params) { host_list } if host_list
-        end
+        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
+start = Time.now
+          connect
+          dept = Deployment.show(_dept, :server_settings => 'true')
+          logger.info("querying rightscale for servers matching tags #{_tags} in deployment #{dept.nickname}...")
+          srvs = dept.servers.select {|s| s[:state] == "operational"}
+
+          ts_params = {:resource_type => "ec2_instance", :tags => [_tags]}
+          ts = Tag.search(ts_params).
+            select {|s| s.state == "operational"}.
+            select {|s| s.deployment_href.match(/[0-9]+$/).to_s == _dept.to_s}
+
+          # diff servers in deployment and servers matching tags in deployment
+          srvs_ids = srvs.map {|s| s[:href].match(/[0-9]+$/).to_s}
+          ts_ids = ts.map {|s| s.href.sub("/current", "").match(/[0-9]+$/).to_s}
+          found_ids = srvs_ids & ts_ids
+
+          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]
+              if @pingecho
+                next unless Ping.pingecho(ip)
+              end
+
+              logger.info("Found server: #{hostname}(#{ip})")
+              enable_hostname ? hostname : ip
+            end
+            host_list.delete(nil)
+          end
 puts "Time: #{Time.now - start}"
+          if host_list && host_list.size > 0
+            role(role, params) { host_list }
+            dump_server_cache(role, host_list)  # Dump cache
+          end
+        end
+
         host_list || []
       end
 
       private
+        def connect
+          @auth ||= open(get_rs_confpath) {|f| YAML.load(f)}
+          @conn ||= RightResource::Connection.new do |c|
+            c.login(:username => @auth["username"], :password => @auth["password"], :account => @auth["account"])
+          end
+
+          RightResource::Base.connection = @conn
+        end
+
+        def get_server_cache(role)
+           @lifetime ||= 86400
+           @server_cache ||= {}
+
+           begin
+             @cache_files ||= Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/#{stage}*")
+
+             @cache_files.each do |c|
+               @server_cache.update(Marshal.load(open(c) {|f| f.read}))
+             end if @cache_files.size > 0 && @server_cache.empty?
+
+             return [] if @server_cache.empty? # No cache entry
+
+             # get servers
+             if Time.now - @server_cache[role][:cache] > @lifetime
+               @server_cache.delete(role)
+               server_list = []
+             elsif @server_cache[role][:servers]
+               server_list = @server_cache[role][:servers]
+             else
+               server_list = []
+             end
+           rescue => e
+             return [] if @server_cache.empty?
+           end
+           server_list
+        end
+
+        def dump_server_cache(role, servers)
+          h = {role => {:servers => servers, :cache => Time.now}}
+          cache = @server_cache.update(h) # update servers cache
+          obj_dump = Marshal.dump(cache)
+
+          # 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, stage ? "#{stage}" : "default")
+
+          begin
+            open(cache_file, "w") {|f| f.write(obj_dump)}
+          rescue => e
+            logger.error("#{e.class}: #{e.pretty_inspect}")
+            logger.debug {"Backtrace:\n#{e.backtrace.pretty_inspect}"}
+          end
+        end
+
         def enable_hostname
           @use_nick ||= false
         end

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

@@ -7,9 +7,10 @@ namespace :rightscale do
   desc "Clear rightscale's server list cache"
   namespace :cache do
     task :clear do
-      puts "Clear cache all"
-      pp Dir.glob("#{Dir.tmpdir}/cap-rightscale-*/#{stage}*")
-      FileUtils.rm(Dir.glob("#{Dir.tmpdir}/cap-rightscale-*/#{stage}*"), {:force => true})
+      logger.info("Clear cache all")
+      pp Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/#{stage}*")
+      prefix = stage ? "#{stage}" : "default"
+      FileUtils.rm(Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/#{prefix}*"), {:force => true})
     end
   end
 end

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

@@ -1,5 +1,5 @@
 class RSUtils
-  def self.mk_rs_cache_dir(prefix)
+  def self.mk_rs_cache_dir(prefix=nil)
     tmpdir = Dir.tmpdir
     _prefix = prefix || "cap-rightscale"
     begin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-rightscale
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 27
+  prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 12
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +09:00
+date: 2011-02-03 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,9 +91,40 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
+  name: rcov
   requirement: *id005
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  name: capistrano
+  requirement: *id006
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
+        version: 0.3.4
+  name: rightresource
+  requirement: *id007
+  type: :runtime
 description: Capistrano extension that maps RightScale parameters to Roles.
 email: roothybrid7@gmail.com
 executables: []
@@ -154,7 +185,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