Author: boisvert
Date: Tue Sep 21 12:59:04 2010
New Revision: 999379
URL: http://svn.apache.org/viewvc?rev=999379&view=rev
Log:
BUILDR-512 Buildr::Util.ruby invokes non existent method (Peter Donald)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/util.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=999379&r1=999378&r2=999379&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Sep 21 12:59:04 2010
@@ -1,3 +1,6 @@
+1.4.3 (Pending)
+* Fixed: BUILDR-512 Buildr::Util.ruby invokes non existent method (Peter
Donald)
+
1.4.2 (2010-09-18)
* Added: BUILDR-415 Ability to exclude tests from command line
* Added: BUILDR-495 Document twitter on Buildr's homepage
Modified: buildr/trunk/lib/buildr/core/util.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/util.rb?rev=999379&r1=999378&r2=999379&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/util.rb (original)
+++ buildr/trunk/lib/buildr/core/util.rb Tue Sep 21 12:59:04 2010
@@ -54,7 +54,7 @@ module Buildr
def ruby(*args)
options = Hash === args.last ? args.pop : {}
cmd = []
- ruby_bin = File.normalize_path(Config::CONFIG['ruby_install_name'],
Config::CONFIG['bindir'])
+ ruby_bin = normalize_path(Config::CONFIG['ruby_install_name'],
Config::CONFIG['bindir'])
if options.delete(:sudo) && !(win_os? || Process.uid ==
File.stat(ruby_bin).uid)
cmd << 'sudo' << '-u' << "##{File.stat(ruby_bin).uid}"
end
@@ -142,7 +142,7 @@ module Buildr
# is not running interactively (on a tty)
def install(*dependencies)
raise ArgumentError, "Expected at least one argument" if
dependencies.empty?
- remote = dependencies.map{ |dep| Gem.source_index.search(dep).last ||
Gem::SpecFetcher.fetcher.fetch( dep, true ).map{ |spec, source| spec }.last }
+ remote = dependencies.map{ |dep| Gem.source_index.search(dep).last ||
Gem::SpecFetcher.fetcher.fetch( dep, true ).map{ |spec, source| spec }.last }
not_found_deps, to_install = remote.partition { |gem|
gem.is_a?(Gem::Dependency) || gem.nil? }
fail Gem::LoadError, "Build requires the gems #{not_found_deps.join(',
')}, which cannot be found in local or remote repository." unless
not_found_deps.empty?
uses = "This build requires the gems
#{to_install.map(&:full_name).join(', ')}:"
