buildr 1.4.14-java → 1.4.15-java

data/lib/buildr/packaging/test_jar.rb

@@ -16,7 +16,7 @@
 module Buildr #:nodoc:
   module PackageAsTestJar
     def package_as_test_jar_spec(spec) #:nodoc:
-      spec.merge(:type => :jar, :classifier => 'test-jar')
+      spec.merge(:type => :jar, :classifier => 'tests')
     end
 
     def package_as_test_jar(file_name) #:nodoc:

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.4.14'.freeze
+  VERSION = '1.4.15'.freeze
 end

data/rakelib/doc.rake

@@ -125,15 +125,17 @@ task 'setup-local-site-svn' do
   end
 end
 
+rescue Exception => e
+# The doc tasks do not work on our CI infrastructure with jruby as the native libraries
+# are not compatible with version of the C++ library we are running there
+end
+
 task 'clobber' do
+  rm_f 'rake/lib'
   rm_rf 'rake'
+  rm_rf 'rdoc'
   rm_rf 'site'
   rm_rf '_site'
   rm_f 'buildr.pdf'
   rm_f 'prince_errors.log'
 end
-
-rescue Exception => e
-# The doc tasks do not work on our CI infrastructure with jruby as the native libraries
-# are not compatible with version of the C++ library we are running there
-end

data/rakelib/release.rake

@@ -59,14 +59,21 @@ task 'release' => %w{setup-local-site-svn} do
     puts "[X] Uploaded gems and source files to #{spec.name}.rubyforge.org"
   end.call
 
-  # Push gems to Rubyforge.org / Gemcutter
+  # Push gems to Rubyforge.org
   lambda do
     files = FileList["_release/#{spec.version}/dist/*.{gem}"]
     files.each do |f|
-      puts "Push gem #{f} to RubyForge.org / Gemcutter ... "
-      `gem push #{f}`
+      puts "Push gem #{f} to RubyForge.org ... "
+      sh 'gem', 'push', f do |ok, res|
+          if ok
+            puts "[X] Pushed gem #{File.basename(f)} to Rubyforge.org"
+          else
+            puts 'Could not push gem, please do it yourself!'
+            puts %{  gem push #{f}}
+          end
+        end
     end
-    puts '[X] Pushed gems to Rubyforge.org / Gemcutter'
+    puts '[X] Pushed gems to Rubyforge.org'
   end.call
 
   # Create an SVN tag for this release.

data/rakelib/stage.rake

@@ -19,7 +19,7 @@ require 'digest/sha1'
 
 gpg_cmd = 'gpg2'
 
-STAGE_DATE = Time.now.strftime('%Y-%m-%d')
+STAGE_DATE = ENV['STAGE_DATE'] ||  Time.now.strftime('%Y-%m-%d')
 
 task 'prepare' do |task, args|
   gpg_arg = args.gpg || ENV['gpg']
@@ -93,7 +93,7 @@ task 'prepare' do |task, args|
     rubyforge = RubyForge.new.configure
     rubyforge.login
     rubyforge.scrape_project(spec.name)
-  end.call
+  end.call if false
 
   raise "Can not run stage process under jruby" if RUBY_PLATFORM[/java/]
   raise "Can not run staging process under older rubies" unless RUBY_VERSION >= '1.9'

data/spec/addon/bnd_spec.rb

@@ -381,4 +381,4 @@ SRC
     end
   end
 
-end
+end

data/spec/addon/jaxb_xjc_spec.rb

@@ -110,10 +110,10 @@ describe Buildr::JaxbXjc do
     end
 
     it "produce .java files in the correct location" do
-      File.should be_exist(@foo._("target/generated/jaxb/org/foo/api/Agency.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/org/foo/api/LatLongCoordinate.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/org/foo/api/ObjectFactory.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/org/foo/api/Wildfire.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/Agency.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/LatLongCoordinate.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/ObjectFactory.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/Wildfire.java"))
     end
 
     it "produce .class files in the correct location" do

data/spec/core/cc_spec.rb

@@ -171,7 +171,8 @@ describe Buildr::CCTask do
     end
   end
 
-  it 'should support parent and subprojects' do |spec|
+  # Not sure why this intermittently fails
+  it 'should support parent and subprojects', :retry => 3 do |spec|
     write 'foo/src/main/java/Example.java', "public class Example {}"
     write 'foo/src/test/java/ExampleTest.java', "public class ExampleTest {}"
 

data/spec/core/common_spec.rb

@@ -97,7 +97,7 @@ end
 describe Buildr.method(:download) do
   before do
     @content = 'we has download!'
-    @http = mock('http')
+    @http = double('http')
     @http.stub(:request).and_return(Net::HTTPNotModified.new(nil, nil, nil))
   end
 
@@ -495,13 +495,13 @@ describe Buildr::Filter do
   it 'should touch target directory' do
     mkpath 'target' ; File.utime @early, @early, 'target'
     @filter.from('src').into('target').run
-    File.stat('target').mtime.should be_close(Time.now, 10)
+    File.stat('target').mtime.should be_within(10).of(Time.now)
   end
 
   it 'should not touch target directory unless running' do
     mkpath 'target' ; File.utime @early, @early, 'target'
     @filter.from('src').into('target').exclude('*').run
-    File.mtime('target').should be_close(@early, 10)
+    File.mtime('target').should be_within(10).of(@early)
   end
 
   it 'should run only on new files' do
@@ -601,7 +601,7 @@ describe Buildr::Options, 'proxy.exclude' do
     @uri = URI("http://#{@host}")
     @no_proxy_args = [@host, 80]
     @proxy_args = @no_proxy_args + ['myproxy', 8080, nil, nil]
-    @http = mock('http')
+    @http = double('http')
     @http.stub(:request).and_return(Net::HTTPNotModified.new(nil, nil, nil))
   end
 

data/spec/core/compile_spec.rb

@@ -389,21 +389,21 @@ describe Buildr::CompileTask, '#invoke' do
     time = now_at_fs_resolution - 10
     mkpath compile_task.target.to_s
     File.utime(time, time, compile_task.target.to_s)
-    compile_task.timestamp.should be_close(time, 1)
+    compile_task.timestamp.should be_within(1).of(time)
   end
 
   it 'should touch target if anything compiled' do
     mkpath compile_task.target.to_s
     File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
     compile_task.from(sources).invoke
-    File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution, 2)
+    File.stat(compile_task.target.to_s).mtime.should be_within(2).of(now_at_fs_resolution)
   end
 
   it 'should not touch target if nothing compiled' do
     mkpath compile_task.target.to_s
     File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
     compile_task.invoke
