From 2ffd162f5be6cd88d32013330b620379f9f325c7 Mon Sep 17 00:00:00 2001 From: sanemat Date: Fri, 30 Aug 2013 17:46:41 +0900 Subject: [PATCH 1/3] Require version file for checking capistrano version bundler-1.4.0.pre.1 works fine, but bundler-1.4.0.pre.2 shows error below: ``` $ bundle exec cap production deploy /path/to/bundler-1.4.0.pre.2/lib/bundler/capistrano.rb:7:in `': uninitialized constant Capistrano::Version (NameError) ``` This commit brings this error, so I add require version file. 1d7a7893dfeb85afa25a3a526354b31c85f05dbf bundler: 1.4.0.pre.2 capistrano: 2.14.2 --- lib/bundler/capistrano.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bundler/capistrano.rb b/lib/bundler/capistrano.rb index 40d7da15df3..441a9ad7c9a 100644 --- a/lib/bundler/capistrano.rb +++ b/lib/bundler/capistrano.rb @@ -3,6 +3,7 @@ # Just add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and # Bundler will be activated after each new deployment. require 'bundler/deployment' +require 'capistrano/version' if Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0") raise "For Capistrano 3.x integration, please use http://github.com/capistrano/bundler" From 5851b6fabbe7e0b27f2aa41d9d1b374ca6d4a205 Mon Sep 17 00:00:00 2001 From: sanemat Date: Sat, 31 Aug 2013 03:45:11 +0900 Subject: [PATCH 2/3] Guard from load error 'capistrano/version' --- lib/bundler/capistrano.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bundler/capistrano.rb b/lib/bundler/capistrano.rb index 441a9ad7c9a..6baf87a33bf 100644 --- a/lib/bundler/capistrano.rb +++ b/lib/bundler/capistrano.rb @@ -3,9 +3,12 @@ # Just add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and # Bundler will be activated after each new deployment. require 'bundler/deployment' -require 'capistrano/version' +begin + require 'capistrano/version' +rescue LoadError +end -if Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0") +if !defined?(Capistrano::Version) || Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0") raise "For Capistrano 3.x integration, please use http://github.com/capistrano/bundler" end From 29b07d2073b8e54a0766a2c96f10374bc21b4f83 Mon Sep 17 00:00:00 2001 From: sanemat Date: Sat, 31 Aug 2013 04:12:19 +0900 Subject: [PATCH 3/3] Simple check const exist --- lib/bundler/capistrano.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/bundler/capistrano.rb b/lib/bundler/capistrano.rb index 6baf87a33bf..336f04cacf9 100644 --- a/lib/bundler/capistrano.rb +++ b/lib/bundler/capistrano.rb @@ -3,12 +3,8 @@ # Just add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and # Bundler will be activated after each new deployment. require 'bundler/deployment' -begin - require 'capistrano/version' -rescue LoadError -end -if !defined?(Capistrano::Version) || Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0") +if defined?(Capistrano::Version) && Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0") raise "For Capistrano 3.x integration, please use http://github.com/capistrano/bundler" end