buildr 1.4.7.pre2-java → 1.4.8-java

data/spec/core/common_spec.rb

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

data/spec/core/compile_spec.rb

@@ -586,7 +586,7 @@ describe Project, '#resources' do
   it 'should copy new resources to target directory' do
     time = Time.now
     mkdir_p 'target/resources'
-    File.utime(time-1, time-1, 'target/resources')
+    File.utime(time-10, time-10, 'target/resources')
 
     write 'src/main/resources/foo', 'Foo'
 
@@ -599,8 +599,8 @@ describe Project, '#resources' do
     time = Time.now
     mkdir_p 'target/resources'
     write 'target/resources/foo', 'Foo'
-    File.utime(time-1, time-1, 'target/resources')
-    File.utime(time-1, time-1, 'target/resources/foo')
+    File.utime(time-10, time-10, 'target/resources')
+    File.utime(time-10, time-10, 'target/resources/foo')
 
     write 'src/main/resources/foo', 'Foo2'
     define('foo')

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/generate_from_eclipse_spec.rb

@@ -0,0 +1,280 @@
+# 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'))
+
+module EclipseHelper
+  
+  def setupExample(group, projectName, options = {})
+	options[:symName] ? symName = options[:symName] :symName = File.basename(projectName)
+	requiredPlugins = nil
+	if options[:requires]
+	  requiredPlugins = "Require-Bundle: #{options[:requires]};bundle-version=\"1.1.0\",\n"
+	end
+        write "#{group}/#{projectName}/META-INF/MANIFEST.MF", <<-MANIFEST
+Manifest-Version: 1.0
+Name: #{projectName}
+Bundle-Version: 1.1
+Specification-Title: "Examples for #{File.basename(projectName)}"
+Specification-Version: "1.0"
+Specification-Vendor: "Acme Corp.".
+Implementation-Title: "#{File.basename(projectName)}"
+Implementation-Version: "build57"
+Implementation-Vendor: "Acme Corp."
+Bundle-SymbolicName: #{symName}
+#{requiredPlugins}
+MANIFEST
+        write "#{group}/#{projectName}/.project", <<-DOT_PROJECT
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>#{File.basename(projectName)}</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.ManifestBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.SchemaBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+        </buildSpec>
+        <natures>
+                <nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+        </natures>
+</projectDescription>
+DOT_PROJECT
+
+write "#{group}/#{projectName}/.classpath", <<-DOT_CLASSPATH
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/another.plugin"/>
+        <classpathentry kind="output" path="bin"/>
+</classpath>
+DOT_CLASSPATH
+
+write "#{group}/#{projectName}/plugin.xml", <<-PLUGIN_XML
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+<!--some comment
+-->
+</plugin>
+PLUGIN_XML
+        write "#{group}/#{projectName}/build.properties", <<-BUILD_PROPERTIES
+source.. = src/
+output.. = bin/
+javacDefaultEncoding.. = UTF-8
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               rsc/,
+BUILD_PROPERTIES
+  end
+end
+
+describe Buildr::Generate do
+  include EclipseHelper
+  describe 'it should find a single eclipse project' do
+    top = "top_#{__LINE__}"
+    
+    before do
+      setupExample(top, 'single')
+      File.open(File.join(top, 'buildfile'), 'w') { |file| file.write Generate.from_eclipse(File.join(Dir.pwd, top)).join("\n") }
+    end
+    
+    it 'should create a valid buildfile' do
+      define('first')
+      File.exists?(File.join(top, 'single', '.project')).should be_true
+      File.exists?(File.join(top, '.project')).should be_false
+      File.exists?('.project').should be_false
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain("GROUP = \"#{top}\"")
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+
+    it "should not add project if the corresponding .project file is not an eclipse project" do
+      buildFile = File.join(top, 'buildfile')
+      FileUtils.rm(buildFile)
+      write File.join(top, 'myproject', '.project'), '# Dummy file'
+      File.open(File.join(top, 'buildfile'), 'w') { |file| file.write Generate.from_eclipse(File.join(Dir.pwd, top)).join("\n") }
+      file(buildFile).should exist
+      file(buildFile).should contain('define "single"')
+      file(buildFile).should_not contain('define "myproject"')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+
+      it 'should honour Bundle-Version in MANIFEST.MF' do
+	define('bundle_version')
+	buildFile = File.join(top, 'buildfile')
+	file(buildFile).should exist
+	file(buildFile).should contain('define "single"')
+	file(buildFile).should contain('define "single", :version => "1.1"')
+	lambda { Buildr.application.run }.should_not raise_error
+      end
+
+    it "should pass source in build.properties to layout[:source, :main, :java] and layout[:source, :main, :scala]" do
+      define('layout_source')
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain('define')
+      file(buildFile).should contain('define "single"')
+      file(buildFile).should contain('layout[:source, :main, :java]')
+      file(buildFile).should contain('layout[:source, :main, :scala]')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+    
+    it "should pass output in build.properties to layout[:target, :main], etc" do
+      define('layout_target')
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain('define')
+      file(buildFile).should contain('define "single"')
+      file(buildFile).should contain('layout[:target, :main]')
+      file(buildFile).should contain('layout[:target, :main, :java]')
+      file(buildFile).should contain('layout[:target, :main, :scala]')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+    
+    it "should package an eclipse plugin" do
+      define('layout_target')
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain('define')
+      file(buildFile).should contain('package(:jar)')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+
+  end
+
+  describe 'it should check for a SymbolicName in MANIFEST.MF' do
+    top = "top_#{__LINE__}"
+    before do
+      setupExample(top, 'single', { :symName => 'singleSymbolicName'} )
+      File.open(File.join(top, 'buildfile'), 'w') { |file| file.write Generate.from_eclipse(File.join(Dir.pwd, top)).join("\n") }
+    end
+    it "should set the project name to the SymbolicName from the MANIFEST.MF" do
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain('define "singleSymbolicName"')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+  end
+    
+  describe 'it should accecpt singleton SymbolicName in MANIFEST.MF' do
+    top = "top_#{__LINE__}"
+    before do
+      setupExample(top, 'single', { :symName => 'singleSymbolicName;singleton:=true'})
+      File.open(File.join(top, 'buildfile'), 'w') { |file| file.write Generate.from_eclipse(File.join(Dir.pwd, top)).join("\n") }
+    end
+    
+    it "should not get confused if SymbolicName in MANIFEST.MF is a singleton:=true" do
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain('define "singleSymbolicName"')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+  end
+
+  describe 'it should find an eclipse project deep' do
+    top = "top_#{__LINE__}"
+    before do
+      setupExample(top, 'nested/single')
+      File.open(File.join(top, 'buildfile'), 'w') { |file| file.write Generate.from_eclipse(File.join(Dir.pwd, top)).join("\n") }
+    end
+
+    it 'should create a valid buildfile for a nested project' do
+      setupExample(top, 'single')
+      define('nested/second')
+      File.exists?(File.join(top, 'single', '.project')).should be_true
+      File.exists?(File.join(top, '.project')).should be_false
+      File.exists?('.project').should be_false
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should contain("GROUP = \"#{top}\"")
+      file(buildFile).should contain('define "single"')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+    
+    it "should correct the path for a nested plugin" do
+      define('base_dir')
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain('define "single"')
+      file(buildFile).should contain('define "single", :version => "1.1", :base_dir => "nested/single"')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+
+  end
+
+  describe 'it should detect dependencies between projects' do
+    top = "top_#{__LINE__}"
+    before do
+      setupExample(top, 'first')
+      write(File.join(top, 'first', 'src','org','demo','Demo.java'))
+      write(File.join(top, 'first', 'rsc','aResource.txt'))
+      setupExample(top, 'second', { :requires => 'first'} )
+      write(File.join(top, 'second', 'src','org','second','Demo.java'))
+      setupExample(top, 'aFragment', { :fragment_host => 'second'})
+      write(File.join(top, 'aFragment', 'fragment.xml'))
+      File.open(File.join(top, 'buildfile'), 'w') { |file| file.write Generate.from_eclipse(File.join(Dir.pwd, top)).join("\n") }
+    end
+
+    it 'should add "compile.with dependencies" in MANIFEST.MF' do
+      define('base_dir')
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain('compile.with dependencies')
+      file(buildFile).should contain('resources')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+                                                           #dependencies << projects("first")
+
+    it 'should honour Require-Bundle in MANIFEST.MF' do
+      define('base_dir')
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain(/define "second"/)
+      file(buildFile).should contain(                     /dependencies << projects\("first"\)/)
+      file(buildFile).should contain(/define "second".*do.*dependencies << projects\("first"\).* end/m)
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+    
+    # Fragments are only supported with buildr4osi which is not (yet?) part of buildr
+    it 'should skip fragments.'  do
+      define('base_dir')
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+#      system("cat #{buildFile}")  # if $VERBOSE
+      file(buildFile).should contain('define "first"')
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+
+  end
+
+end

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/bdd_spec.rb

