crossroads_capistrano 1.2.8 → 1.2.9

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.8"
+  s.version     = "1.2.9"
   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,21 +1,23 @@
 module CrossroadsCapistrano
-  if defined?(Capistrano)
+  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.
-            Dir.glob(File.join(File.dirname(__FILE__), 'crossroads_capistrano', '*.rb')).each{|f| load f}
+            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")}
+            recipes.each{|r| load File.join(File.dirname(__FILE__),'crossroads_capistrano',"#{r}.rb")}
           end
         end
       end
     end
-  else
-    puts "Capistrano gem is not loaded."
+  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
 

metadata

@@ -1,36 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: crossroads_capistrano
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 8
-  version: 1.2.8
+version: !ruby/object:Gem::Version
+  version: 1.2.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Steve Kenworthy
 - Ben Tillman
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-12 00:00:00 +08:00
+date: 2011-05-14 00:00:00.000000000 +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
@@ -51,36 +41,26 @@ files:
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: crossroads_capistrano
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes
 test_files: []
-