-    File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
+    File.stat(compile_task.target.to_s).mtime.should be_within(2).of(now_at_fs_resolution - 10)
   end
 
   it 'should not touch target if failed to compile' do
@@ -411,7 +411,7 @@ describe Buildr::CompileTask, '#invoke' do
     File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
     write 'failed.java', 'not a class'
     suppress_stdout { compile_task.from('failed.java').invoke rescue nil }
-    File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
+    File.stat(compile_task.target.to_s).mtime.should be_within(2).of(now_at_fs_resolution - 10)
   end
 
   it 'should complain if source directories and no compiler selected' do
@@ -429,7 +429,7 @@ describe Buildr::CompileTask, '#invoke' do
     touch 'target/classes/foo/Foo.class'
     File.utime(now_at_fs_resolution - 10, now_at_fs_resolution - 10, compile_task.target.to_s)
     compile_task.invoke
-    File.stat(compile_task.target.to_s).mtime.should be_close(now_at_fs_resolution - 10, 2)
+    File.stat(compile_task.target.to_s).mtime.should be_within(2).of(now_at_fs_resolution - 10)
   end
 end
 

data/spec/core/console_spec.rb

@@ -21,7 +21,7 @@ describe Buildr::Console do
 
     it 'should return a value' do
       Buildr::Console.console_dimensions.should_not be_nil
-    end if $stdout.isatty && !ENV["TRAVIS"]
+    end if $stdout.isatty && !ENV["TRAVIS"] && !Buildr::Util.win_os?
   end
 
   describe 'color' do
@@ -42,7 +42,7 @@ describe Buildr::Console do
       it 'should emit blue code when asked' do
         Buildr::Console.color('message', :blue).should eql("\e[34mmessage\e[0m")
       end
-    end if $stdout.isatty
+    end if $stdout.isatty && !Buildr::Util.win_os?
 
     describe ' use_color is false' do
       before do

data/spec/core/test_spec.rb

@@ -183,7 +183,7 @@ describe Buildr::TestTask do
   end
 
   it 'should execute setup task before running tests' do
-    mock = mock('actions')
+    mock = double('actions')
     test_task.setup { mock.setup }
     test_task.enhance { mock.tests }
     mock.should_receive(:setup).ordered
@@ -192,7 +192,7 @@ describe Buildr::TestTask do
   end
 
   it 'should execute teardown task after running tests' do
-    mock = mock('actions')
+    mock = double('actions')
     test_task.teardown { mock.teardown }
     test_task.enhance { mock.tests }
     mock.should_receive(:tests).ordered

data/spec/core/transport_spec.rb

@@ -19,9 +19,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers')
 
 describe URI, '#download' do
   before do
