buildr 1.4.1-x86-mswin32 → 1.4.2-x86-mswin32

data/spec/core/cc_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 module CCHelper
   def setup_cc

data/spec/core/checks_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe Project, 'check task' do

data/spec/core/common_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe Buildr.method(:struct) do
   before do
@@ -539,6 +539,15 @@ describe Buildr::Filter do
       (File.stat(file).mode & 0o200).should == 0o200
     end
   end
+
+  it 'should preserve mode bits except readable' do
+    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|
+      (File.stat(file).mode & 0o755).should == 0o755
+    end
+  end
 end
 
 describe Filter::Mapper do

data/spec/core/compile_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 module CompilerHelper

data/spec/core/extension_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe Extension do

data/spec/core/generate_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe Buildr::Generate do

data/spec/core/project_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe Project do

data/spec/core/test_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 module TestHelper
@@ -758,25 +758,25 @@ describe Rake::Task, 'test' do
     options.test = :all
     lambda { task('test').invoke rescue nil }.should run_tasks('foo:test', 'bar:test')
   end
-  
+
   it 'should ignore failure in subprojects if options.test is :all' do
     define('foo') {
-      define('p1') { test { fail } } 
-      define('p2') { test {  } } 
-      define('p3') { test { fail } } 
+      define('p1') { test { fail } }
+      define('p2') { test {  } }
+      define('p3') { test { fail } }
     }
-    define('bar') { test { fail } } 
+    define('bar') { test { fail } }
     options.test = :all
     lambda { task('test').invoke rescue nil }.should run_tasks('foo:p1:test', 'foo:p2:test', 'foo:p3:test', 'bar:test')
   end
-  
+
   it 'should ignore failure in subprojects if environment variable test is \'all\'' do
     define('foo') {
-      define('p1') { test { fail } } 
-      define('p2') { test {  } } 
-      define('p3') { test { fail } } 
+      define('p1') { test { fail } }
+      define('p2') { test {  } }
+      define('p3') { test { fail } }
     }
-    define('bar') { test { fail } } 
+    define('bar') { test { fail } }
     ENV['test'] = 'all'
     lambda { task('test').invoke rescue nil }.should run_tasks('foo:p1:test', 'foo:p2:test', 'foo:p3:test', 'bar:test')
   end
@@ -904,6 +904,80 @@ describe 'test rule' do
     project('foo').test.tests.should include('something')
   end
 
+  it 'should not execute excluded tests' do
+    define 'foo' do
+      test.using(:junit)
+      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+    end
+    task('test:*,-nothing').invoke
+    project('foo').test.tests.should include('something')
+    project('foo').test.tests.should_not include('nothing')
+  end
+
+  it 'should not execute tests in excluded package' do
+    write 'src/test/java/com/example/foo/TestSomething.java',
+      'package com.example.foo; public class TestSomething extends junit.framework.TestCase { public void testNothing() {} }'
+    write 'src/test/java/com/example/bar/TestFails.java',
+      'package com.example.bar; public class TestFails extends junit.framework.TestCase { public void testFailure() { fail(); } }'
+    define 'foo' do
+      test.using(:junit)
+    end
+    task('test:-com.example.bar').invoke
+    project('foo').test.tests.should include('com.example.foo.TestSomething')
+    project('foo').test.tests.should_not include('com.example.bar.TestFails')
+  end
+
+  it 'should not execute excluded tests with wildcards' do
+    define 'foo' do
+      test.using(:junit)
+      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+    end
+    task('test:something,-s*,-n*').invoke
+    project('foo').test.tests.should_not include('something')
+    project('foo').test.tests.should_not include('nothing')
+  end
+
+  it 'should execute all tests except excluded tests' do
+    define 'foo' do
+      test.using(:junit)
+      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'anything', 'nothing']) }
+    end
+    task('test:-nothing').invoke
+    project('foo').test.tests.should include('something', 'anything')
+    project('foo').test.tests.should_not include('nothing')
+  end
+
+  it 'should ignore exclusions in buildfile' do
+    define 'foo' do
+      test.using(:junit)
+      test.exclude 'something'
+      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'anything', 'nothing']) }
+    end
+    task('test:-nothing').invoke
+    project('foo').test.tests.should include('something', 'anything')
+    project('foo').test.tests.should_not include('nothing')
+  end
+
+  it 'should ignore inclusions in buildfile' do
+    define 'foo' do
+      test.using(:junit)
+      test.include 'something'
+      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+    end
+    task('test:nothing').invoke
+    project('foo').test.tests.should include('nothing')
+    project('foo').test.tests.should_not include('something')
+  end
+
+  it 'should not execute a test if it''s both included and excluded' do
+    define 'foo' do
+      test.using(:junit)
+      test.instance_eval { @framework.stub!(:tests).and_return(['nothing']) }
+    end
+    task('test:nothing,-nothing').invoke
+    project('foo').test.tests.should_not include('nothing')
+  end
+
   it 'should not update the last successful test run timestamp' do
     define 'foo' do
       test.using(:junit)
