cap-rightscale 0.4.5 → 0.4.6

data/README.jp.rdoc

@@ -0,0 +1,19 @@
+= cap-rightscale
+
+Capistrano extension that maps RightScale parameters to Roles
+
+== Contributing to cap-rightscale
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 Satoshi Ohki. See LICENSE.txt for
+further details.
+

data/README.rdoc

@@ -1,6 +1,20 @@
 = cap-rightscale
 
-Description goes here.
+Capistrano extension that maps RightScale parameters to Roles
+
+    # config/deploy.rb
+    require 'rubygems'
+    require 'cap-rightscale'
+    require 'cap-rightscale/recipes'
+
+    SERVER_ARRAY_ID = 1
+    DEPLOYMENT_ID = 1
+
+    # set roles
+    nickname :web, :name_prefix => "proxy", :deployment => DEPLOYMENT_ID
+    server_array :app, :array_id => SERVER_ARRAY_ID
+    tag :dbm, :tags => "xx_db:role=master", :deployment => DEPLOYMENT_ID, :no_release => true
+    tag :dbs, :tags => "xx_db:role=slave", :deployment => DEPLOYMENT_ID
 
 == Contributing to cap-rightscale
  

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/cap-rightscale.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-rightscale}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Satoshi Ohki"]
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.email = %q{roothybrid7@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
+    "README.jp.rdoc",
     "README.rdoc"
   ]
   s.files = [

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

@@ -90,7 +90,7 @@ start = Time.now
             get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache
           end
         end
-puts "Time: #{Time.now - start}"
+logger.debug("Time: #{Time.now - start}")
         host_list || []
       end
 
@@ -147,7 +147,7 @@ start = Time.now
             get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache
           end
         end
-puts "Time: #{Time.now - start}"
+logger.debug("Time: #{Time.now - start}")
         host_list || []
       end
 
@@ -209,7 +209,7 @@ start = Time.now
             get_cache_instance.dump_server_cache(role, host_list, @caller) if use_rs_cache  # Dump cache
           end
         end
-puts "Time: #{Time.now - start}"
+logger.debug("Time: #{Time.now - start}")
         host_list || []
       end
 

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

@@ -12,32 +12,31 @@ module Capistrano
       end
 
       def load_server_cache(role, prefix=nil)
-         server_cache = self.instance_variable_get("@#{role}_cache")
+        server_cache = self.instance_variable_get("@#{role}_cache")
 
-         begin
-           cache_files = Dir.glob("#{Dir.tmpdir}/cap-rightscale-#{ENV['USER']}-*/#{prefix}*#{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
+          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
-             STDERR.puts("The cache of server list has expired.")
-             server_list = []
-           elsif server_cache[role][:servers]
-             server_list = server_cache[role][:servers]
-           else
-             server_list = []
-           end
-         rescue => e
-           return [] unless server_cache
-         end
+          # 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
+        server_list
       end
 
       def dump_server_cache(role, servers, prefix=nil)

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

@@ -18,16 +18,17 @@ module Capistrano
             c.login(:username => @auth["username"], :password => @auth["password"], :account => @auth["account"])
           end
         rescue => e
-          auth_data = open(File.join(File.expand_path(File.dirname(__FILE__)), '/../../../../rsapiconfig.yml.sample')) {|f| f.read}
+          auth_data = open(File.join(File.expand_path(
+            File.dirname(__FILE__)), '/../../../../rsapiconfig.yml.sample')) {|f| f.read}
           STDERR.puts <<-"USAGE"
-  Cannot load RightScale Auth data!!:
-    Put authfile:<rsapiconfig.yml> in <HOME>/.rsconf/
-      OR
-    Set param: set_rs_confpath <authfile_path>
+Cannot load RightScale API credentials!!:
+  Put authfile:<rsapiconfig.yml> in <HOME>/.rsconf/
+    OR
+  Set param: set_rs_confpath <authfile_path>
 
-  Authfile contents:
-  #{auth_data}
-  USAGE
+Authfile contents: specify your Rightscale API credentials
+#{auth_data}
+USAGE
           exit(1)
         end
         RightResource::Base.connection = @conn
@@ -58,17 +59,20 @@ module Capistrano
       end
 
       def array(id)
-        _instance_variable_set(:array, id, lambda {ServerArray.show(id)}) unless self.instance_variable_get("@array_#{id}")
+        _instance_variable_set(:array, id, lambda {ServerArray.show(id)}) unless
+          self.instance_variable_get("@array_#{id}")
         self.instance_variable_get("@array_#{id}")
       end
 
       def array_instances(id)
-        _instance_variable_set(:array_instances, id, lambda {ServerArray.instances(id)}) unless self.instance_variable_get("@array_instances_#{id}")
+        _instance_variable_set(:array_instances, id,
+          lambda {ServerArray.instances(id)}) unless self.instance_variable_get("@array_instances_#{id}")
         self.instance_variable_get("@array_instances_#{id}")
       end
 
       def deployment(id, params)
-        _instance_variable_set(:deployment, id, lambda {Deployment.show(id, params)}) unless self.instance_variable_get("@deployment_#{id}")
+        _instance_variable_set(:deployment, id,
+          lambda {Deployment.show(id, params)}) unless self.instance_variable_get("@deployment_#{id}")
         self.instance_variable_get("@deployment_#{id}")
       end
 

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

@@ -1,11 +1,6 @@
 namespace :rightscale do
-  desc "Dry run"
-  task :dry_run do
+  desc "None task"
+  task :none do
     nil
   end
-
-  desc "Dry run"
-  task :noop do
-    dry_run
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-rightscale
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -133,6 +133,7 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
+- README.jp.rdoc
 - README.rdoc
 files: 
 - .document
@@ -159,6 +160,7 @@ files:
 - rsapiconfig.yml.sample
 - spec/cap-rightscale_spec.rb
 - spec/spec_helper.rb
+- README.jp.rdoc
 has_rdoc: true
 homepage: http://github.com/roothybrid7/cap-rightscale
 licenses: