crossroads_capistrano 1.4.34 → 1.4.35

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.34"
+  s.version     = "1.4.35"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/lib/crossroads_capistrano/recipes/passenger.rb

@@ -59,13 +59,16 @@ namespace :passenger do
       end
       # httpd conf
       sudo "cp -f #{release_path}/config/httpd-rails.conf #{httpd_site_conf_path}"
-      sed httpd_site_conf_path, {"DEPLOY_TO"        => deploy_to,
-                                 "IP_ADDR"          => ip_address,
-                                 "SERVER_NAME"      => site_domain_name,
-                                 "SITE_DOMAIN_NAME" => site_domain_name,
-                                 "HTTP_PORT"        => http_port,
-                                 "HTTPS_PORT"       => https_port,
-                                 "RAILS_ENV"        => rails_env}
+      httpd_settings = {}
+      httpd_settings["DEPLOY_TO"]        = deploy_to if exists?(:deploy_to)
+      httpd_settings["IP_ADDR"]          = ip_address if exists?(:ip_address)
+      httpd_settings["SERVER_NAME"]      = site_domain_name if exists?(:site_domain_name)
+      httpd_settings["SITE_DOMAIN_NAME"] = site_domain_name if exists?(:site_domain_name)
+      httpd_settings["HTTP_PORT"]        = http_port if exists?(:http_port)
+      httpd_settings["HTTPS_PORT"]       = https_port if exists?(:https_port)
+      httpd_settings["RAILS_ENV"]        = rails_env if exists?(:rails_env)
+      sed httpd_site_conf_path, httpd_settings
+      
       # passenger conf
       sudo "cp -f #{release_path}/config/passenger.conf #{passenger_conf_path}"
       sed passenger_conf_path,  {"PASSENGER_ROOT"   => passenger_root,

data/lib/crossroads_capistrano/recipes/rvm.rb

@@ -13,7 +13,12 @@ namespace :rvm 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 do
+    run "rvm rvmrc trust #{current_path}"
+  end
+
 end
 
 before "stack", "rvm:install"
-
+before "deploy:restart", "rvm:trust"

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
-    if exists?(:yum_packages)
-      yum.update
-      yum.install({:base => yum_packages}, :stable)
-    end
+    package.update
+    package.install
     gemrc.setup
     bundler.setup
     deploy.setup
@@ -30,6 +28,29 @@ namespace :stack do
   end
 end
 
+# yum wrapper
+namespace :package do
+
+  desc "Installs yum packages required for the app"
+  task :install do
+    yum.install({:base => yum_packages}, :stable) if exists?(:yum_packages)
+  end
+
+  desc "Updates all yum packages installed"
+  task :update do
+    yum.update
+  end
+
+  desc "Takes a list of yum packages and determines if they need updating. This is useful for determining whether to apply security updates."
+  task :list_installed_yum_packages do
+    prompt_with_default("Enter comma seperated list of yum pacakges (e.g. qspice, lftp).\nIf you leave this blank then it will list all installed packages:", :packages, "")
+    packages.gsub!(/,\s*/, "\\|")
+    sudo "yum -C list | grep '#{packages}' | grep installed"
+    puts "The packages listed above are installed on the system"
+  end
+
+end
+
 namespace :shared do
   # This task can be extended by the application via an :after hook.
   desc "Setup shared directory"

data/lib/crossroads_capistrano/recipes/yum.rb

@@ -59,12 +59,3 @@ private
 end
 
 Capistrano.plugin :yum, Yum
-
-desc "Takes a list of yum packages and determines if they need updating. This is useful for determining whether to apply security updates."
-task :list_installed_yum_packages do
-  prompt_with_default("Enter comma seperated list of yum pacakges (e.g. qspice, lftp).\nIf you leave this blank then it will list all installed packages:", :packages, "")
-  packages.gsub!(/,\s*/, "\\|")
-  sudo "yum -C list | grep '#{packages}' | grep installed"
-  puts "The packages listed above are installed on the system"
-end
-

metadata

@@ -1,69 +1,98 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: crossroads_capistrano
-version: !ruby/object:Gem::Version
-  version: 1.4.34
+version: !ruby/object:Gem::Version 
+  hash: 65
   prerelease: 
+  segments: 
+  - 1
+  - 4
+  - 35
+  version: 1.4.35
 platform: ruby
-authors:
+authors: 
 - Steve Kenworthy
 - Ben Tillman
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-08-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: &80967830 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &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
   type: :runtime
-  prerelease: false
-  version_requirements: *80967830
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: capistrano-ext
-  requirement: &80967590 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &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
   type: :runtime
-  prerelease: false
-  version_requirements: *80967590
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: capistrano_colors
-  requirement: &80967360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &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
   type: :runtime
-  prerelease: false
-  version_requirements: *80967360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rvm
-  requirement: &80967130 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 6
+        - 9
         version: 1.6.9
   type: :runtime
-  prerelease: false
-  version_requirements: *80967130
+  version_requirements: *id004
 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
@@ -93,26 +122,36 @@ files:
 - lib/crossroads_capistrano/recipes/yum.rb
 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.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes
 test_files: []
+