cap-rightscale 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/cap-rightscale.gemspec

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

@@ -4,6 +4,8 @@ require 'ping'
 module Capistrano
   class Configuration
     module RightScale
+      attr_writer :validate_echo, :use_nickname, :use_public_ip
+
       def get_rs_confpath
         @rs_confpath ||= File.join(ENV['HOME'], ".rsconf", "rsapiconfig.yml")
       end
@@ -12,17 +14,20 @@ module Capistrano
         @rs_confpath = path
       end
 
-      def rs_cache_lifetime(time)
-        @lifetime = time  # seconds
+      def rs_enable(*args)
+        args.each do |arg|
+          __send__("#{arg}=".to_sym, true) if respond_to?("#{arg}=".to_sym)
+        end
       end
 
-      def validate_echo(bool=false)
-        @pingecho = bool
+      def rs_disable(*args)
+        args.each do |arg|
+          __send__("#{arg}=".to_sym, false) if respond_to?("#{arg}=".to_sym)
+        end
       end
 
-      # register deploy host's /etc/hosts OR dns record(replace 's/ #/-000/' to ServerArray name)
-      def use_nickname(bool=false)
-        @use_nick = bool
+      def rs_cache_lifetime(time)
+        @lifetime = time  # seconds
       end
 
       def domainname(domain)
@@ -40,6 +45,7 @@ module Capistrano
       def server_array(role, params)
         return [] unless check_role(role)
         raise ArgumentError, ":array_id is not included in params!![#{params}]" unless params.has_key?(:array_id)
+        @caller ||= File.basename(caller.map {|x| /(.*?):(\d+)/ =~ x; $1}.first, ".*")
 
 start = Time.now
         logger.info("SETTING ROLE: #{role}")
@@ -65,13 +71,13 @@ 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]
-            if @pingecho
+            ip = use_public_ip ? instance[:ip_address] : instance[:private_ip_address]
+            if validate_echo
               next unless Ping.pingecho(ip)
             end
 
             logger.info("Found server: #{hostname}(#{ip})")
-            enable_hostname ? hostname : ip
+            use_nickname ? hostname : ip
           end
           host_list.delete(nil)
 
@@ -96,6 +102,7 @@ puts "Time: #{Time.now - start}"
       def nickname(role, params)
         return [] unless check_role(role)
         raise ArgumentError, ":deployment is not included in params!![#{params}]" unless params.has_key?(:deployment)
+        @caller ||= File.basename(caller.map {|x| /(.*?):(\d+)/ =~ x; $1}.first, ".*")
 
 start = Time.now
         logger.info("SETTING ROLE: #{role}")
@@ -122,13 +129,13 @@ start = Time.now
           host_list = srvs.map do |server|
             hostname = server[:nickname]
             hostname << ".#{_domain}" if _domain
-            ip = server[:settings][:private_ip_address]
-            if @pingecho
+            ip = use_public_ip ? server[:settings][:ip_address] : server[:settings][:private_ip_address]
+            if validate_echo
               next unless Ping.pingecho(ip)
             end
 
             logger.info("Found server: #{hostname}(#{ip})")
-            enable_hostname ? hostname : ip
+            use_nickname ? hostname : ip
           end
           host_list.delete(nil)
 
@@ -154,6 +161,7 @@ puts "Time: #{Time.now - start}"
         return [] unless check_role(role)
         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)
+        @caller ||= File.basename(caller.map {|x| /(.*?):(\d+)/ =~ x; $1}.first, ".*")
 
 start = Time.now
         logger.info("SETTING ROLE: #{role}")
@@ -190,13 +198,13 @@ start = Time.now
             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
+              ip = use_public_ip ? server[:settings][:ip_address] : server[:settings][:private_ip_address]
+              if validate_echo
                 next unless Ping.pingecho(ip)
               end
 
               logger.info("Found server: #{hostname}(#{ip})")
-              enable_hostname ? hostname : ip
+              use_nickname ? hostname : ip
             end
             host_list.delete(nil)
           end
