crossroads_capistrano 1.2.9 → 1.3.0

data/crossroads_capistrano.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "crossroads_capistrano"
-  s.version     = "1.2.9"
+  s.version     = "1.3.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/lib/crossroads_capistrano.rb

@@ -1,23 +1,20 @@
-module CrossroadsCapistrano
-  begin
-    @@cap_config = Capistrano::Configuration.instance(:must_exist)
-    class << self
-      def load_recipes(recipes)
-        @@cap_config.load do
-          if recipes == :all
-            # Load all available recipes.
-            recipes = Dir.glob(File.join(File.dirname(__FILE__), 'crossroads_capistrano', '*.rb'))
-            recipes.each{|f| load f}
-          else
-            # Load each specified recipe.
-            recipes.each{|r| load File.join(File.dirname(__FILE__),'crossroads_capistrano',"#{r}.rb")}
-          end
-        end
-      end
+# crossroads_recipes for using RVM on a server with capistrano.
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "rvm/capistrano requires Capistrano >= 2."
+end
+
+Capistrano::Configuration.instance(:must_exist).load do
+  def load_crossroads_recipes(recipes)
+    if recipes == :all
+      # Load all available crossroads_recipes.
+      recipes = Dir.glob(File.join(File.dirname(__FILE__),
+                                   'crossroads_capistrano', 'recipes', '*.rb'))
+      recipes.each{|f| load f}
+    else
+      # Load each specified recipe.
+      recipes.each{|r| load File.join(File.dirname(__FILE__),
+                                      "crossroads_capistrano/recipes/#{r}.rb")}
     end
-  rescue LoadError => ex
-    # Ignore this gem if Capistrano is not loaded.
-    raise ex unless ex.message == "Please require this file from within a Capistrano recipe"
   end
 end
 

data/lib/crossroads_capistrano/recipes/revisions.rb

@@ -0,0 +1,30 @@
+namespace :deploy do
+  desc "Show currently deployed revision on server."
+  task :revisions, :roles => :app do
+    current, previous, latest = current_revision[0,7], previous_revision[0,7], real_revision[0,7]
+    puts "\n" << "-"*63
+    puts "===== Master Revision: \033[1;33m#{latest}\033[0m\n\n"
+    puts "===== [ \033[1;36m#{application} - #{stage}\033[0m ]"
+    puts "=== Deployed Revision: \033[1;32m#{current}\033[0m"
+    puts "=== Previous Revision: \033[1;32m#{previous}\033[0m\n\n"
+
+    # If deployed and master are the same, show the difference between the last 2 deployments.
+    base_label, new_label, base_rev, new_rev = latest != current ? \
+                                               ["deployed", "master", current, latest] : \
+                                               ["previous", "deployed", previous, current]
+
+    # Show difference between master and deployed revisions.
+    if (diff = `git log #{base_rev}..#{new_rev} --oneline`) != ""
+      # Colorize refs
+      diff.gsub!(/^([a-f0-9]+) /, "\033[1;32m\\1\033[0m - ")
+      diff = "    " << diff.gsub("\n", "\n    ") << "\n"
+      # Indent commit messages nicely, max 80 chars per line, line has to end with space.
+      diff = diff.split("\n").map{|l|l.scan(/.{1,120}/).join("\n"<<" "*14).gsub(/([^ ]*)\n {14}/m,"\n"<<" "*14<<"\\1")}.join("\n")
+      puts "=== Difference between #{base_label} revision and #{new_label} revision:\n\n"
+      puts diff
+    end
+  end
+end
+
+after "deploy", "deploy:revisions"
+

metadata

@@ -1,66 +1,86 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: crossroads_capistrano
-version: !ruby/object:Gem::Version
-  version: 1.2.9
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
-authors:
+authors: 
 - Steve Kenworthy
 - Ben Tillman
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-14 00:00:00.000000000 +08:00
+
+date: 2011-05-19 00:00:00 +08:00
 default_executable: 
 dependencies: []
+
 description: A Crossroads Foundation collection of generic capistrano recipes.
-email:
+email: 
 - it_dept@crossroads.org.hk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.textile
 - Rakefile
 - crossroads_capistrano.gemspec
 - lib/crossroads_capistrano.rb
-- lib/crossroads_capistrano/delayed_job.rb
-- lib/crossroads_capistrano/log.rb
-- lib/crossroads_capistrano/newrelic.rb
-- lib/crossroads_capistrano/passenger.rb
-- lib/crossroads_capistrano/postgresql.rb
-- lib/crossroads_capistrano/prompt.rb
-- lib/crossroads_capistrano/revisions.rb
-- lib/crossroads_capistrano/rvm.rb
-- lib/crossroads_capistrano/stack.rb
-- lib/crossroads_capistrano/whenever.rb
-- lib/crossroads_capistrano/yum.rb
+- lib/crossroads_capistrano/recipes/delayed_job.rb
+- lib/crossroads_capistrano/recipes/log.rb
+- lib/crossroads_capistrano/recipes/newrelic.rb
+- lib/crossroads_capistrano/recipes/passenger.rb
+- lib/crossroads_capistrano/recipes/postgresql.rb
+- lib/crossroads_capistrano/recipes/prompt.rb
+- lib/crossroads_capistrano/recipes/revisions.rb
+- lib/crossroads_capistrano/recipes/rvm.rb
+- lib/crossroads_capistrano/recipes/stack.rb
+- lib/crossroads_capistrano/recipes/whenever.rb
+- lib/crossroads_capistrano/recipes/yum.rb
 has_rdoc: true
 homepage: http://www.crossroads.org.hk
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: crossroads_capistrano
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes
 test_files: []
+

data/lib/crossroads_capistrano/revisions.rb

@@ -1,28 +0,0 @@
-desc "Show currently deployed revision on server."
-task :revisions, :roles => :app do
-  current, previous, latest = current_revision[0,7], previous_revision[0,7], real_revision[0,7]
-  puts "\n" << "-"*63
-  puts "===== Master Revision: \033[1;33m#{latest}\033[0m\n\n"
-  puts "===== [ \033[1;36m#{application.capitalize} - #{stage.capitalize}\033[0m ]"
-  puts "=== Deployed Revision: \033[1;32m#{current}\033[0m"
-  puts "=== Previous Revision: \033[1;32m#{previous}\033[0m\n\n"
-
-  # If deployed and master are the same, show the difference between the last 2 deployments.
-  base_label, new_label, base_rev, new_rev = latest != current ? \
-                                             ["deployed", "master", current, latest] : \
-                                             ["previous", "deployed", previous, current]
-
-  # Show difference between master and deployed revisions.
-  if (diff = `git log #{base_rev}..#{new_rev} --oneline`) != ""
-    # Colorize refs
-    diff.gsub!(/^([a-f0-9]+) /, "\033[1;32m\\1\033[0m - ")
-    diff = "    " << diff.gsub("\n", "\n    ") << "\n"
-    # Indent commit messages nicely, max 80 chars per line, line has to end with space.
-    diff = diff.split("\n").map{|l|l.scan(/.{1,120}/).join("\n"<<" "*14).gsub(/([^ ]*)\n {14}/m,"\n"<<" "*14<<"\\1")}.join("\n")
-    puts "=== Difference between #{base_label} revision and #{new_label} revision:\n\n"
-    puts diff
-  end
-end
-
-after "deploy", "revisions"
-