crossroads_capistrano 1.3.4 → 1.3.60

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.3.4"
+  s.version     = "1.3.60"
   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/hoptoad.rb

@@ -4,7 +4,10 @@
 namespace :deploy do
   desc "Notify Hoptoad of the deployment"
   task :notify_hoptoad, :except => { :no_release => true } do
-    require 'active_support/core_ext/string' rescue false
+    begin
+      require 'active_support/core_ext/string'
+    rescue LoadError
+    end
     require 'hoptoad_notifier'
     require File.join(rails_root,'config','initializers','hoptoad')
     require 'hoptoad_tasks'

data/lib/crossroads_capistrano/recipes/passenger.rb

@@ -26,17 +26,18 @@ namespace :passenger do
   task :install, :roles => :web do
     install_deps
     run "if ! (gem list | grep passenger | grep #{passenger_version}); then gem install passenger --no-rdoc --no-ri --version #{passenger_version} && passenger-install-apache2-module --auto; fi"
-    run "rvm wrapper #{rvm_ruby_string} passenger" if defined?(:rvm_ruby_string) # sets up wrapper for passenger so it can find bundler etc...
+    sudo "rvm wrapper #{rvm_ruby_string} passenger" if defined?(:rvm_ruby_string) # sets up wrapper for passenger so it can find bundler etc...
   end
 
   task :install_deps, :roles => :web do
     yum.install( {:base => %w(curl-devel httpd-devel apr-devel)}, :stable )
+    sudo "rm -rf /etc/httpd/conf.d/ssl.conf"
   end
 
   desc "Apache config files: uses special variables @DEPLOY_TO@ @IP_ADDR@ @SERVER_NAME@ @PASSENGER_ROOT@ @RUBY_ROOT@"
   task :config, :roles => :web do
-    sudo "bash -c \"sed -e 's,@DEPLOY_TO@,#{deploy_to},g' -e 's,@IP_ADDR@,#{ip_address},g' -e 's,@SERVER_NAME@,#{site_domain_name},g' #{release_path}/config/httpd-rails.conf > /etc/httpd/sites-enabled/010-#{application}-#{stage}.conf\""
-
+    sudo "cp -f #{release_path}/config/httpd-rails.conf /etc/httpd/sites-enabled/010-#{application}-#{stage}.conf"
+    sudo "sed -i -e 's%@DEPLOY_TO@%#{deploy_to}%g' -e 's%@IP_ADDR@%#{ip_address}%g' -e 's%@SERVER_NAME@%#{site_domain_name}%g' /etc/httpd/sites-enabled/010-#{application}-#{stage}.conf"
     if respond_to?(:rvm_ruby_string)  # Deploying with RVM
       ruby_root = "/usr/local/rvm/wrappers/#{rvm_ruby_string}/ruby"
       passenger_root = "/usr/local/rvm/gems/#{rvm_ruby_string}/gems/passenger-#{passenger_version}"
@@ -45,8 +46,8 @@ namespace :passenger do
       passenger_root = capture("pass_path=`gem which phusion_passenger` && echo ${pass_path%/lib/phusion_passenger.rb}")
     end
     sed_args = "-e 's%@PASSENGER_ROOT@%#{passenger_root.strip}%g' -e 's%@RUBY_ROOT@%#{ruby_root.strip}%g'"
-
-    sudo "bash -c \"sed #{sed_args} #{release_path}/config/passenger.conf > /etc/httpd/mods-enabled/passenger.conf\""
+    sudo "cp -f #{release_path}/config/passenger.conf /etc/httpd/mods-enabled/passenger.conf"
+    sudo "sed -i #{sed_args} /etc/httpd/mods-enabled/passenger.conf"
   end
 end
 

data/lib/crossroads_capistrano/recipes/revisions.rb

@@ -2,6 +2,7 @@ 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]
+    # Following line 'right-aligns' the branch string.
     branch_indent = " "*(i=10-branch.size;i<0 ? 0 : i) << branch.capitalize
     current_is_deployed = current == latest
     puts "\n  * \033[0;32m== Showing revisions and diffs for [\033[1;32m#{application} #{stage}\033[0;32m]\033[0m\n\n"
@@ -18,9 +19,9 @@ namespace :deploy do
     if (diff = `git log #{base_rev}..#{new_rev} --oneline`) != ""
       # Colorize refs
       diff.gsub!(/^([a-f0-9]+) /, "\033[1;37m\\1\033[0m: ")
-      diff = " "*18 << diff.gsub("\n", "\n    ") << "\n"
+      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"<<" "*28).gsub(/([^ ]*)\n {28}/m,"\n"<<" "*28<<"\\1")}.join("\n")
+      diff = diff.split("\n").map{|l|l.scan(/.{1,120}/).join("\n"<<" "*18).gsub(/([^ ]*)\n {18}/m,"\n"<<" "*18<<"\\1")}.join("\n")
       puts "  * \033[0;32m== Difference between \033[1;32m#{base_label}\033[0;32m and \033[1;32m#{new_label}\033[0;32m:\033[0m\n\n"
       puts diff
     end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.3.4
+  hash: 99
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 60
+  version: 1.3.60
 platform: ruby
 authors: 
 - Steve Kenworthy
@@ -62,17 +67,23 @@ required_ruby_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 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: crossroads_capistrano
-rubygems_version: 1.6.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes