buildr 1.4.5-java → 1.4.6-java

data/rakelib/release.rake

@@ -45,7 +45,6 @@ task :release do
 
   # Upload binary and source packages to RubyForge.
   lambda do
-    sh 'rubyforge', 'login'
     # update rubyforge projects, processors, etc. in local config
     sh 'rubyforge', 'config'
     files = FileList["_release/#{spec.version}/dist/*.{gem,tgz,zip}"]

data/rakelib/rspec.rake

@@ -56,9 +56,10 @@ begin
   task :load_ci_reporter do
     gem 'ci_reporter'
     ENV['CI_REPORTS'] = '_reports/ci'
-    # CI_Reporter does not quote the path to rspec_loader which causes problems when ruby is installed in C:/Program Files
+    # CI_Reporter does not quote the path to rspec_loader which causes problems when ruby is installed in C:/Program Files.
+    # However, newer versions of rspec don't like double quotes escaping as well, so removing them for now.
     ci_rep_path = Gem.loaded_specs['ci_reporter'].full_gem_path
-    ENV["SPEC_OPTS"] = [ENV["SPEC_OPTS"], default_spec_opts, "--require", "\"#{ci_rep_path}/lib/ci/reporter/rake/rspec_loader.rb\"", "--format", "CI::Reporter::RSpec"].join(" ")
+    ENV["SPEC_OPTS"] = [ENV["SPEC_OPTS"], default_spec_opts, "--require", "#{ci_rep_path}/lib/ci/reporter/rake/rspec_loader.rb", "--format", "CI::Reporter::RSpec"].join(" ")
   end
 
   desc 'Run all specs with CI reporter'

data/rakelib/setup.rake

@@ -54,6 +54,7 @@ end
 # Setup environment for running this Rakefile (RSpec, Jekyll, etc).
 desc "If you're building from sources, run this task first to setup the necessary dependencies."
 task :setup do
+=begin
   missing = spec.dependencies.select { |dep| Gem::SourceIndex.from_installed_gems.search(dep).empty? }
   missing.each do |dep|
     if (dep.respond_to? :requirement)
@@ -63,4 +64,5 @@ task :setup do
       install_gem dep.name, :version=>dep.version_requirements
     end
   end
+=end
 end

data/rakelib/stage.rake

@@ -31,8 +31,8 @@ task :prepare do |task, args|
     puts "Checking there are no local changes ... "
     svn = `svn status`
     fail "Cannot release unless all local changes are in SVN:\n#{svn}" unless svn.empty?
-    git = `git status`
-    #fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^#\t/]
+    git = `git status -s`
+    fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^ M/] && ENV["IGNORE_GIT"].nil?
     puts "[X] There are no local changes, everything is in source control"
   end.call
 
@@ -50,7 +50,7 @@ task :prepare do |task, args|
     args.gpg or fail "Please run with gpg=<argument for gpg --local-user>"
     gpg_ok = `gpg2 --list-keys #{args.gpg}`
     if !$?.success?
-      gpg_ok = `gpg --list-keys #{args.gpg}` 
+      gpg_ok = `gpg --list-keys #{args.gpg}`
       gpg_cmd = 'gpg'
     end
     fail "No GPG user #{args.gpg}" if gpg_ok.empty?

data/spec/core/common_spec.rb

@@ -541,7 +541,7 @@ describe Buildr::Filter do
   end
 
   it 'should preserve mode bits except readable' do
-    pending "Pending the release of the fix for JRUBY-4927" if RUBY_PLATFORM =~ /java/
+    # legacy: pending "Pending the release of the fix for JRUBY-4927" if RUBY_PLATFORM =~ /java/
     Dir['src/*'].each { |file| File.chmod(0o755, file) }
     @filter.from('src').into('target').run
     Dir['target/*'].sort.each do |file|

data/spec/ide/idea_spec.rb

@@ -20,7 +20,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'xpath_matchers
 describe Buildr::IntellijIdea do
 
   def invoke_generate_task