@@ -31,7 +31,7 @@ describe Buildr::RSpec do
     # This test fails on the CI machine if the spec is run as part of a suite but not if run individually
     # This seems to indicate that there is interaction with some other test but until that other test is
     # identified the test has been marked as pending on the ci box
-    pending "Unable to determine why it fails on the CI machine so disabling" if `hostname` == "vesta.apache.org\n"
+    pending "Unable to determine why it fails on the CI machine so disabling" if ENV['JOB_NAME']
     write('src/spec/ruby/success_spec.rb', 'describe("success") { it("is true") { nil.should be_nil } }')
 
     project('foo').test.invoke
@@ -42,7 +42,7 @@ describe Buildr::RSpec do
     # This test fails on the CI machine if the spec is run as part of a suite but not if run individually
     # This seems to indicate that there is interaction with some other test but until that other test is
     # identified the test has been marked as pending on the ci box
-    pending "Unable to determine why it fails on the CI machine so disabling" if `hostname` == "vesta.apache.org\n"
+    pending "Unable to determine why it fails on the CI machine so disabling" if ENV['JOB_NAME']
     success = File.expand_path('src/spec/ruby/success_spec.rb')
     write(success, 'describe("success") { it("is true") { nil.should be_nil } }')
     failure = File.expand_path('src/spec/ruby/failure_spec.rb')

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