-    write @source = 'source', @content = 'Just a file'
-    @uri = URI(URI.escape("file://#{File.expand_path(@source)}"))
-    @target = 'target'
+    write @source = File.expand_path('source'), @content = 'A file to download'
+    @uri = URI(URI.escape("file://#{@source}"))
+    @target = File.expand_path('target')
+    rm_f @target
   end
 
   it 'should download file if found' do
@@ -59,8 +60,9 @@ end
 describe URI, '#upload' do
   before do
     write @source = 'source', @content = 'Just a file'
-    @target = 'target'
-    @uri = URI(URI.escape("file://#{File.expand_path(@target)}"))
+    @target = File.expand_path('target')
+    rm_rf @target
+    @uri = URI(URI.escape("file://#{@target}"))
   end
 
   it 'should preserve file permissions if uploading to a file' do
@@ -237,7 +239,7 @@ describe URI::HTTP, '#read' do
     @uri = URI("http://#{@host_domain}#{@path}#{@query}")
     @no_proxy_args = [@host_domain, 80]
     @proxy_args = @no_proxy_args + ['myproxy', 8080, 'john', 'smith']
-    @http = mock('http')
+    @http = double('http')
     @http.stub(:request).and_yield(Net::HTTPNotModified.new(nil, nil, nil))
   end
 
@@ -318,7 +320,7 @@ describe URI::HTTP, '#read' do
 
   it 'should use HTTP Basic authentication' do
     Net::HTTP.should_receive(:new).and_return(@http)
-    request = mock('request')
+    request = double('request')
     Net::HTTP::Get.should_receive(:new).and_return(request)
     request.should_receive(:basic_auth).with('john', 'secret')
     URI("http://john:secret@#{@host_domain}").read
@@ -331,7 +333,7 @@ describe URI::HTTP, '#read' do
     redirect = Net::HTTPRedirection.new(nil, nil, nil)
     redirect['Location'] = "http://#{@host_domain}/asdf"
 
-    request1 = mock('request1')
+    request1 = double('request1')
     Net::HTTP::Get.should_receive(:new).once.with('/', default_http_headers).and_return(request1)
     request1.should_receive(:basic_auth).with('john', 'secret')
     @http.should_receive(:request).with(request1).and_yield(redirect)
@@ -340,7 +342,7 @@ describe URI::HTTP, '#read' do
     ok = Net::HTTPOK.new(nil, nil, nil)
     ok.stub(:read_body)
 
-    request2 = mock('request2')
+    request2 = double('request2')
     Net::HTTP::Get.should_receive(:new).once.with("/asdf", default_http_headers).and_return(request2)
     request2.should_receive(:basic_auth).with('john', 'secret')
     @http.should_receive(:request).with(request2).and_yield(ok)
@@ -362,7 +364,7 @@ describe URI::HTTP, '#write' do
   before do
     @content = 'Readme. Please!'
     @uri = URI('http://john:secret@host.domain/foo/bar/baz.jar')
-    @http = mock('Net::HTTP')
+    @http = double('Net::HTTP')
     @http.stub(:request).and_return(Net::HTTPOK.new(nil, nil, nil))
     Net::HTTP.stub(:new).and_return(@http)
   end
@@ -438,9 +440,9 @@ describe URI::SFTP, '#read' do
     @uri = URI('sftp://john:secret@localhost/root/path/readme')
     @content = 'Readme. Please!'
 
-    @ssh_session = mock('Net::SSH::Session')
-    @sftp_session = mock('Net::SFTP::Session')
-    @file_factory = mock('Net::SFTP::Operations::FileFactory')
+    @ssh_session = double('Net::SSH::Session')
+    @sftp_session = double('Net::SFTP::Session')
+    @file_factory = double('Net::SFTP::Operations::FileFactory')
     Net::SSH.stub(:start).with('localhost', 'john', :password=>'secret', :port=>22).and_return(@ssh_session) do
       Net::SFTP::Session.should_receive(:new).with(@ssh_session).and_yield(@sftp_session).and_return(@sftp_session)
       @sftp_session.should_receive(:connect!).and_return(@sftp_session)
@@ -462,14 +464,14 @@ describe URI::SFTP, '#read' do
   end
 
   it 'should read contents of file and return it' do
-    file = mock('Net::SFTP::Operations::File')
+    file = double('Net::SFTP::Operations::File')
     file.should_receive(:read).with(URI::RW_CHUNK_SIZE).once.and_return(@content)
     @file_factory.should_receive(:open).with('/root/path/readme', 'r').and_yield(file)
     @uri.read.should eql(@content)
   end
 
   it 'should read contents of file and pass it to block' do
-    file = mock('Net::SFTP::Operations::File')
+    file = double('Net::SFTP::Operations::File')
     file.should_receive(:read).with(URI::RW_CHUNK_SIZE).once.and_return(@content)
     @file_factory.should_receive(:open).with('/root/path/readme', 'r').and_yield(file)
     content = ''
