buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

data/spec/core/build_spec.rb

@@ -169,7 +169,7 @@ describe Project, '#target' do
     @project.layout[:target] = 'baz'
     @project.target.should eql('baz')
   end
-  
+
   it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
     Buildr::VERSION.should < '1.5'
   end
@@ -194,7 +194,7 @@ describe Project, '#reports' do
     @project.layout[:reports] = 'baz'
     @project.reports.should eql('baz')
   end
-  
+
   it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
     Buildr::VERSION.should < '1.5'
   end
@@ -221,7 +221,7 @@ nothing to commit (working directory clean)
 #
 #       modified:   lib/buildr.rb
 #       modified:   spec/buildr_spec.rb
-# 
+#
 # Untracked files:
 #   (use "git add <file>..." to include in what will be committed)
 #
@@ -232,7 +232,7 @@ nothing to commit (working directory clean)
 
     it 'should reject a dirty repository, Git 1.4.3 or higher' do
       Git.should_receive(:`).with('git status').and_return <<-EOF
-# On branch master 
+# On branch master
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
@@ -381,7 +381,7 @@ describe 'a release process', :shared=>true do
       @release.should_receive(:ruby).with('-S', 'buildr', "_#{Buildr::VERSION}_", '--buildfile', File.expand_path('buildfile.next'),
                                           '--environment', 'development', 'clean', 'upload', 'DEBUG=no')
     end
-    
+
     it 'should tag a release with the release version' do
       @release.stub!(:update_version_to_next)
       @release.should_receive(:tag_release).with('1.0.0')
@@ -412,7 +412,7 @@ describe 'a release process', :shared=>true do
       @release.stub!(:tag_release)
       @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.1-SNAPSHOT"')
-    end    
+    end
   end
 
   describe '#resolve_tag' do
@@ -421,15 +421,15 @@ describe 'a release process', :shared=>true do
     end
 
     it 'should return tag specified by tag_name' do
-      @release.tag_name  = 'first'
+      Release.tag_name  = 'first'
       @release.send(:resolve_tag).should == 'first'
     end
-    
+
     it 'should use tag returned by tag_name if tag_name is a proc' do
-      @release.tag_name  = lambda { |version| "buildr-#{version}" }
+      Release.tag_name  = lambda { |version| "buildr-#{version}" }
       @release.send(:resolve_tag).should == 'buildr-1.0.0'
     end
-    after { @release.tag_name = nil }
+    after { Release.tag_name = nil }
   end
 
   describe '#tag_release' do
@@ -501,13 +501,13 @@ describe 'a release process', :shared=>true do
     end
 
     it 'should use the commit message specified by commit_message' do
-      @release.commit_message  = 'Here is my custom message'
+      Release.commit_message  = 'Here is my custom message'
       @release.should_receive(:message).and_return('Here is my custom message')
       @release.update_version_to_next
     end
-    
+
     it 'should use the commit message returned by commit_message if commit_message is a proc' do
-      @release.commit_message  = lambda { |new_version| 
+      Release.commit_message  = lambda { |new_version|
         new_version.should == '1.0.1-SNAPSHOT'
         "increment version number to #{new_version}"
       }
@@ -518,6 +518,7 @@ describe 'a release process', :shared=>true do
     it 'should inform the user of the new version' do
       lambda { @release.update_version_to_next }.should show_info('Current version is now 1.0.1-SNAPSHOT')
     end
+    after { Release.commit_message = nil }
   end
 
 end
@@ -542,7 +543,7 @@ describe GitRelease do
     it 'should accept a git repo' do
       FileUtils.mkdir '.git'
       FileUtils.touch File.join('.git', 'config')
-      GitRelease.applies_to?.should be_true 
+      GitRelease.applies_to?.should be_true
     end
   end
 
@@ -636,7 +637,7 @@ describe SvnRelease do
 
     it 'should accept a git repo' do
       FileUtils.touch '.svn'
-      SvnRelease.applies_to?.should be_true 
+      SvnRelease.applies_to?.should be_true
     end
   end
 

data/spec/core/cc_spec.rb

@@ -0,0 +1,174 @@
+# 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.join(File.dirname(__FILE__), '../spec_helpers')
+
+module CCHelper
+  def setup_cc
+    project = define('foo')
+
+    cc = project.cc
+    project.stub!(:task).with(:cc).and_return(cc)
+
+    compile = mock 'compile'
+    project.stub!(:task).with(:compile).and_return(compile)
+
+    test_compile = mock 'test:compile'
+    project.stub!(:task).with('test:compile').and_return(test_compile)
+
+    filter = mock('resources').tap do |resources|
+      project.stub!(:task).with(:resources).and_return(resources)
+
+      back = mock 'filter'
+      resources.stub!(:filter).and_return(back)
+
+      back
+    end
+
+    sources
+    tests
+    resources
+
+    [ project, compile, test_compile, filter ]
+  end
+
+  def sources
+    @sources ||= ['Test1.java', 'Test2.java'].map { |f| File.join('src/main/java/thepackage', f) }.
+      each { |src| write src, "package thepackage; class #{src.pathmap('%n')} {}" }
+  end
+
+  def tests
+    @tests ||= ['Test1.java', 'Test2.java'].map { |f| File.join('src/test/java/thepackage', f) }.
+      each { |src| write src, "package thepackage; class #{src.pathmap('%n')} {}" }
+  end
+
+  def resources
+    @resources ||= ['Test1.html', 'Test2.html'].map { |f| File.join('src/main/resources', f) }.
+      each { |src| write src, '<html></html>' }
+  end
+end
+
+describe Buildr::CCTask do
+  include CCHelper
+
+  it 'should default to a delay of 0.2' do
+    define('foo').cc.delay.should == 0.2
+  end
+
+  it 'should compile and test:compile on initial start' do
+    project, compile, test_compile, filter = setup_cc
+
+    compile.should_receive :invoke
+    test_compile.should_receive :invoke
+    filter.should_not_receive :run
+
+    thread = Thread.new do
+      project.cc.invoke
+    end
+
+    sleep 0.5
+
+    thread.exit
+  end
+
+  it 'should detect a file change' do |spec|
+    
+    write 'src/main/java/Example.java', "public class Example {}"
+    write 'src/test/java/ExampleTest.java', "public class ExampleTest {}"
+    
+    project = define("foo")
+    cc = project.cc
+    
+    compile = project.compile
+    
+
+    test_compile = project.test.compile
+
+    filter = project.resources
+    
+    # After first period:
+    compile.should_receive :invoke
+    test_compile.should_receive :invoke
+    filter.should_not_receive :run
+    
+    thread = Thread.new do
+      project.cc.invoke
+    end
+    
+    sleep 1
+    
+    compile.should_receive :reenable
+    compile.should_receive :invoke
+
+    test_compile.should_receive :reenable
+    test_compile.should_receive :invoke
+
+    filter.should_not_receive :run
+    
+    sleep 1 # Wait one sec as the timestamp needs to be different.
+    touch File.join(Dir.pwd, 'src/main/java/Example.java')
+    sleep 0.2# Wait one standard delay
+    
+    thread.exit
+  end
+  
+  
+  it 'should support subprojects' do |spec|
+    
+    write 'foo/src/main/java/Example.java', "public class Example {}"
+    write 'foo/src/test/java/ExampleTest.java', "public class ExampleTest {}"
+    
+    define 'container' do
+      define('foo')
+    end
+    
+    project = project("container:foo")
+    cc = project.cc
+    
+    compile = project.compile
+
+    test_compile = project.test.compile
+
+    filter = project.resources
+    
+    
+    # After first period:
+    compile.should_receive :invoke
+    test_compile.should_receive :invoke
+    filter.should_not_receive :run
+    
+    thread = Thread.new do
+      project("container").cc.invoke
+    end
+    
+    sleep 0.5
+    
+    # After we changed the file:
+    compile.should_receive :reenable
+    compile.should_receive :invoke
+
+    test_compile.should_receive :reenable
+    test_compile.should_receive :invoke
+    
+    filter.should_not_receive :run
+    
+    sleep 1 # Wait one sec as the timestamp needs to be different.
+    touch File.join(Dir.pwd, 'foo/src/main/java/Example.java')
+    sleep 0.2 # Wait one standard delay
+    
+    thread.exit
+  end
+end

data/spec/core/checks_spec.rb

@@ -31,7 +31,7 @@ describe Project, 'check task' do
   it "should execute all project's expectations" do
     task 'expectation'
     define 'foo', :version=>'1.0' do
-      check  { task('expectation').invoke } 
+      check  { task('expectation').invoke }
     end
     lambda { project('foo').task('package').invoke }.should run_task('expectation')
   end
@@ -52,7 +52,7 @@ describe Project, 'check task' do
   it "should fail if any expectation failed" do
     define 'foo', :version=>'1.0' do
       check
-      check { fail 'sorry' } 
+      check { fail 'sorry' }
       check
     end
     lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
@@ -342,132 +342,132 @@ end
 
 
 describe Buildr::Checks::Expectation do
-  
+
   shared_examples_for 'all archive types' do
-    
+
     before do
       archive = @archive
       define 'foo', :version=>'1.0' do
         package(archive).include('resources')
       end
     end
-    
+
     def check *args, &block
       project('foo').check *args, &block
     end
-    
+
     def package
       project('foo').package(@archive)
     end
-    
+
     describe '#exist' do
-      
+
       it "should pass if archive path exists" do
         write 'resources/test'
         check(package.path('resources')) { it.should exist }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should fail if archive path does not exist" do
         mkpath 'resources'
         check(package) { it.path('not-resources').should exist }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
       end
-      
+
       it "should pass if archive entry exists" do
         write 'resources/test'
         check(package.entry('resources/test')) { it.should exist }
         check(package.path('resources').entry('test')) { it.should exist }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should fail if archive path does not exist" do
         mkpath 'resources'
         check(package.entry('resources/test')) { it.should exist }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
-      end      
+      end
     end
-    
+
     describe '#be_empty' do
       it "should pass if archive path is empty" do
         mkpath 'resources'
         check(package.path('resources')) { it.should be_empty }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should fail if archive path has any entries" do
         write 'resources/test'
         check(package.path('resources')) { it.should be_empty }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
       end
-      
+
       it "should pass if archive entry has no content" do
         write 'resources/test'
         check(package.entry('resources/test')) { it.should be_empty }
         check(package.path('resources').entry('test')) { it.should be_empty }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should fail if archive entry has content" do
         write 'resources/test', 'something'
         check(package.entry('resources/test')) { it.should be_empty }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
       end
-      
+
       it "should fail if archive entry does not exist" do
         mkpath 'resources'
         check(package.entry('resources/test')) { it.should be_empty }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
       end
     end
-    
+
     describe '#contain(entry)' do
-      
+
       it "should pass if archive entry content matches string" do
         write 'resources/test', 'something'
         check(package.entry('resources/test')) { it.should contain('thing') }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should pass if archive entry content matches pattern" do
         write 'resources/test', "something\nor\another"
         check(package.entry('resources/test')) { it.should contain(/or/) }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should pass if archive entry content matches all arguments" do
         write 'resources/test', "something\nor\nanother"
         check(package.entry('resources/test')) { it.should contain(/or/, /other/) }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should fail unless archive path contains all arguments" do
         write 'resources/test', 'something'
         check(package.entry('resources/test')) { it.should contain(/some/, /other/) }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
       end
-      
+
       it "should fail if archive entry content does not match" do
         write 'resources/test', 'something'
         check(package.entry('resources/test')) { it.should contain(/other/) }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
       end
-      
+
       it "should fail if archive entry does not exist" do
         mkpath 'resources'
         check(package.entry('resources/test')) { it.should contain(/anything/) }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
       end
     end
-    
+
     describe '#contain(path)' do
-      
+
       it "should pass if archive path contains file" do
         write 'resources/test'
         check(package.path('resources')) { it.should contain('test') }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should handle deep nesting" do
         write 'resources/test/test2.efx'
         check(package) { it.should contain('resources/test/test2.efx') }
@@ -475,25 +475,25 @@ describe Buildr::Checks::Expectation do
         check(package.path('resources/test')) { it.should contain('test2.efx') }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should pass if archive path contains pattern" do
         write 'resources/with/test'
         check(package.path('resources')) { it.should contain('**/t*st') }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should pass if archive path contains all arguments" do
         write 'resources/with/test'
         check(package.path('resources')) { it.should contain('**/test', '**/*') }
         lambda { project('foo').task('package').invoke }.should_not raise_error
       end
-      
+
       it "should fail unless archive path contains all arguments" do
         write 'resources/test'
         check(package.path('resources')) { it.should contain('test', 'or-not') }
         lambda { project('foo').task('package').invoke }.should raise_error(RuntimeError, /Checks failed/)
       end
-      
+
       it "should fail if archive path is empty" do
         mkpath 'resources'
         check(package.path('resources')) { it.should contain('test') }
@@ -501,17 +501,17 @@ describe Buildr::Checks::Expectation do
       end
     end
   end
-  
+
   describe 'ZIP' do
     before { @archive = :jar }
     it_should_behave_like 'all archive types'
   end
-  
+
   describe 'tar' do
     before { @archive = :tar }
     it_should_behave_like 'all archive types'
   end
-  
+
   describe 'tgz' do
     before { @archive = :tgz }
     it_should_behave_like 'all archive types'