svn commit: r748692 - in /buildr/trunk/rakelib: doc.rake setup.rake

[as...@apache.org]

Author: assaf
Date: Fri Feb 27 20:51:26 2009
New Revision: 748692

URL: http://svn.apache.org/viewvc?rev=748692&view=rev
Log:
Allows using with Docter 1.1.4 (fictional version).
Fixed "undefined method `[]`" when running rake setup.

Modified:
    buildr/trunk/rakelib/doc.rake
    buildr/trunk/rakelib/setup.rake

Modified: buildr/trunk/rakelib/doc.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=748692&r1=748691&r2=748692&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Fri Feb 27 20:51:26 2009
@@ -98,15 +98,15 @@
   end
 
   task 'clobber' do
-    rm_rf '_site'
-    rm_rf '_print'
-    rm_rf 'buildr.pdf'
+    rm_rf '_site' if File.exist?('_site')
+    rm_rf '_print' if File.exist?('_print')
+    rm_rf 'buildr.pdf' if File.exist?('buildr.pdf')
   end
 
 rescue LoadError
   puts 'Please run rake setup to install the Docter document generation library'
   task 'setup' do
-    install_gem 'docter', '~>1.1.3'
+    install_gem 'docter'#, '~>1.1.3'
   end
   task 'stage:check' do
     fail 'Please run rake setup to install the Docter document generation library'

Modified: buildr/trunk/rakelib/setup.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/setup.rake?rev=748692&r1=748691&r2=748692&view=diff
==============================================================================
--- buildr/trunk/rakelib/setup.rake (original)
+++ buildr/trunk/rakelib/setup.rake Fri Feb 27 20:51:26 2009
@@ -52,8 +52,9 @@
   if Gem::SourceIndex.from_installed_gems.search(dep).empty?
     puts "Installing #{name} ..."
     args = 'install', name
-    args << '--version' << options[:version] if options[:version]
-    args << '--source' << options[:source] << '--source' << 'http://gems.rubyforge.org' if options[:source]
+    args << '--version' << dep.version_requirements.to_s if options[:version]
+    args << '--source' << options[:source] if options[:source]
+    args << '--source' << 'http://gems.rubyforge.org'
     args << '--install-dir' << ENV['GEM_HOME'] if ENV['GEM_HOME']
     gem_run *args
   end
@@ -64,7 +65,7 @@
 missing = spec.dependencies.select { |dep| Gem::SourceIndex.from_installed_gems.search(dep).empty? }
 task 'setup' do
   missing.each do |dep|
-    install_gem dep.name, dep.version_requirements
+    install_gem dep.name, :version=>dep.version_requirements
   end
 end
 puts "Missing Gems #{missing.join(', ')}, please run rake setup first!" unless missing.empty?