buildr 1.4.7.pre2 → 1.4.7

data/lib/buildr/java/rjb.rb

@@ -74,7 +74,7 @@ module Java
 
   # On OS X we know where the default JDK is. We can try to guess for other OS.
   # We set JAVA_HOME early so we can use it without calling Java.load first.
-  ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
+  ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if RbConfig::CONFIG['host_os'] =~ /darwin/i
 
   class << self
 

data/lib/buildr/java/test_result.rb

@@ -13,6 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+# It is necessary to require these files here as the bdd plugin directly includes this file
+require 'yaml'
+require 'rspec/core/formatters/base_formatter'
+
 module Buildr #:nodoc:
   module TestFramework
 

data/lib/buildr/packaging/version_requirement.rb

@@ -49,7 +49,7 @@ module Buildr
     class << self
       # is +str+ a version string?
       def version?(str)
-        /^\s*\d[#{VER_CHARS}]*\s*$/ === str
+        /^\s*r?\d[#{VER_CHARS}]*\s*$/ === str
       end
 
       # is +str+ a version requirement?

data/lib/buildr/packaging/zip.rb

@@ -177,7 +177,7 @@ module Zip #:nodoc:
 
   class ZipEntrySet
     def <<(entry)
-      @entrySet[entry.to_s] = entry if entry != nil
+      @entrySet[entry.name.to_s] = entry if entry != nil
     end
   end
 end

data/lib/buildr/run.rb

@@ -171,8 +171,9 @@ module Buildr
     end
 
     after_define(:run => :test) do |project|
-      project.run.with project.test.compile.dependencies
-      project.run.with project.test.compile.target if project.test.compile.target
+      project.run.with project.compile.dependencies
+      project.run.with project.resources.target if project.resources.target
+      project.run.with project.compile.target if project.compile.target
     end
 
     # :call-seq:

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr
-  VERSION = '1.4.7.pre2'.freeze
+  VERSION = '1.4.7'.freeze
 end

data/rakelib/doc.rake

@@ -14,8 +14,8 @@
 # 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") }
@@ -24,7 +24,7 @@ if !RUBY_PLATFORM[/java/]
   end
 
   desc "Generate RDoc documentation in rdoc/"
-  Rake::RDocTask.new :rdoc do |rdoc|
+  RDoc::Task.new :rdoc do |rdoc|
     rdoc.rdoc_dir = 'rdoc'
     rdoc.title = spec.name
     rdoc.options = spec.rdoc_options.clone
@@ -66,8 +66,8 @@ if !RUBY_PLATFORM[/java/]
     puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running bundler"
   end
 
-  if `pygmentize -V`.empty?
-    puts "Buildr uses the Pygments python library. You can install it by running 'sudo easy_install Pygments'"
+  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"
@@ -79,7 +79,7 @@ if !RUBY_PLATFORM[/java/]
   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')
+    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')

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/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

data/rakelib/stage.rake

@@ -13,13 +13,15 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
+require 'rubyforge'
 require 'digest/md5'
 require 'digest/sha1'
 
 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,24 +43,24 @@ task :prepare do |task, args|
 
   # 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
 
   # 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
@@ -77,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=>[:clobber, :prepare] do |task, args|
+  gpg_arg = args.gpg || ENV['gpg']
   mkpath '_staged'
 
   # Start by figuring out what has changed.
@@ -110,7 +114,7 @@ task :stage=>[: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/core/application_spec.rb

@@ -133,7 +133,7 @@ describe Buildr::Application do
       write 'build.yaml', <<-YAML
         gems:
         - rake
-        - rspec ~> 2.1.0
+        - rspec ~> 2.9.0
       YAML
       Buildr.application.should_receive(:listed_gems).and_return([[Gem.loaded_specs['rspec'],Gem.loaded_specs['rake']],[]])
       Buildr.application.load_gems

data/spec/core/cc_spec.rb

@@ -92,21 +92,29 @@ describe Buildr::CCTask do
         foo.cc.invoke
       rescue => e
         p "unexpected exception #{e.inspect}"
-        p e.backtrace.join("\n").inspect
+        p e.backtrace.join("\n")
       end
     end
 
-    sleep 1
+    #Ick! Try to get the sleeping enough on each platform that the tests reliably pass
+    sleep 1 if RUBY_VERSION >= '1.9' && !RUBY_PLATFORM[/java/]
+    sleep 5 if RUBY_VERSION >= '1.8.7' && !RUBY_PLATFORM[/java/]
+    sleep 1 if RUBY_PLATFORM[/java/]
 
     foo.compile.run_count.should == 1
     foo.test.compile.run_count.should == 1
     foo.resources.run_count.should == 1
 
-    sleep 1 # Wait one sec as the timestamp needs to be different.
+    # Wait some time as the timestamp needs to be different on files.
+    sleep 3 if Buildr::Util.win_os?
+    sleep 1 unless Buildr::Util.win_os?
 
     touch File.join(Dir.pwd, 'src/main/java/Example.java')
 
-    sleep 1
+    #Ick! Try to get the sleeping enough on each platform that the tests reliably pass
+    sleep 1 if RUBY_VERSION >= '1.9' && !RUBY_PLATFORM[/java/]
+    sleep 5 if RUBY_VERSION >= '1.8.7' && !RUBY_PLATFORM[/java/]
+    sleep 1 if RUBY_PLATFORM[/java/]
 
     foo.compile.run_count.should == 2
     foo.test.compile.run_count.should == 2

data/spec/core/doc_spec.rb

@@ -124,7 +124,7 @@ describe Project, '#doc' do
       compile.using(:javac)
       doc.include included
     end
-    project('foo').doc.source_files.should include(included)
+    project('foo').doc.source_files.should include(File.expand_path(included))
   end
 
   it 'should respond to exclude() and return self' do

data/spec/core/run_spec.rb

@@ -27,13 +27,20 @@ describe Project, :run do
     project('foo').run.should be_kind_of(Run::RunTask)
   end
 
-  it 'should include compile and test.compile dependencies' do
+  it 'should include compile dependencies' do
     define('foo') do
       compile.using(:javac).with 'group:compile:jar:1.0'
       test.compile.using(:javac).with 'group:test:jar:1.0'
     end
     project('foo').run.classpath.should include(artifact('group:compile:jar:1.0'))
-    project('foo').run.classpath.should include(artifact('group:test:jar:1.0'))
+  end
+  
+  it 'should not include test dependencies' do
+    define('foo') do
+      compile.using(:javac).with 'group:compile:jar:1.0'
+      test.compile.using(:javac).with 'group:test:jar:1.0'
+    end
+    project('foo').run.classpath.should_not include(artifact('group:test:jar:1.0'))
   end
 
   it 'should respond to using() and return self' do
@@ -63,11 +70,17 @@ describe Project, :run do
     end
     project('foo').run.runner.should be_a(Run::JavaRunner)
   end
+  
+  it "should run with the project resources" do
+    write 'src/main/java/Test.java', 'class Test {}'
+    write 'src/main/resources/test.properties', ''
+    define 'foo'
+    project('foo').run.classpath.should include project('foo').resources.target
+  end
 
-  it 'should depend on project''s compile and test.compile task' do
+  it 'should depend on project''s compile task' do
     define 'foo'
     project('foo').run.prerequisites.should include(project('foo').compile)
-    project('foo').run.prerequisites.should include(project('foo').test)
   end
 
   it 'should be local task' do

data/spec/core/test_spec.rb

@@ -747,9 +747,11 @@ describe Rake::Task, 'test' do
   end
 
   it 'should stop at first failure' do
-    define('foo') { test { fail } }
-    define('bar') { test { fail } }
-    lambda { task('test').invoke rescue nil }.should run_tasks('foo:test').but_not('bar:test')
+    define('myproject') do
+      define('foo') { test { fail } }
+      define('bar') { test { fail } }
+    end
+    lambda { task('test').invoke rescue nil }.should run_tasks('myproject:bar:test').but_not('myproject:foo:test')
   end
 
   it 'should ignore failure if options.test is :all' do

data/spec/ide/idea_spec.rb

@@ -331,7 +331,7 @@ describe Buildr::IntellijIdea do
 
             xml.RunnerSettings(:RunnerId => "Run")
             xml.ConfigurationWrapper(:RunnerId => "Run")
-            xml.method()
+            xml.tag! :method
           end
           ipr.add_configuration("Run Planner.html", "GWT.ConfigurationType", "GWT Configuration") do |xml|
             xml.module(:name => project.iml.id)
@@ -341,7 +341,7 @@ describe Buildr::IntellijIdea do
 
             xml.RunnerSettings(:RunnerId => "Run")
             xml.ConfigurationWrapper(:RunnerId => "Run")
-            xml.method()
+            xml.tag! :method
           end
         end
         invoke_generate_task

data/spec/java/cobertura_spec.rb

@@ -15,6 +15,8 @@
 
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_coverage_helper'))
+if ENV_JAVA['java.version'] < "1.7"
+
 Sandbox.require_optional_extension 'buildr/java/cobertura'
 artifacts(Buildr::Cobertura::dependencies).map(&:invoke)
 
@@ -110,3 +112,5 @@ JAVA
     end
   end
 end
+
+end

data/spec/java/emma_spec.rb

@@ -13,8 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_coverage_helper'))
+if ENV_JAVA['java.version'] < "1.7"
+
 Sandbox.require_optional_extension 'buildr/java/emma'
 artifacts(Buildr::Emma::dependencies).map(&:invoke)
 
@@ -119,3 +120,5 @@ describe Buildr::Emma do
     end
   end
 end
+
+end

data/spec/java/java_spec.rb

@@ -22,7 +22,7 @@ unless RUBY_PLATFORM =~ /java/
     before do
       @old_home, ENV['JAVA_HOME'] = ENV['JAVA_HOME'], nil
       @old_env_java = Object.module_eval { remove_const :ENV_JAVA }
-      Config::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
+      RbConfig::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
     end
 
     it 'should point to default JVM' do

data/spec/java/pom_spec.rb

@@ -0,0 +1,125 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+require 'fileutils'
+
+describe Buildr::POM do
+  before do
+    repositories.remote = 'http://example.com'
+    @app = 'group:pomapp:jar:1.0'
+    write artifact(@app).pom.to_s, <<-XML
+<project>
+  <artifactId>pomapp</artifactId>
+  <groupId>group</groupId>
+  <dependencies>
+    <dependency>
+      <artifactId>library</artifactId>
+      <groupId>org.example</groupId>
+      <version>1.1</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
+XML
+    @library = 'org.example:library:jar:1.1'
+    write artifact(@library).pom.to_s, <<-XML
+<project>
+  <artifactId>pomapp</artifactId>
+  <groupId>group</groupId>
+  <dependencies>
+    <dependency>
+      <artifactId>mail</artifactId>
+      <groupId>javax.mail</groupId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <artifactId>foo</artifactId>
+      <groupId>org.example</groupId>
+      <version>2.0</version>
+    </dependency>
+  </dependencies>
+</project>
+XML
+  end
+
+  it 'should respect exclusions when computing transitive dependencies' do
+    pom = POM.load(artifact(@app).pom)
+    specs = [ 'org.example:library:jar:1.1', 'org.example:foo:jar:2.0' ]
+    pom.dependencies.should eql(specs)
+  end
+end
+
+describe Buildr::POM do
+  before do
+    repositories.remote = 'http://example.com'
+    @app = 'group:app:jar:1.0'
+    write artifact(@app).pom.to_s, <<-XML
+<project>
+  <properties>
+    <a.version>${b.version}</a.version>
+    <b.version>1.1</b.version>
+  </properties>
+  <artifactId>app</artifactId>
+  <groupId>group</groupId>
+  <dependencies>
+    <dependency>
+      <artifactId>library</artifactId>
+      <groupId>org.example</groupId>
+      <version>${a.version}</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
+XML
+    @library = 'org.example:library:jar:1.1'
+    write artifact(@library).pom.to_s, <<-XML
+<project>
+  <artifactId>app</artifactId>
+  <groupId>group</groupId>
+  <dependencies>
+    <dependency>
+      <artifactId>mail</artifactId>
+      <groupId>javax.mail</groupId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <artifactId>foo</artifactId>
+      <groupId>org.example</groupId>
+      <version>2.0</version>
+    </dependency>
+  </dependencies>
+</project>
+XML
+  end
+
+  it 'should respect exclusions when computing transitive dependencies when the pom includes properties' do
+    pom = POM.load(artifact(@app).pom)
+    specs = {"a.version"=>"1.1", "b.version"=>"1.1", "project.groupId"=>"group", "pom.groupId"=>"group", "groupId"=>"group", "project.artifactId"=>"app", "pom.artifactId"=>"app", "artifactId"=>"app"}
+    pom.properties.should eql(specs)
+  end
+end