@@ -486,9 +488,9 @@ describe URI::SFTP, '#write' do
     @uri = URI('sftp://john:secret@localhost/root/path/readme')
     @content = 'Readme. Please!'
 
-    @ssh_session = mock('Net::SSH::Session')
-    @sftp_session = mock('Net::SFTP::Session')
-    @file_factory = mock('Net::SFTP::Operations::FileFactory')
+    @ssh_session = double('Net::SSH::Session')
+    @sftp_session = double('Net::SFTP::Session')
+    @file_factory = double('Net::SFTP::Operations::FileFactory')
     Net::SSH.stub(:start).with('localhost', 'john', :password=>'secret', :port=>22).and_return(@ssh_session) do
       Net::SFTP::Session.should_receive(:new).with(@ssh_session).and_yield(@sftp_session).and_return(@sftp_session)
       @sftp_session.should_receive(:connect!).and_return(@sftp_session)
@@ -539,7 +541,7 @@ describe URI::SFTP, '#write' do
   end
 
   it 'should write contents to file' do
-    file = mock('Net::SFTP::Operations::File')
+    file = double('Net::SFTP::Operations::File')
     file.should_receive(:write).with(@content)
     @file_factory.should_receive(:open).with('/root/path/readme', 'w').and_yield(file)
     @uri.write @content

data/spec/ide/idea_spec.rb

@@ -1076,6 +1076,31 @@ describe Buildr::IntellijIdea do
       end
     end
 
+    describe "with default configuration added to root project" do
+      before do
+        @foo = define "foo" do
+          ipr.add_default_configuration("GWT.ConfigurationType", "GWT Configuration") do |xml|
+            xml.module(:name => project.iml.id)
+            xml.option(:name => "RUN_PAGE", :value => "Planner.html")
+            xml.option(:name => "compilerParameters", :value => "-draftCompile -localWorkers 2")
+            xml.option(:name => "compilerMaxHeapSize", :value => "512")
+
+            xml.RunnerSettings(:RunnerId => "Run")
+            xml.ConfigurationWrapper(:RunnerId => "Run")
+            xml.tag! :method
+          end
+        end
+        invoke_generate_task
+      end
+
+      it "generates an IPR with default configuration" do
+        doc = xml_document(@foo._("foo.ipr"))
+        facet_xpath = "/project/component[@name='ProjectRunConfigurationManager']/configuration"
+        doc.should have_nodes(facet_xpath, 1)
+        doc.should have_xpath("#{facet_xpath}[@type='GWT.ConfigurationType' AND @factoryName='GWT Configuration' AND @default='true']")
+      end
+    end
+
     describe "with iml.group specified" do
       before do
         @foo = define "foo" do

data/spec/java/commands_spec.rb

@@ -90,4 +90,4 @@ BUILD
       lambda { Java::Commands.javadoc(project("foo"), :output => "doc") }.should change {File.exist?("doc/Foo.html") && File.exist?("doc/bar/Foobar.html")}.to(true)
     end
   end
-end
+end

data/spec/java/compiler_spec.rb

@@ -61,6 +61,22 @@ describe 'javac compiler' do
     end
   end
 
+  it 'should accept a task to compile from' do
+    p = define 'foo' do
+      project.version = '1'
+      f = file(_(:target, :generated, 'myjava')) do
+        mkdir_p _(:target, :generated, 'myjava')
+        File.open("#{_(:target, :generated, 'myjava')}/Foo.java", "wb") do |f|
+          f.write "public class Foo {}"
+        end
+      end
+
+      compile.from(f)
+      package(:jar)
+    end.compile.invoke
+    file('target/classes/Foo.class').should exist
+  end
+
   it 'should not change existing list of sources' do
     define 'foo' do
       compile.from('sources')

data/spec/java/ecj_spec.rb

@@ -15,21 +15,16 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
-
-
 describe Buildr::Compiler::Ecj do
 
   before(:all) do
     #Make ecj appear as a compiler that applies:
     class Buildr::Compiler::Ecj
       class << self
-
         def applies_to?(project, task)
           paths = task.sources + [sources].flatten.map { |src| Array(project.path_to(:source, task.usage, src.to_sym)) }
-          paths.flatten!
-          ext_glob = Array(source_ext).join(',')
-
-          paths.each { |path| 
+          paths.flatten.each { |path|
+            path = path.to_s
             Find.find(path) {|found|
               if (!File.directory?(found)) && found.match(/.*\.#{Array(source_ext).join('|')}/)
                 return true
@@ -97,11 +92,8 @@ describe Buildr::Compiler::Ecj do
     #Make ecj appear as a compiler that doesn't apply:
     module Buildr
       module Compiler
-
         class Ecj
-
           class << self
-
             def applies_to?(project, task)
               false
             end