buildr 1.4.6-java → 1.4.7-java

data/rakelib/checks.rake

@@ -26,34 +26,3 @@ task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do
   fail "#{missing.join(', ')} missing Apache License, please add it before making a release!" unless missing.empty?
   puts "[x] Source files contain the Apache license"
 end
-
-
-desc "Look for new dependencies, check transitive dependencies"
-task :dependency do
-=begin
-  puts "Checking that all dependencies are up to date ..."
-  # Find if anything has a more recent dependency.  These are not errors, just reports.
-  spec.dependencies.each do |dep|
-    current = Gem::SourceInfoCache.search(dep).last
-    latest = Gem::SourceInfoCache.search(Gem::Dependency.new(dep.name, '>0')).last
-    puts "A new version of #{dep.name} is available, #{latest.version} replaces #{current.version}" if (current && latest && latest.version > current.version)
-  end
-
-  # Returns orderd list of transitive dependencies for the given dependency.
-  transitive = lambda { |depend|
-    dep_spec = Gem::SourceIndex.from_installed_gems.search(depend).last
-    fail "No specification for dependency #{depend}" unless dep_spec
-    dep_spec.runtime_dependencies.map { |trans| transitive[trans].push(trans) }.flatten.uniq }
-  # For each dependency, make sure *all* its transitive dependencies are listed
-  # as a Buildr dependency, and order is preserved.
-  spec.dependencies.select {|dep| dep.type == :runtime }.each_with_index do |dep, index|
-    puts "checking #{dep.name}"
-    transitive[dep].each do |trans|
-      matching = spec.dependencies.find { |existing| trans =~ existing }
-      fail "#{trans} required by #{dep} and missing from spec" unless matching
-      fail "#{trans} must come before #{dep} in dependency list" unless spec.dependencies.index(matching) < index
-    end
-  end
-  puts "[X] Checked all dependencies are up to date and transitive dependencies are correctly ordered"
-=end
-end

data/rakelib/doc.rake

@@ -13,125 +13,111 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+if !RUBY_PLATFORM[/java/]
+  gem 'rdoc'
+  require 'rdoc/task'
+  desc "Creates a symlink to rake's lib directory to support combined rdoc generation"
+  file "rake/lib" do
+    rake_path = $LOAD_PATH.find { |p| File.exist? File.join(p, "rake.rb") }
+    mkdir_p "rake"
+    File.symlink(rake_path, "rake/lib")
+  end
 
-task 'doc:setup'
-begin # For the Web site, we use the SDoc RDoc generator/theme (http://github.com/voloko/sdoc/)
-  require 'sdoc'
-rescue LoadError
-  puts "Buildr uses the SDoc RDoc generator/theme. You can install it by running rake doc:setup"
-  task('doc:setup') { install_gem 'voloko-sdoc', :source=>'http://gems.github.com' }
-end
-
-
-require 'rake/rdoctask'
-
-desc "Creates a symlink to rake's lib directory to support combined rdoc generation"
-file "rake/lib" do
-  rake_path = $LOAD_PATH.find { |p| File.exist? File.join(p, "rake.rb") }
-  mkdir_p "rake"
-  File.symlink(rake_path, "rake/lib")
-end
-
-desc "Generate RDoc documentation in rdoc/"
-Rake::RDocTask.new :rdoc do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = spec.name
-  rdoc.options  = spec.rdoc_options.clone
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include spec.extra_rdoc_files
-
-  # include rake source for better inheritance rdoc
-  rdoc.rdoc_files.include('rake/lib/**.rb')
-end
-task :rdoc => ["rake/lib"]
+  desc "Generate RDoc documentation in rdoc/"
+  RDoc::Task.new :rdoc do |rdoc|
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = spec.name
+    rdoc.options = spec.rdoc_options.clone
+    rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_files.include spec.extra_rdoc_files
 