@@ -211,12 +219,32 @@ puts "Time: #{Time.now - start}"
       end
 
       private
+        def check_role(role)
+          return false if ENV['HOSTS']
+          return false if ENV['ROLES'] && ENV['ROLES'].split(',').include?("#{role}") == false
+          return true
+        end
+
         def get_array(id)
           array = self.instance_variable_get("@array_#{id}")
 
           unless array
             connect
-            array = self.instance_variable_set("@array_#{id}", ServerArray.show(id))
+            begin
+              self.instance_variable_set("@array_#{id}", ServerArray.show(id))
+            rescue => e
+              STDERR.puts("#{e.class}: #{e.pretty_inspect}")
+              warn("Backtrace:\n#{e.backtrace.pretty_inspect}")
+              exit(1)
+            end
+
+            unless ServerArray.status_code == 200
+              STDERR.puts("Errors: STATUS is NOT 200 OK")
+              warn(ServerArray.headers)
+              exit(1)
+            end
+
+            array = self.instance_variable_get("@array_#{id}")
           end
           array
         end
@@ -226,27 +254,46 @@ puts "Time: #{Time.now - start}"
 
           unless dept
             connect
-            self.instance_variable_set("@deployment_#{id}", Deployment.show(id, params))
+            begin
+              self.instance_variable_set("@deployment_#{id}", Deployment.show(id, params))
+            rescue => e
+              STDERR.puts("#{e.class}: #{e.pretty_inspect}")
+              warn("Backtrace:\n#{e.backtrace.pretty_inspect}")
+              exit(1)
+            end
+
+            unless Deployment.status_code == 200
+              STDERR.puts("Errors: STATUS is NOT 200 OK")
+              warn(Deployment.headers)
+              exit(1)
+            end
+
             dept = self.instance_variable_get("@deployment_#{id}")
           end
           dept
         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"])
+          begin
+            @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
+          rescue Errno::ENOENT => e
+            STDERR.puts("Cannot loaded RightScale Auth data!!:\nusername: foo@example.com\npassword: password\naccount: 22329\n")
+            exit(1)
           end
-
           RightResource::Base.connection = @conn
         end
 
         def get_server_cache(role)
            @lifetime ||= 86400
            @server_cache ||= {}
+           c = caller.map {|x| /(.*?):(\d+)/ =~ x; $1}
+           c.delete(__FILE__)
 
            begin
-             @cache_files ||= Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/#{stage}*")
+             @cache_files ||= Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/#{@caller}*")
 
              @cache_files.each do |c|
                @server_cache.update(Marshal.load(open(c) {|f| f.read}))
@@ -281,28 +328,31 @@ puts "Time: #{Time.now - start}"
             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")
+          cache_file = File.join(cache_dir, @caller)
 
           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}"}
+            STDERR.puts("#{e.class}: #{e.pretty_inspect}")
+            warn("Backtrace:\n#{e.backtrace.pretty_inspect}")
           end
         end
 
-        def enable_hostname
-          @use_nick ||= false
+        def validate_echo
+          @validate_echo ||= false
         end
 
-        def _domain
-          @domain || nil
+        # register deploy host's /etc/hosts OR dns record(replace 's/ #/-000/' to ServerArray name)
+        def use_nickname
+          @use_nickname ||= false
         end
 
-        def check_role(role)
-          return false if ENV['HOSTS']
-          return false if ENV['ROLES'] && ENV['ROLES'].split(',').include?("#{role}") == false
-          return true
+        def use_public_ip
+          @use_public_ip ||= false
+        end
+
+        def _domain
+          @domain || nil
         end
     end
   end

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

@@ -8,9 +8,8 @@ namespace :rightscale do
   namespace :cache do
     task :clear do
       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})
+      pp Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/*")
+      FileUtils.rm(Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/*"), {:force => true})
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-rightscale
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -19,7 +19,7 @@ date: 2011-02-03 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: []
@@ -185,7 +185,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