-    task('idea:generate').invoke
+    task('idea').invoke
   end
 
   def invoke_clean_task
@@ -97,7 +97,7 @@ describe Buildr::IntellijIdea do
     end
   end
 
-  describe "idea:generate" do
+  describe "idea task" do
 
     def order_entry_xpath
       "/module/component[@name='NewModuleRootManager']/orderEntry"
@@ -141,9 +141,9 @@ describe Buildr::IntellijIdea do
           invoke_generate_task
         end
 
-        it "generates one non-exported 'module-library' orderEntry in IML" do
+        it "generates one non-exported  test scope 'module-library' orderEntry in IML" do
           root_module_xml(@foo).should have_nodes("#{order_entry_xpath}[@type='module-library' and @exported]/library/CLASSES/root", 0)
-          root_module_xml(@foo).should have_nodes("#{order_entry_xpath}[@type='module-library']/library/CLASSES/root", 1)
+          root_module_xml(@foo).should have_nodes("#{order_entry_xpath}[@type='module-library' and @scope='TEST']/library/CLASSES/root", 1)
         end
       end
 
@@ -179,6 +179,9 @@ describe Buildr::IntellijIdea do
 
       describe "with local_repository_env_override set to nil" do
         before do
+          Buildr.repositories.instance_eval do
+            @local = @remote = @release_to = nil
+          end
           artifact('group:id:jar:1.0') { |t| write t.to_s }
           @foo = define "foo" do
             iml.local_repository_env_override = nil
@@ -548,7 +551,7 @@ describe Buildr::IntellijIdea do
       end
 
       it "depends on the associated module exactly once" do
-        @bar_iml.should have_nodes("//orderEntry[@type='module', @module-name='foo']", 1)
+        @bar_iml.should have_nodes("//orderEntry[@type='module', @module-name='foo', @exported=""]", 1)
       end
 
       it "does not depend on the other project's packaged JAR" do
@@ -559,9 +562,9 @@ describe Buildr::IntellijIdea do
         @bar_lib_urls.grep(%r{foo/target/classes}).should == []
       end
 
