svn commit: r645220 - in /incubator/buildr/trunk: lib/buildr/core/addon.rb lib/buildr/core/application.rb lib/buildr/core/util.rb rakelib/doc.rake

[vborja]

Author: vborja
Date: Sun Apr  6 02:53:21 2008
New Revision: 645220

URL: http://svn.apache.org/viewvc?rev=645220&view=rev
Log:
Buildr::SystemUtil.ruby uses :command instead of :script for the -S ruby option

Modified:
    incubator/buildr/trunk/lib/buildr/core/addon.rb
    incubator/buildr/trunk/lib/buildr/core/application.rb
    incubator/buildr/trunk/lib/buildr/core/util.rb
    incubator/buildr/trunk/rakelib/doc.rake

Modified: incubator/buildr/trunk/lib/buildr/core/addon.rb
URL: 
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/addon.rb?rev=645220&r1=645219&r2=645220&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/addon.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/addon.rb Sun Apr  6 02:53:21 2008
@@ -34,11 +34,11 @@
     end
 
     def install
-      SystemUtil.ruby 'install', name, :script => 'gem', :sudo => true
+      SystemUtil.ruby 'install', name, :command => 'gem', :sudo => true
     end
 
     def uninstall
-      SystemUtil.ruby 'uninstall', spec.name, '-v', spec.version.to_s, :script 
=> 'gem', :sudo => true
+      SystemUtil.ruby 'uninstall', spec.name, '-v', spec.version.to_s, 
:command => 'gem', :sudo => true
     end
 
     def upload

Modified: incubator/buildr/trunk/lib/buildr/core/application.rb
URL: 
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/application.rb?rev=645220&r1=645219&r2=645220&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application.rb Sun Apr  6 02:53:21 
2008
@@ -188,7 +188,7 @@
         end
         install.each do |spec|
           say "Installing #{spec.full_name} ... " if verbose
-          SystemUtil.ruby 'install', spec.name, '-v', spec.version.to_s, 
:script => 'gem', :sudo => true, :verbose => false
+          SystemUtil.ruby 'install', spec.name, '-v', spec.version.to_s, 
:command => 'gem', :sudo => true, :verbose => false
           Gem.source_index.load_gems_in 
Gem::SourceIndex.installed_spec_directories
         end
         installed += install

Modified: incubator/buildr/trunk/lib/buildr/core/util.rb
URL: 
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/util.rb?rev=645220&r1=645219&r2=645220&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/util.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/util.rb Sun Apr  6 02:53:21 2008
@@ -50,7 +50,7 @@
 
     # Runs Ruby with these command line arguments.  The last argument may be a 
hash,
     # supporting the following keys:
-    #   :script   -- Runs the specified script (e.g., :script=>'gem')
+    #   :command  -- Runs the specified script (e.g., :command=>'gem')
     #   :sudo     -- Run as sudo on operating systems that require it.
     #   :verbose  -- Override Rake's verbose flag.
     def ruby(*args)
@@ -62,7 +62,7 @@
         cmd << 'sudo' << '-u' << '##{ruby_uid}'
       end
       cmd << ruby_bin
-      cmd << '-S' << options.delete(:script) if options[:script]
+      cmd << '-S' << options.delete(:command) if options[:command]
       Rake.application.sh *cmd.push(*args.flatten).push(options)
     end
 
@@ -81,7 +81,7 @@
       end
       dependencies.select { |dep| installed.search(dep.name, 
dep.version_requirements).empty? }.each do |dep|
         puts "Installing #{dep} ..."
-        ruby 'install', dep.name, '-v', dep.version_requirements.to_s, 
:script=>'gem', :sudo=>true
+        ruby 'install', dep.name, '-v', dep.version_requirements.to_s, 
:command=>'gem', :sudo=>true
       end
     end
   end

Modified: incubator/buildr/trunk/rakelib/doc.rake
URL: 
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/doc.rake?rev=645220&r1=645219&r2=645220&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/doc.rake (original)
+++ incubator/buildr/trunk/rakelib/doc.rake Sun Apr  6 02:53:21 2008
@@ -32,7 +32,7 @@
 rescue LoadError
   puts 'Please run rake setup to install the Allison RDoc template'
   task 'setup' do
-    ruby 'install', 'allison', :script=>'gem', :sudo=>true
+    ruby 'install', 'allison', :command=>'gem', :sudo=>true
   end
   task 'release:check' do
     fail 'Please run rake setup to install the Allison RDoc template'
@@ -67,7 +67,7 @@
 rescue LoadError
   puts 'Please run rake setup to install the Docter document generation 
library'
   task 'setup' do
-    ruby 'install', 'docter', :script=>'gem', :sudo=>true
+    ruby 'install', 'docter', :command=>'gem', :sudo=>true
   end
   task 'release:check' do
     fail 'Please run rake setup to install the Docter document generation 
library'