buildr 1.4.7 → 1.4.8

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

@@ -204,7 +204,8 @@ shared_examples_for 'package with manifest' do
     package.invoke
     Zip::ZipFile.open(package.to_s) do |zip|
       permissions = format("%o", zip.file.stat('META-INF/MANIFEST.MF').mode)
-      permissions.should match /644$/
+      expected_mode = Buildr::Util.win_os? ? /666$/ : /644$/
+      permissions.should match expected_mode
     end
   end
 

data/spec/packaging/archive_spec.rb

@@ -411,6 +411,23 @@ describe TarTask do
     yield entries if block_given?
     entries
   end
+
+  # chmod is not reliable on Windows
+  unless Buildr::Util.win_os?
+    it 'should preserve file permissions' do
+      # with JRuby it's important to use absolute paths with File.chmod()
+      # http://jira.codehaus.org/browse/JRUBY-3300
+      hello = File.expand_path('src/main/bin/hello')
+      write hello, 'echo hi'
+      File.chmod(0777,  hello)
+      fail("Failed to set permission on #{hello}") unless (File.stat(hello).mode & 0777) == 0777
+
+      tar('foo.tgz').include('src/main/bin/*').invoke
+      unzip('target' => 'foo.tgz').extract
+      (File.stat('target/hello').mode & 0777).should == 0777
+    end
+  end
+
 end
 
 
@@ -473,8 +490,14 @@ describe "ZipTask" do
     entries = {}
     Zip::ZipFile.open @archive do |zip|
       zip.entries.each do |entry|
-        # Ignore the / directory created for empty ZIPs when using java.util.zip.
-        entries[entry.name.to_s] = zip.read(entry.name) unless entry.name.to_s == '/'
+        if entry.directory?
+          # Ignore the / directory created for empty ZIPs when using java.util.zip.
+          if entry.name.to_s != '/'
+            entries[entry.name.to_s] = nil
+          end
+        else
+          entries[entry.name.to_s] = zip.read(entry.name)
+        end
       end
     end
     yield entries if block_given?

data/spec/packaging/artifact_spec.rb

@@ -1115,11 +1115,11 @@ XML
   end
 
   it 'should bring artifact and its dependencies' do
-    transitive(@complex).should eql(artifacts(@complex, @simple))
+    transitive(@complex).should eql(artifacts(@complex, @simple - [@provided]))
   end
 
   it 'should bring dependencies of POM without artifact itself' do
-    transitive(@complex.sub(/jar/, 'pom')).should eql(artifacts(@simple))
+    transitive(@complex.sub(/jar/, 'pom')).should eql(artifacts(@simple - [@provided]))
   end
 
   it 'should bring artifact and transitive depenencies' do

data/spec/sandbox.rb

@@ -19,11 +19,12 @@
 # repository and cache these across test cases.
 Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 repositories.remote << 'http://repo1.maven.org/maven2'
-repositories.remote << 'http://scala-tools.org/repo-releases'
+repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
+
 
 # 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"
+  SCALA_VERSION_FOR_SPECS = ENV["SCALA_VERSION"] || "2.9.2"
 end
 Buildr.settings.build['scala.version'] = Buildr::Scala::SCALA_VERSION_FOR_SPECS
 

data/spec/scala/compiler_spec.rb

@@ -319,3 +319,44 @@ describe 'scala compiler 2.9 options' do
 
 end if Buildr::Scala.version?(2.9)
 
+if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
+
+describe 'zinc compiler (enabled through Buildr.settings)' do
+  before :each do
+    Buildr.settings.build['scalac.incremental'] = true
+  end
+
+  it 'should compile with zinc' do
+    write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
+    project = define('foo')
+    compile_task = project.compile.using(:scalac)
+    compiler = compile_task.instance_eval { @compiler }
+    compiler.send(:zinc?).should eql(true)
+    compiler.should_receive(:compile_with_zinc).once
+    compile_task.invoke
+  end
+
+  after :each do
+    Buildr.settings.build['scalac.incremental'] = nil
+  end
+
+  it_should_behave_like ScalacCompiler
+end
+
+describe 'zinc compiler (enabled through project.scala_options)' do
+
+  it 'should compile with zinc' do
+    write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
+    project = define('foo')
+    project.scalac_options.incremental = true
+    compile_task = project.compile.using(:scalac)
+    compiler = compile_task.instance_eval { @compiler }
+    compiler.send(:zinc?).should eql(true)
+    compiler.should_receive(:compile_with_zinc).once
+    compile_task.invoke
+  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