-      it "depends on the the other project's target/resources directory" do
-        @bar_lib_urls.grep(%r{file://\$MODULE_DIR\$/../foo/target/resources}).size.should == 1
-      end
+      it "does not depend on the the other project's target/resources directory" do
+        @bar_lib_urls.grep(%r{file://\$MODULE_DIR\$/../foo/target/resources}).size.should == 0
+       end
     end
 
     describe "with a single project definition" do
@@ -1048,12 +1051,12 @@ PROJECT_XML
   end
 
   describe "project extension" do
-    it "provides an 'idea:generate' task" do
-      Rake::Task.tasks.detect { |task| task.to_s == "idea:generate" }.should_not be_nil
+    it "provides an 'idea' task" do
+      Rake::Task.tasks.detect { |task| task.to_s == "idea" }.should_not be_nil
     end
 
-    it "documents the 'idea:generate' task" do
-      Rake::Task.tasks.detect { |task| task.to_s == "idea:generate" }.comment.should_not be_nil
+    it "documents the 'idea' task" do
+      Rake::Task.tasks.detect { |task| task.to_s == "idea" }.comment.should_not be_nil
     end
 
     it "provides an 'idea:clean' task" do
@@ -1064,18 +1067,6 @@ PROJECT_XML
       Rake::Task.tasks.detect { |task| task.to_s == "idea:clean" }.comment.should_not be_nil
     end
 
-    it "removes the 'idea' task" do
-      Rake::Task.tasks.detect { |task| task.to_s == "idea" }.should be_nil
-    end
-
-    it "removes the 'idea7x' task" do
-      Rake::Task.tasks.detect { |task| task.to_s == "idea7x" }.should be_nil
-    end
-
-    it "removes the 'idea7x:clean' task" do
-      Rake::Task.tasks.detect { |task| task.to_s == "idea7x:clean" }.should be_nil
-    end
-
     describe "#no_iml" do
       it "makes #iml? false" do
         @foo = define "foo" do
@@ -1142,4 +1133,4 @@ PROJECT_XML
     end
   end
 
-end
+end

data/spec/java/bdd_spec.rb

@@ -267,7 +267,7 @@ describe Buildr::JtestR do
     Buildr::JtestR.instance_eval { @dependencies = nil }
   end
 
-end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # JtestR
+end if ENV["JTESTR"] && (RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME']) # JtestR
 
 describe Buildr::JBehave do
   def foo(*args, &prc)

data/spec/packaging/artifact_spec.rb

@@ -18,6 +18,9 @@ require 'fileutils'
 
 describe Artifact do
   before do
+    Buildr.repositories.instance_eval do
+      @local = @remote = @release_to = nil
+    end
     @spec = { :group=>'com.example', :id=>'library', :type=>:jar, :version=>'2.0' }
     @artifact = artifact(@spec)
     @classified = artifact(@spec.merge(:classifier=>'all'))
@@ -145,6 +148,12 @@ end
 
 
 describe Repositories, 'local' do
+  before do
+    Buildr.repositories.instance_eval do
+      @local = @remote = @release_to = nil
+    end
+  end
+
   it 'should default to .m2 path' do
     # For convenience, sandbox actually sets the local repository to a temp directory
     repositories.local = nil
@@ -203,6 +212,10 @@ end
 
 describe Repositories, 'remote' do
   before do
+    Buildr.repositories.instance_eval do
+      @local = @remote = @release_to = nil
+    end
+
     @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
   end
 
@@ -300,6 +313,32 @@ describe Repositories, 'remote' do
       should change { File.exist?(File.join(repositories.local, 'com/example/library/2.1-SNAPSHOT/library-2.1-SNAPSHOT.jar')) }.to(true)
   end
 
+  it 'should resolve m2-style deployed snapshots with classifiers' do
+    metadata = <<-XML
+    <?xml version='1.0' encoding='UTF-8'?>
+    <metadata>
+      <groupId>com.example</groupId>
+      <artifactId>library</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <versioning>
+        <snapshot>
+          <timestamp>20071012.190008</timestamp>
+          <buildNumber>8</buildNumber>
+        </snapshot>
+        <lastUpdated>20071012190008</lastUpdated>
+      </versioning>
+    </metadata>
+    XML
+    repositories.remote = 'http://example.com'
+    URI.should_receive(:download).once.with(uri(/2.1-SNAPSHOT\/library-2.1-20071012.190008-8-classifier.jar$/), anything()).
+      and_return { |uri, target, options| write target }
+    URI.should_receive(:download).once.with(uri(/2.1-SNAPSHOT\/maven-metadata.xml$/), duck_type(:write)).
+      and_return { |uri, target, options| target.write(metadata) }
+    puts repositories.local
+    lambda { artifact('com.example:library:jar:classifier:2.1-SNAPSHOT').invoke}.
+      should change {File.exists?(File.join(repositories.local, 'com/example/library/2.1-SNAPSHOT/library-2.1-SNAPSHOT-classifier.jar')) }.to(true)
+  end
+
   it 'should fail resolving m2-style deployed snapshots if a timestamp is missing' do
     metadata = <<-XML
     <?xml version='1.0' encoding='UTF-8'?>
@@ -853,6 +892,12 @@ end
 
 
 describe Rake::Task, ' artifacts' do
+  before do
+    Buildr.repositories.instance_eval do
+      @local = @remote = @release_to = nil
+    end
+  end
+
   it 'should download all specified artifacts' do
     artifact 'group:id:jar:1.0'
     repositories.remote = 'http://example.com'
@@ -877,6 +922,9 @@ end
 describe Rake::Task, ' artifacts:sources' do
 
   before do
+    Buildr.repositories.instance_eval do
+      @local = @remote = @release_to = nil
+    end
     task('artifacts:sources').clear
     repositories.remote = 'http://example.com'
   end
@@ -913,6 +961,9 @@ end
 describe Rake::Task, ' artifacts:javadoc' do
 
   before do
+    Buildr.repositories.instance_eval do
+      @local = @remote = @release_to = nil
+    end
     task('artifacts:javadoc').clear
     repositories.remote = 'http://example.com'
   end

data/spec/sandbox.rb

@@ -21,8 +21,11 @@ Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 repositories.remote << 'http://repo1.maven.org/maven2'
 repositories.remote << 'http://scala-tools.org/repo-releases'
 
-# Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
-Buildr.settings.build['scala.version'] = "2.8.1"
+# Force Scala version for specs; don't want to rely on SCALA_HOME
+module Buildr::Scala
+  SCALA_VERSION_FOR_SPECS = ENV["SCALA_VERSION"] || "2.8.1"
+end
+Buildr.settings.build['scala.version'] = Buildr::Scala::SCALA_VERSION_FOR_SPECS
 
 # Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
 require 'buildr/clojure'
@@ -38,6 +41,7 @@ artifacts(
   Buildr::Groovy.dependencies,
   Buildr::JaxbXjc.dependencies,
   Buildr::Bnd.dependencies,
+  Buildr::Scala::Scalac.dependencies,
   Buildr::Scala::Specs.dependencies,
   Buildr::Shell::BeanShell.artifact,
   Buildr::Clojure.dependencies
@@ -48,6 +52,25 @@ end
 ENV['HOME'] = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'home'))
 mkpath ENV['HOME']
 
+# Make Scala.version resilient to sandbox reset
+module Buildr::Scala
+  DEFAULT_VERSION = SCALA_VERSION_FOR_SPECS
+
+  class << self
+    def version
+      SCALA_VERSION_FOR_SPECS
+    end
+  end
+
+  class Scalac
+    class << self
+      def use_installed?
+        false
+      end
+    end
+  end
+end
+
 # We need to run all tests inside a _sandbox, tacking a snapshot of Buildr before the test,
 # and restoring everything to its previous state after the test. Damn state changes.
 module Sandbox
@@ -101,6 +124,13 @@ module Sandbox
     Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 
     @_sandbox[:load_path] = $LOAD_PATH.clone
+
+    # clear RUBYOPT since bundler hooks into it
+    #   e.g. RUBYOPT=-I/usr/lib/ruby/gems/1.8/gems/bundler-1.0.15/lib -rbundler/setup
+    # and so Buildr's own Gemfile configuration taints e.g., JRuby's environment
+    @_sandbox[:ruby_opt] = ENV["RUBYOPT"]
+    ENV["RUBYOPT"] = nil
+
     #@_sandbox[:loaded_features] = $LOADED_FEATURES.clone
 
     # Later on we'll want to lose all the on_define created during the test.
@@ -113,16 +143,18 @@ module Sandbox
     # of some essential artifacts (e.g. JUnit artifacts required by build task), so we create
     # these first (see above) and keep them across test cases.
     @_sandbox[:artifacts] = Artifact.class_eval { @artifacts }.clone
-    Buildr.repositories.local = File.expand_path('repository')
+    @_sandbox[:local_repository] = Buildr.repositories.local
     ENV['HOME'] = File.expand_path('home')
     ENV['BUILDR_ENV'] = 'development'
 
     @_sandbox[:env_keys] = ENV.keys
     ['DEBUG', 'TEST', 'HTTP_PROXY', 'HTTPS_PROXY', 'USER'].each { |k| ENV.delete(k) ; ENV.delete(k.downcase) }
 
-    # Remove testing local repository, and reset all repository settings.
+    # By default, remote repository is user's own local M2 repository
+    # since we don't want to remotely download artifacts into the sandbox over and over
     Buildr.repositories.instance_eval do
-      @local = @remote = @release_to = nil
+      @remote = ["file://" + @local]
+      @local = @release_to = nil
     end
     Buildr.options.proxy.http = nil
 
@@ -149,12 +181,16 @@ module Sandbox
     Layout.default = @_sandbox[:layout].clone
 
     $LOAD_PATH.replace @_sandbox[:load_path]
+    ENV["RUBYOPT"] = @_sandbox[:ruby_opt]
+
     FileUtils.rm_rf @temp
     mkpath ENV['HOME']
 
     # Get rid of all artifacts.
     @_sandbox[:artifacts].tap { |artifacts| Artifact.class_eval { @artifacts = artifacts } }
 
+    Buildr.repositories.local = @_sandbox[:local_repository]
+
     # Restore options.
     Buildr.options.test = nil
     (ENV.keys - @_sandbox[:env_keys]).each { |key| ENV.delete key }

data/spec/scala/bdd_spec.rb

@@ -17,12 +17,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe Buildr::Scala::Specs do
-  
-  before(:each) do
-    # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.8.1"
-  end
-    
+
   it 'should be the default when tests in src/spec/scala' do
     write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
       package com.example

data/spec/scala/compiler_spec.rb

@@ -19,11 +19,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers')
 # need to test both with and without SCALA_HOME
 share_as :ScalacCompiler do
 
-  before(:each) do
-    # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.8.1"
-  end
-
   it 'should identify itself from source directories' do
     write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
     define('foo').compile.compiler.should eql(:scalac)
@@ -143,15 +138,7 @@ describe 'scala compiler (downloaded from repository)' do
   end
 end
 
-
-describe 'scalac compiler options' do
-  def compile_task
-    @compile_task ||= define('foo').compile.using(:scalac)
-  end
-
-  def scalac_args
-    compile_task.instance_eval { @compiler }.send(:scalac_args)
-  end
+share_as :ScalacCompiler_CommonOptions do
 
   it 'should set warnings option to false by default' do
     compile_task.options.warnings.should be_false
@@ -200,16 +187,6 @@ describe 'scalac compiler options' do
     compile_task.options.debug.should be_false
   end
 
-  it 'should use -g argument when debug option is true' do
-    compile_task.using(:debug=>true)
-    scalac_args.should include('-g')
-  end
-
-  it 'should not use -g argument when debug option is false' do
-    compile_task.using(:debug=>false)
-    scalac_args.should_not include('-g')
-  end
-
   it 'should set deprecation option to false by default' do
     compile_task.options.deprecation.should be_false
   end
@@ -287,3 +264,58 @@ describe 'scalac compiler options' do
     ENV.delete "DEBUG"
   end
 end
+
+
+describe 'scala compiler 2.8 options' do
+
+  it_should_behave_like ScalacCompiler_CommonOptions
+
+  def compile_task
+    @compile_task ||= define('foo').compile.using(:scalac)
+  end
+
+  def scalac_args
+    compile_task.instance_eval { @compiler }.send(:scalac_args)
+  end
+
+  it 'should use -g argument when debug option is true' do
+    compile_task.using(:debug=>true)
+    scalac_args.should include('-g')
+  end
+
+  it 'should not use -g argument when debug option is false' do
+    compile_task.using(:debug=>false)
+    scalac_args.should_not include('-g')
+  end
+end if Buildr::Scala.version?(2.8)
+
+describe 'scala compiler 2.9 options' do
+
+  it_should_behave_like ScalacCompiler_CommonOptions
+
+  def compile_task
+    @compile_task ||= define('foo').compile.using(:scalac)
+  end
+
+  def scalac_args
+    compile_task.instance_eval { @compiler }.send(:scalac_args)
+  end
+
+  # these specs fail. Somehow the compiler is still in version 2.8
+  it 'should use -g:vars argument when debug option is true' do
+    compile_task.using(:debug=>true)
+    scalac_args.should include('-g:vars')
+  end
+
+  it 'should use -g:whatever argument when debug option is \'whatever\'' do
+    compile_task.using(:debug=>:whatever)
+    scalac_args.should include('-g:whatever')
+  end
+
+  it 'should not use -g argument when debug option is false' do
+    compile_task.using(:debug=>false)
+    scalac_args.should_not include('-g')
+  end
+
+end if Buildr::Scala.version?(2.9)
+