@@ -946,6 +1020,45 @@ describe 'test failed' do
     project('foo').test.tests.should_not include('PassingTest')
   end
 
+  it 'should run failed tests, respecting excluded tests' do
+    define 'foo' do
+      test.using(:junit).exclude('ExcludedTest')
+      test.instance_eval do
+        @framework.stub!(:tests).and_return(['FailingTest', 'PassingTest', 'ExcludedTest'])
+        @framework.stub!(:run).and_return(['PassingTest'])
+      end
+    end
+    write project('foo').path_to(:target, "junit-failed"), "FailingTest\nExcludedTest"
+    task('test:failed').invoke rescue nil
+    project('foo').test.tests.should include('FailingTest')
+    project('foo').test.tests.should_not include('ExcludedTest')
+  end
+
+  it 'should run only the tests that failed the last time, even when failed tests have dependencies' do
+    define 'parent' do
+      define 'foo' do
+        test.using(:junit)
+        test.instance_eval do
+          @framework.stub!(:tests).and_return(['PassingTest'])
+          @framework.stub!(:run).and_return(['PassingTest'])
+        end
+      end
+      define 'bar' do
+        test.using(:junit)
+        test.enhance ["parent:foo:test"]
+        test.instance_eval do
+          @framework.stub!(:tests).and_return(['FailingTest', 'PassingTest'])
+          @framework.stub!(:run).and_return(['PassingTest'])
+        end
+      end
+    end
+    write project('parent:bar').path_to(:target, "junit-failed"), "FailingTest"
+    task('test:failed').invoke rescue nil
+    project('parent:foo').test.tests.should_not include('PassingTest')
+    project('parent:bar').test.tests.should include('FailingTest')
+    project('parent:bar').test.tests.should_not include('PassingTest')
+  end
+
 end
 
 

data/spec/core/transport_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe URI, '#download' do
@@ -63,6 +63,13 @@ describe URI, '#upload' do
     @uri = URI(URI.escape("file://#{File.expand_path(@target)}"))
   end
 
+  it 'should preserve file permissions if uploading to a file' do
+    File.chmod(0666, @source)
+    s = File.stat(@source).mode
+    @uri.upload @source
+    File.stat(@target).mode.should eql(s)
+  end
+
   it 'should upload file if found' do
     @uri.upload @source
     file(@target).should contain(@content)
@@ -452,14 +459,14 @@ describe URI::SFTP, '#read' do
 
   it 'should read contents of file and return it' do
     file = mock('Net::SFTP::Operations::File')
-    file.should_receive(:read).with(URI::RW_CHUNK_SIZE).once.and_return(@content, nil)
+    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.should_receive(:read).with(URI::RW_CHUNK_SIZE).once.and_return(@content, nil)
+    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 = ''
     @uri.read do |chunk|

data/spec/core/util_spec.rb

@@ -14,7 +14,23 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+
+describe Buildr do
+  describe "#replace_extension" do
+    it "should replace filename extensions" do
+      replace = lambda { |filename, ext| Util.replace_extension(filename, ext) }
+
+      replace["foo.zip", "txt"].should eql("foo.txt")
+      replace["foo.", "txt"].should eql("foo.txt")
+      replace["foo", "txt"].should eql("foo.txt")
+
+      replace["bar/foo.zip", "txt"].should eql("bar/foo.txt")
+      replace["bar/foo.", "txt"].should eql("bar/foo.txt")
+      replace["bar/foo", "txt"].should eql("bar/foo.txt")
+    end
+  end
+end
 
 describe Hash do
   describe "#only" do
@@ -68,7 +84,7 @@ end
 
 describe File do
   # Quite a few of the other specs depend on File#utime working correctly.
