crossroads_capistrano 1.4.41 → 1.4.42

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.4.41"
+  s.version     = "1.4.42"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]
@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency('capistrano',        ">= 2.6.0")
   s.add_dependency('capistrano-ext',    ">= 1.2.1")
   s.add_dependency('capistrano_colors', ">= 0.5.4")
-  s.add_dependency('rvm',               ">= 1.6.9")
+  s.add_dependency('rvm-capistrano',    ">= 1.0.1")
 end
 

data/lib/crossroads_capistrano/recipes/stack.rb

@@ -33,12 +33,12 @@ namespace :package do
 
   desc "Installs yum packages required for the app"
   task :install do
-    yum.install({:base => yum_packages}, :stable) if exists?(:yum_packages)
+    yum.install({:base => yum_packages}, :stable, :shell => 'sh') if exists?(:yum_packages)
   end
 
   desc "Updates all yum packages installed"
   task :update do
-    yum.update
+    yum.update :shell => 'sh'
   end
 
   desc "Takes a list of yum packages and determines if they need updating. This is useful for determining whether to apply security updates."

data/lib/crossroads_capistrano/recipes/yum.rb

@@ -17,35 +17,37 @@ module Yum
   # of the distribution you want to use.
   def install(packages, version, options={})
     special_options = options[:repositories].collect { |repository| " --enablerepo=#{repository}"} if (options && options[:repositories].is_a?(Array))
-    send(run_method, %{
-      sh -c "#{YUM_COMMAND} #{special_options.to_s} install #{package_list(packages, version)}"
-    }, options)
+    send(
+      run_method,
+      "#{YUM_COMMAND} #{special_options.to_s} install #{package_list(packages, version)}",
+      options
+    )
   end
 
   # Run a yum clean
   def clean(options={})
-    send(run_method, %{sh -c "#{YUM_COMMAND} -qy clean"}, options)
+    send(run_method, "#{YUM_COMMAND} -qy clean", options)
   end
 
   # Run a yum autoclean
   def autoclean(options={})
-    send(run_method, %{sh -c "#{YUM_COMMAND} -qy autoclean"}, options)
+    send(run_method, "#{YUM_COMMAND} -qy autoclean", options)
   end
 
   # Run a yum distribution upgrade
   def dist_upgrade(options={})
-    send(run_method, %{sh -c "#{YUM_COMMAND} -qy dist-upgrade"}, options)
+    send(run_method, "#{YUM_COMMAND} -qy dist-upgrade", options)
   end
 
   # Run a yum upgrade. Use dist_upgrade instead if you want to upgrade
   # the critical base packages.
   def upgrade(options={})
-    send(run_method, %{sh -c "#{YUM_COMMAND} -qy upgrade"}, options)
+    send(run_method, "#{YUM_COMMAND} -qy upgrade", options)
   end
 
   # Run a yum update.
   def update(options={})
-    send(run_method, %{sh -c "#{YUM_COMMAND} -qy update"}, options)
+    send(run_method, "#{YUM_COMMAND} -qy update", options)
   end
 
 private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version
-  version: 1.4.41
+  version: 1.4.42
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
+date: 2012-03-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &75189940 !ruby/object:Gem::Requirement
+  requirement: &85610560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *75189940
+  version_requirements: *85610560
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &75189380 !ruby/object:Gem::Requirement
+  requirement: &85610050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *75189380
+  version_requirements: *85610050
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &75189110 !ruby/object:Gem::Requirement
+  requirement: &85609590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,18 +45,18 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *75189110
+  version_requirements: *85609590
 - !ruby/object:Gem::Dependency
-  name: rvm
-  requirement: &75188770 !ruby/object:Gem::Requirement
+  name: rvm-capistrano
+  requirement: &85608940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *75188770
+  version_requirements: *85608940
 description: A Crossroads Foundation collection of generic capistrano recipes.
 email:
 - it_dept@crossroads.org.hk
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -821697135
+      hash: 976439997
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -821697135
+      hash: 976439997
 requirements: []
 rubyforge_project: crossroads_capistrano
 rubygems_version: 1.8.17