crossroads_capistrano 1.4.42 → 1.4.43

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.42"
+  s.version     = "1.4.43"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]
@@ -21,6 +21,5 @@ 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-capistrano',    ">= 1.0.1")
+  s.add_dependency('rvm-capistrano',    ">= 1.2.7")
 end
-

data/lib/crossroads_capistrano/recipes/passenger.rb

@@ -23,8 +23,12 @@ namespace :deploy do
   desc "Apache permissions (for passenger)"
   task :apache_permissions do
     unless $apache_permissions
-      run "if [ -d #{release_path}/ ]; then #{sudo} chown -R #{httpd_user}:#{httpd_group} #{current_path}/; fi"
-      run "if [ -d #{release_path}/ ]; then #{sudo} chown -R #{httpd_user}:#{httpd_group} #{shared_path}/; fi"
+      run "if [ -d #{current_path}/ ]; then #{sudo} chown -R #{httpd_user}:#{httpd_group} #{current_path}/; fi"
+      %w( config log pids system ).each do |name|
+        folder = "#{shared_path}/#{name}"
+        run "if [ -d #{folder}/ ]; then #{sudo} chown -R #{httpd_user}:#{httpd_group} #{folder}/; fi"
+        run "if [ -d #{folder}/ ]; then #{sudo} chmod -R 750 #{folder}/; fi"
+      end
       $apache_permissions = true
     end
   end
@@ -81,4 +85,3 @@ before "deploy:cold",        "passenger:install"
 after "deploy:update_code",  "passenger:config"
 before "deploy:start",       "deploy:apache_permissions"
 before "deploy:restart",     "deploy:apache_permissions"
-

data/lib/crossroads_capistrano/recipes/rvm.rb

@@ -2,20 +2,6 @@ require 'rvm/capistrano'
 
 namespace :rvm do
 
-  desc "Install rvm"
-  task :install, :roles => :web do
-    if rvm_ruby_string == "default"
-      raise "rvm_ruby_string has not been set! Please set it in config/deploy.rb"
-    end
-    install_deps
-    run "if ! [ -e #{rvm_bin_path}/rvm ]; then bash -c \"curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer | bash\" stable; fi", :shell => 'sh'
-    run "if ! (#{rvm_bin_path}/rvm list | grep #{rvm_ruby_string}); then #{sudo} #{rvm_bin_path}/rvm install #{rvm_ruby_string}; fi", :shell => 'sh'
-  end
-
-  task :install_deps, :roles => :web do
-    yum.install( {:base => %w(curl git gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel openssl-devel make bzip2)}, :stable, :shell => 'sh' )
-  end
-
   desc "Trust the application rvmrc file that is deployed"
   task :trust_me do
     run "rvm rvmrc trust #{current_path}"
@@ -24,5 +10,7 @@ namespace :rvm do
 
 end
 
-before "stack", "rvm:install"
 before "deploy:restart", "rvm:trust_me"
+before 'deploy:setup', 'rvm:install_rvm'   # install RVM
+set :rvm_install_pkgs, %w(curl git gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel openssl-devel make bzip2) #  This must come before the 'rvm:install_ruby' task is called.
+before 'deploy:setup', 'rvm:install_ruby'  # install Ruby and create gemset, or:

data/lib/crossroads_capistrano/recipes/stack.rb

@@ -7,10 +7,8 @@ before "deploy:cold",  "stack:setup"
 namespace :stack do
   desc "Setup operating system and rails environment"
   task :setup do
-    package.update
     package.install
     gemrc.setup
-    bundler.setup
     deploy.setup
     shared.setup
     config.setup
@@ -19,13 +17,6 @@ namespace :stack do
     netrc.setup     if needs_netrc?
     ssh_key.setup   if needs_ssh_key?
   end
-
-  namespace :bundler do
-    desc "Install Bundler"
-    task :setup do
-      run "rvmsudo gem install bundler"
-    end
-  end
 end
 
 # yum wrapper
@@ -56,12 +47,19 @@ namespace :shared do
   desc "Setup shared directory"
   task :setup do
     sudo "mkdir -p #{shared_path}/config"
+    sudo "chown #{httpd_user}:#{httpd_group} #{shared_path}/config"
+    sudo "chmod 755 #{shared_path}/config"
   end
 
-  desc "Set permissions on shared directory"
+  desc "Set permissions on folders inside the shared directory"
   task :permissions do
-    sudo "chown -R #{httpd_user}:#{httpd_group} #{shared_path}/"
-    sudo "chmod -R 755 #{shared_path}/"
+    %w( config log pids system ).each do |name|
+      folder = "#{shared_path}/#{name}"
+      if File.exists?(folder)
+        sudo "chown -R #{httpd_user}:#{httpd_group} #{folder}/"
+        sudo "chmod -R 755 #{folder}/"
+      end
+    end
   end
 end
 
@@ -108,4 +106,3 @@ namespace :ssh_key do
     run  "    if ! (ls $HOME/.ssh/id_rsa); then (ssh-keygen -N '' -t rsa -q -f $HOME/.ssh/id_rsa && cat $HOME/.ssh/id_rsa.pub) && exit 1; fi"
   end
 end
-

metadata

@@ -1,69 +1,99 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: crossroads_capistrano
-version: !ruby/object:Gem::Version
-  version: 1.4.42
+version: !ruby/object:Gem::Version 
+  hash: 81
   prerelease: 
+  segments: 
+  - 1
+  - 4
+  - 43
+  version: 1.4.43
 platform: ruby
-authors:
+authors: 
 - Steve Kenworthy
 - Ben Tillman
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-04 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: &85610560 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
+  requirement: *id001
   type: :runtime
-  prerelease: false
-  version_requirements: *85610560
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: capistrano-ext
-  requirement: &85610050 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 2
+        - 1
         version: 1.2.1
+  requirement: *id002
   type: :runtime
-  prerelease: false
-  version_requirements: *85610050
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: capistrano_colors
-  requirement: &85609590 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 5
+        - 4
         version: 0.5.4
+  requirement: *id003
   type: :runtime
-  prerelease: false
-  version_requirements: *85609590
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: rvm-capistrano
-  requirement: &85608940 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 2
+        - 7
+        version: 1.2.7
+  requirement: *id004
   type: :runtime
-  prerelease: false
-  version_requirements: *85608940
 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
@@ -92,34 +122,39 @@ files:
 - lib/crossroads_capistrano/recipes/user_permissions.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'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 976439997
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 976439997
+      version: "0"
 requirements: []
+
 rubyforge_project: crossroads_capistrano
-rubygems_version: 1.8.17
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes
 test_files: []
+