-  # These specs validate that utime is working as expected. 
+  # These specs validate that utime is working as expected.
   describe "#utime" do
     it "should update mtime of directories" do
       mkpath 'tmp'

data/spec/groovy/bdd_spec.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe Buildr::Groovy::EasyB do

data/spec/groovy/compiler_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe 'groovyc compiler' do
 
@@ -184,8 +184,8 @@ describe 'groovyc compiler options' do
     groovyc.options.verbose.should be_false
   end
 
-  it 'should set verbose option when running with --trace option' do
-    trace true
+  it 'should set verbose option when running with --trace=groovyc option' do
+    Buildr.application.options.trace_categories = [:groovyc]
     groovyc.options.verbose.should be_true
   end
 

data/spec/ide/eclipse_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 JAVA_CONTAINER   = Buildr::Eclipse::Java::CONTAINER
@@ -61,6 +61,13 @@ module EclipseHelper
     end
   end
 
+  # <classpathentry path="PATH" javadocpath="RETURNED_VALUE" kind="var"/>
+  def javadocpath_for_path(path)
+    classpath_xml_elements.collect("classpathentry[@kind='var',@path='#{path}']") do |n|
+      n.attributes['javadocpath'] || 'no javadoc artifact'
+    end
+  end
+
   def project_xml_elements
     task('eclipse').invoke
     File.open('.project') { |f| REXML::Document.new(f).root.elements }
@@ -110,6 +117,15 @@ describe Buildr::Eclipse do
         end
       end
 
+      it 'should use eclipse project name if specified' do
+        define('foo') { eclipse.name = 'bar' }
+        task('eclipse').invoke
+        File.open('.project') do |f|
+          REXML::Document.new(f).root.
+            elements.collect("name") { |e| e.text }.should == ['bar']
+        end
+      end
+
       it 'should not generate a .classpath file' do
         define('foo')
         task('eclipse').invoke
@@ -165,6 +181,32 @@ describe Buildr::Eclipse do
         end
       end
 
+      it 'should use eclipse name for child project if set' do
+        mkdir 'foo'
+        define('myproject') {
+          project.version = '1.0'
+          define('foo') { eclipse.name = 'bar'; compile.using(:javac); package :jar }
+        }
+        task('eclipse').invoke
+        File.open(File.join('foo', '.project')) do |f|
+          REXML::Document.new(f).root.
+            elements.collect("name") { |e| e.text }.should == ['bar']
+        end
+      end
+
+      it 'should use short name for child project if eclipse.options.short_names = true' do
+        mkdir 'foo'
+        define('myproject') {
+          project.version = '1.0'
+          eclipse.options.short_names = true
+          define('foo') { compile.using(:javac); package :jar }
+        }
+        task('eclipse').invoke
+        File.open(File.join('foo', '.project')) do |f|
+          REXML::Document.new(f).root.
+            elements.collect("name") { |e| e.text }.should == ['foo']
+        end
+      end
     end
 
     describe 'scala project' do
@@ -465,6 +507,21 @@ MANIFEST
             elements.collect("classpathentry[@kind='src']") { |n| n.attributes['path'] }.should include('/myproject-foo')
         end
       end
+
+      it 'should use eclipse name in its classpath if set' do
+        mkdir 'foo'
+        mkdir 'bar'
+        define('myproject') {
+          project.version = '1.0'
+          define('foo') { eclipse.name = 'eclipsefoo'; package :jar }
+          define('bar') { eclipse.name = 'eclipsebar'; compile.using(:javac).with project('foo'); }
+        }
+        task('eclipse').invoke
+        File.open(File.join('bar', '.classpath')) do |f|
+          REXML::Document.new(f).root.
+            elements.collect("classpathentry[@kind='src']") { |n| n.attributes['path'] }.should include('/eclipsefoo')
+        end
+      end
     end
   end
 
@@ -528,6 +585,11 @@ MANIFEST
       sourcepath_for_path('M2_REPO/com/example/library/2.0/library-2.0.jar').
         should == ['M2_REPO/com/example/library/2.0/library-2.0-sources.jar']
     end
+
+    it 'should have a javadoc artifact reference in the .classpath file' do
+      javadocpath_for_path('M2_REPO/com/example/library/2.0/library-2.0.jar').
+        should == ['M2_REPO/com/example/library/2.0/library-2.0-javadoc.jar']
+    end
   end
 
   describe 'maven2 repository variable' do