-begin
-  require 'jekylltask'
-  module TocFilter
-    def toc(input)
-      output = "<ol class=\"toc\">"
-      input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).each do |entry|
-        id = (entry[1][/^id=(['"])(.*)\1$/, 2] rescue nil)
-        title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
-        if id
-          output << %{<li><a href="##{id}">#{title}</a></li>}
-        else
-          output << %{<li>#{title}</li>}
+      # include rake source for better inheritance rdoc
+    rdoc.rdoc_files.include('rake/lib/**.rb')
+  end
+  task :rdoc => ["rake/lib"]
+
+  begin
+    require 'jekylltask'
+    module TocFilter
+      def toc(input)
+        output = "<ol class=\"toc\">"
+        input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).each do |entry|
+          id = (entry[1][/^id=(['"])(.*)\1$/, 2] rescue nil)
+          title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
+          if id
+            output << %{<li><a href="##{id}">#{title}</a></li>}
+          else
+            output << %{<li>#{title}</li>}
+          end
         end
+        output << "</ol>"
+        output
       end
-      output << "</ol>"
-      output
     end
-  end
-  Liquid::Template.register_filter(TocFilter)
-
-  desc "Generate Buildr documentation in _site/"
-  JekyllTask.new :jekyll do |task|
-    task.source = 'doc'
-    task.target = '_site'
-  end
+    Liquid::Template.register_filter(TocFilter)
 
-rescue LoadError
-  puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running rake doc:setup"
-  task 'doc:setup' do
-    install_gem 'jekyll', :version=>'0.10.0'
-    install_gem 'jekylltask', :version=>'1.0.2'
-    if `pygmentize -V`.empty?
-      args = %w{easy_install Pygments}
-      args.unshift 'sudo' unless Config::CONFIG['host_os'] =~ /windows/
-      sh *args
+    desc "Generate Buildr documentation in _site/"
+    JekyllTask.new :jekyll do |task|
+      task.source = 'doc'
+      task.target = '_site'
     end
+
+  rescue LoadError
+    puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running bundler"
   end
-end
 
+  if 0 == system("pygmentize -V > /dev/null 2> /dev/null")
+    puts "Buildr uses the Pygments python library. You can install it by running 'sudo easy_install Pygments' or 'sudo apt-get install python-pygments'"
+  end
 
-desc "Generate Buildr documentation as buildr.pdf"
-file 'buildr.pdf'=>'_site' do |task|
-  pages = File.read('_site/preface.html').scan(/<li><a href=['"]([^'"]+)/).flatten.map { |f| "_site/#{f}" }
-  sh 'prince', '--input=html', '--no-network', '--log=prince_errors.log', "--output=#{task.name}", '_site/preface.html', *pages
-end
+  desc "Generate Buildr documentation as buildr.pdf"
+  file 'buildr.pdf'=>'_site' do |task|
+    pages = File.read('_site/preface.html').scan(/<li><a href=['"]([^'"]+)/).flatten.map { |f| "_site/#{f}" }
+    sh 'prince', '--input=html', '--no-network', '--log=prince_errors.log', "--output=#{task.name}", '_site/preface.html', *pages
+  end
 
-desc "Build a copy of the Web site in the ./_site"
-task :site=>['_site', :rdoc, '_reports/specs.html', '_reports/coverage', 'buildr.pdf'] do
-  cp_r 'rdoc', '_site'
-  fail 'No RDocs in site directory' unless File.exist?('_site/rdoc/files/lib/buildr_rb.html')
-  cp '_reports/specs.html', '_site'
-  cp_r '_reports/coverage', '_site'
-  fail 'No coverage report in site directory' unless File.exist?('_site/coverage/index.html')
-  cp 'CHANGELOG', '_site'
-  open("_site/.htaccess", "w") do |htaccess|
-    htaccess << %Q{
+  desc "Build a copy of the Web site in the ./_site"
+  task :site=>['_site', :rdoc, '_reports/specs.html', '_reports/coverage', 'buildr.pdf'] do
+    cp_r 'rdoc', '_site'
+    fail 'No RDocs in site directory' unless File.exist?('_site/rdoc/lib/buildr_rb.html')
+    cp '_reports/specs.html', '_site'
+    cp_r '_reports/coverage', '_site'
+    fail 'No coverage report in site directory' unless File.exist?('_site/coverage/index.html')
+    cp 'CHANGELOG', '_site'
+    open("_site/.htaccess", "w") do |htaccess|
+      htaccess << %Q{
 <FilesMatch "CHANGELOG">
 ForceType 'text/plain; charset=UTF-8'
 </FilesMatch>
 }
+    end
+    cp 'buildr.pdf', '_site'
+    fail 'No PDF in site directory' unless File.exist?('_site/buildr.pdf')
+    puts 'OK'
   end
-  cp 'buildr.pdf', '_site'
-  fail 'No PDF in site directory' unless File.exist?('_site/buildr.pdf')
-  puts 'OK'
-end
 
 # Publish prerequisites to Web site.
-task 'publish'=>:site do
-  target = "people.apache.org:/www/#{spec.name}.apache.org/"
-  puts "Uploading new site to #{target} ..."
-  sh 'rsync', '--progress', '--recursive', '--delete', '_site/', target
-  sh 'ssh', 'people.apache.org', 'chmod', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
-  puts "Done"
-end
+  task 'publish'=>:site do
+    target = "people.apache.org:/www/#{spec.name}.apache.org/"
+    puts "Uploading new site to #{target} ..."
+    sh 'rsync', '--progress', '--recursive', '--delete', '_site/', target
+    sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
+    puts "Done"
+  end
 
 # Update HTML + PDF documentation (but not entire site; no specs, coverage, etc.)
-task 'publish-doc' => ['buildr.pdf', '_site'] do
-  cp 'buildr.pdf', '_site'
-  target = "people.apache.org:/www/#{spec.name}.apache.org/"
-  puts "Uploading new site to #{target} ..."
-  sh 'rsync', '--progress', '--recursive', '_site/', target # Note: no --delete
-  sh 'ssh', 'people.apache.org', 'chmod', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
-  puts "Done"
-end
+  task 'publish-doc' => ['buildr.pdf', '_site'] do
+    cp 'buildr.pdf', '_site'
+    target = "people.apache.org:/www/#{spec.name}.apache.org/"
+    puts "Uploading new site to #{target} ..."
+    sh 'rsync', '--progress', '--recursive', '_site/', target # Note: no --delete
+    sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
+    puts "Done"
+  end
 
-task :clobber do
-  rm_rf '_site'
-  rm_f 'buildr.pdf'
-  rm_f 'prince_errors.log'
+  task :clobber do
+    rm_rf '_site'
+    rm_f 'buildr.pdf'
+    rm_f 'prince_errors.log'
+  end
 end

data/rakelib/package.rake

@@ -25,7 +25,7 @@ end
 desc "Install Buildr from source"
 task :install=>["#{package.package_dir}/#{package.gem_spec.file_name}"] do |task|
   print "Installing #{spec.name} ... "
-  args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.gem_spec.file_name}"
+  args = RbConfig::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.gem_spec.file_name}"
   args.unshift('sudo') if sudo_needed?
   sh *args
   puts "[x] Installed Buildr #{spec.version}"
@@ -34,7 +34,7 @@ end
 desc "Uninstall previous rake install"
 task :uninstall do |task|
   puts "Uninstalling #{spec.name} ... "
-  args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'uninstall', spec.name, '--version', spec.version.to_s
+  args = RbConfig::CONFIG['ruby_install_name'], '-S', 'gem', 'uninstall', spec.name, '--version', spec.version.to_s
   args.unshift('sudo') if sudo_needed?
   sh *args
   puts "[x] Uninstalled Buildr #{spec.version}"
@@ -44,7 +44,7 @@ end
 desc "Compile Java libraries used by Buildr"
 task :compile do
   puts "Compiling Java libraries ..."
-  args = Config::CONFIG['ruby_install_name'], File.expand_path(RUBY_PLATFORM[/java/] ? '_jbuildr' : '_buildr'), '--buildfile', 'buildr.buildfile', 'compile'
+  args = RbConfig::CONFIG['ruby_install_name'], File.expand_path(RUBY_PLATFORM[/java/] ? '_jbuildr' : '_buildr'), '--buildfile', 'buildr.buildfile', 'compile'
   args << '--trace' if Rake.application.options.trace
   sh *args
 end

data/rakelib/release.rake

@@ -38,7 +38,7 @@ task :release do
     target = "people.apache.org:/www/#{spec.name}.apache.org/"
     puts "Uploading new site to #{spec.name}.apache.org ..."
     sh 'rsync', '--progress', '--recursive', '--delete', "_release/#{spec.version}/site/", target
-    sh 'ssh', 'people.apache.org', 'chmod', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
+    sh 'ssh', 'people.apache.org', 'chmod', '-f', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
     puts "[X] Uploaded new site to #{spec.name}.apache.org"
   end.call
 

data/rakelib/rspec.rake

@@ -65,19 +65,37 @@ begin
   desc 'Run all specs with CI reporter'
   task :ci=>[:load_ci_reporter, :spec]
 
+  def rvm_run_in(version, command)
+    if !(Config::CONFIG['host_os'] =~ /mswin|win32|dos/i)
+      cmd_prefix = "rvm #{version} exec"
+      sh "rm -f Gemfile.lock; #{cmd_prefix} bundle install; #{cmd_prefix} bundle exec #{command}"
+    else
+      sh "#{version =~ /jruby/ ? "j" : ""}ruby -S #{command}"
+    end
+  end
+
   # Useful for testing with JRuby when using Ruby and vice versa.
   namespace :spec do
-    desc "Run all specs specifically with Ruby"
-    task :ruby do
+    desc "Run all specs specifically with Ruby 1.9"
+    task :ruby_1_9 do
       puts "Running test suite using Ruby ..."
-      sh 'ruby -S rake spec'
+      rvm_run_in("ruby-1.9.2-p320@buildr", "rake spec")
+    end
+
+    desc "Run all specs specifically with Ruby 1.8"
+    task :ruby_1_8 do
+      puts "Running test suite using Ruby ..."
+      rvm_run_in("ruby-1.8.7-p358@buildr", "rake spec")
     end
 
     desc "Run all specs specifically with JRuby"
     task :jruby do
       puts "Running test suite using JRuby ..."
-      sh 'jruby -S rake spec'
+      rvm_run_in("jruby-1.6.7@buildr", "rake spec")
     end
+
+    desc "Run all specs across various rubies"
+    task :all => [:jruby, :ruby_1_8, :ruby_1_9]
   end
 
   task :clobber do
@@ -86,7 +104,5 @@ begin
   end
 
 rescue LoadError => e
-  puts "Buildr uses RSpec. You can install it by running rake setup"
-  task(:setup) { install_gem 'rcov', :version=>'~>0.8' }
-  task(:setup) { install_gem 'win32console' if RUBY_PLATFORM[/win32/] } # Colors for RSpec, only on Windows platform.
+  puts "Buildr uses RSpec. You can install it by running bundler"
 end

data/rakelib/stage.rake

@@ -13,19 +13,15 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
+require 'rubyforge'
 require 'digest/md5'
 require 'digest/sha1'
 
-begin # Releases upload Gems to RubyForge.
-  require 'rubyforge'
-rescue LoadError
-  task(:setup) { install_gem 'rubyforge' }
-end
-
 gpg_cmd = 'gpg2'
 
 task :prepare do |task, args|
+  gpg_arg = args.gpg || ENV['gpg']
+  
   # Make sure we're doing a release from checked code.
   lambda do
     puts "Checking there are no local changes ... "
@@ -41,31 +37,30 @@ task :prepare do |task, args|
     puts "Checking that CHANGELOG indicates most recent version and today's date ... "
     expecting = "#{spec.version} (#{Time.now.strftime('%Y-%m-%d')})"
     header = File.readlines('CHANGELOG').first.chomp
-    #fail "Expecting CHANGELOG to start with #{expecting}, but found #{header} instead" unless expecting == header
+    fail "Expecting CHANGELOG to start with #{expecting}, but found #{header} instead" unless expecting == header
     puts "[x] CHANGELOG indicates most recent version and today's date"
   end.call
 
   # Need GPG to sign the packages.
   lambda do
-    args.gpg or fail "Please run with gpg=<argument for gpg --local-user>"
-    gpg_ok = `gpg2 --list-keys #{args.gpg}`
+    gpg_arg or fail "Please run with gpg=<argument for gpg --local-user>"
+    gpg_ok = `gpg2 --list-keys #{gpg_arg}` rescue nil
     if !$?.success?
-      gpg_ok = `gpg --list-keys #{args.gpg}`
+      gpg_ok = `gpg --list-keys #{gpg_arg}`
       gpg_cmd = 'gpg'
     end
-    fail "No GPG user #{args.gpg}" if gpg_ok.empty?
+    fail "No GPG user #{gpg_arg}" if gpg_ok.empty?
   end.call
 
   task(:license).invoke
-  task(:dependency).invoke
 
   # Need JRuby, Scala and Groovy installed to run all the specs.
   lambda do
-    puts "Checking that we have JRuby, Scala and Groovy available ... "
-    sh 'jruby --version'
-    sh 'scala -version'
+    puts "Checking that we have Scala and Groovy available ... "
+    `scala -version`
+    $?.exitstatus == 1 or fail "Scala is not installed"
     sh 'groovy -version'
-    puts "[X] We have JRuby, Scala and Groovy"
+    puts "[X] We have Scala and Groovy"
   end.call
 
   # Need Prince to generate PDF
@@ -84,11 +79,13 @@ task :prepare do |task, args|
   end.call
 
   # We will be speccing in one platform, so also spec the other one.
-  task(RUBY_PLATFORM =~ /java/ ? 'spec:ruby' : 'spec:jruby').invoke # Test the *other* platform
+  task('spec:ruby_1_9').invoke unless RUBY_VERSION >= '1.9' && !RUBY_PLATFORM[/java/]
+  task('spec:ruby_1_8').invoke unless RUBY_VERSION >= '1.8.7' && !RUBY_PLATFORM[/java/]
+  task('spec:jruby').invoke unless RUBY_PLATFORM[/java/]
 end
 
-
-task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
+task :stage=>[:clobber, :prepare] do |task, args|
+  gpg_arg = args.gpg || ENV['gpg']
   mkpath '_staged'
 
   # Start by figuring out what has changed.
@@ -117,7 +114,7 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
       bytes = File.open(pkg, 'rb') { |file| file.read }
       File.open(pkg + '.md5', 'w') { |file| file.write Digest::MD5.hexdigest(bytes) << ' ' << File.basename(pkg) }
       File.open(pkg + '.sha1', 'w') { |file| file.write Digest::SHA1.hexdigest(bytes) << ' ' << File.basename(pkg) }
-      sh gpg_cmd, '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
+      sh gpg_cmd, '--local-user', gpg_arg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
     end
     cp 'etc/KEYS', '_staged/dist'
     puts "[X] Created and signed release packages in _staged/dist"

data/spec/addon/bnd_spec.rb

@@ -273,14 +273,14 @@ SRC
 
     it "defaults -classpath to compile path and dependencies" do
       @foo.packages[0].to_params['-classpath'].should include(@foo.compile.target.to_s)
-      @foo.packages[0].to_params['-classpath'].should include(Buildr.artifacts(Buildr::Ant.dependencies[0]).to_s)
+      @foo.packages[0].to_params['-classpath'].should include(Buildr.artifact(Buildr::Ant.dependencies[0]).to_s)
       @bar.packages[0].to_params['-classpath'].should include(@bar.compile.target.to_s)
     end
 
     it "classpath method returns compile path and dependencies" do
       @foo.packages[0].classpath.should include(@foo.compile.target)
       Buildr::Ant.dependencies.each do |dependency|
-        @foo.packages[0].classpath.to_s.should include(Buildr.artifacts(dependency).to_s)
+        @foo.packages[0].classpath.to_s.should include(Buildr.artifact(dependency).to_s)
       end
       @bar.packages[0].classpath.should include(@bar.compile.target)
     end

data/spec/addon/jaxb_xjc_spec.rb

@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
 
 require File.expand_path('../spec_helpers', File.dirname(__FILE__))
 Sandbox.require_optional_extension 'buildr/jaxb_xjc'
@@ -123,3 +124,7 @@ describe Buildr::JaxbXjc do
     end
   end
 end
+
+elsif Buildr::VERSION >= '1.5'
+  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
+end