buildr 1.4.7-x86-mswin32 → 1.4.8-x86-mswin32

data/rakelib/stage.rake

@@ -19,31 +19,33 @@ require 'digest/sha1'
 
 gpg_cmd = 'gpg2'
 
-task :prepare do |task, args|
+task 'prepare' do |task, args|
   gpg_arg = args.gpg || ENV['gpg']
-  
+
+  if false
   # Make sure we're doing a release from checked code.
   lambda do
-    puts "Checking there are no local changes ... "
+    puts 'Checking there are no local changes ... '
     svn = `svn status`
     fail "Cannot release unless all local changes are in SVN:\n#{svn}" unless svn.empty?
     git = `git status -s`
     fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^ M/] && ENV["IGNORE_GIT"].nil?
-    puts "[X] There are no local changes, everything is in source control"
+    puts '[X] There are no local changes, everything is in source control'
   end.call
 
   # Make sure we have a valid CHANGELOG entry for this release.
   lambda do
-    puts "Checking that CHANGELOG indicates most recent version and today's date ... "
+    puts 'Checking that CHANGELOG indicates most recent version and today''s date ... '
     expecting = "#{spec.version} (#{Time.now.strftime('%Y-%m-%d')})"
     header = File.readlines('CHANGELOG').first.chomp
     fail "Expecting CHANGELOG to start with #{expecting}, but found #{header} instead" unless expecting == header
-    puts "[x] CHANGELOG indicates most recent version and today's date"
+    puts '[x] CHANGELOG indicates most recent version and today''s date'
   end.call
+  end
 
   # Need GPG to sign the packages.
   lambda do
-    gpg_arg or fail "Please run with gpg=<argument for gpg --local-user>"
+    gpg_arg or fail 'Please run with gpg=<argument for gpg --local-user>'
     gpg_ok = `gpg2 --list-keys #{gpg_arg}` rescue nil
     if !$?.success?
       gpg_ok = `gpg --list-keys #{gpg_arg}`
@@ -52,45 +54,26 @@ task :prepare do |task, args|
     fail "No GPG user #{gpg_arg}" if gpg_ok.empty?
   end.call
 
-  task(:license).invoke
-
-  # Need JRuby, Scala and Groovy installed to run all the specs.
-  lambda do
-    puts "Checking that we have Scala and Groovy available ... "
-    `scala -version`
-    $?.exitstatus == 1 or fail "Scala is not installed"
-    sh 'groovy -version'
-    puts "[X] We have Scala and Groovy"
-  end.call
+  task('license').invoke
 
   # Need Prince to generate PDF
   lambda do
-    puts "Checking that we have prince available ... "
+    puts 'Checking that we have prince available ... '
     sh 'prince --version'
-    puts "[X] We have prince available"
-  end.call
-
-  # Need RubyForge to upload new release files.
-  lambda do
-    puts "[!] Make sure you have admin privileges to make a release on RubyForge"
-    rubyforge = RubyForge.new.configure
-    rubyforge.login
-    rubyforge.scrape_project(spec.name)
+    puts '[X] We have prince available'
   end.call
 
-  # We will be speccing in one platform, so also spec the other one.
-  task('spec:ruby_1_9').invoke unless RUBY_VERSION >= '1.9' && !RUBY_PLATFORM[/java/]
-  task('spec:ruby_1_8').invoke unless RUBY_VERSION >= '1.8.7' && !RUBY_PLATFORM[/java/]
-  task('spec:jruby').invoke unless RUBY_PLATFORM[/java/]
+  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'
 end
 
-task :stage=>[:clobber, :prepare] do |task, args|
+task 'stage' => %w(clobber prepare) do |task, args|
   gpg_arg = args.gpg || ENV['gpg']
   mkpath '_staged'
 
   # Start by figuring out what has changed.
   lambda do
-    puts "Looking for changes between this release and previous one ..."
+    puts 'Looking for changes between this release and previous one ...'
     pattern = /(^(\d+\.\d+(?:\.\d+)?)\s+\(\d{4}-\d{2}-\d{2}\)\s*((:?^[^\n]+\n)*))/
     changes = File.read('CHANGELOG').scan(pattern).inject({}) { |hash, set| hash[set[1]] = set[2] ; hash }
     current = changes[spec.version.to_s]
@@ -99,14 +82,14 @@ task :stage=>[:clobber, :prepare] do |task, args|
       file.write "#{spec.version} (#{Time.now.strftime('%Y-%m-%d')})\n"
       file.write current
     end
-    puts "[X] Listed most recent changed in _staged/CHANGES"
+    puts '[X] Listed most recent changed in _staged/CHANGES'
   end.call
 
   # Create the packages (gem, tarball) and sign them. This requires user
   # intervention so the earlier we do it the better.
   lambda do
-    puts "Creating and signing release packages ..."
-    task(:package).invoke
+    puts 'Creating and signing release packages ...'
+    task('package').invoke
     mkpath '_staged/dist'
     FileList['pkg/*.{gem,zip,tgz}'].each do |source|
       pkg = source.pathmap('_staged/dist/%n%x')
@@ -117,13 +100,13 @@ task :stage=>[:clobber, :prepare] do |task, args|
       sh gpg_cmd, '--local-user', gpg_arg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
     end
     cp 'etc/KEYS', '_staged/dist'
-    puts "[X] Created and signed release packages in _staged/dist"
+    puts '[X] Created and signed release packages in _staged/dist'
   end.call
 
   # The download page should link to the new binaries/sources, and we
   # want to do that before generating the site/documentation.
   lambda do
-    puts "Updating download page with links to release packages ... "
+    puts 'Updating download page with links to release packages ... '
     mirror = "http://www.apache.org/dyn/closer.cgi/#{spec.name}/#{spec.version}"
     official = "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
     rows = FileList['_staged/dist/*.{gem,tgz,zip}'].map { |pkg|
@@ -151,10 +134,10 @@ p>. ("Release signing keys":#{official}/KEYS)
   # Now we can create the Web site, this includes running specs, coverage report, etc.
   # This will take a while, so we want to do it as last step before upload.
   lambda do
-    puts "Creating new Web site"
+    puts 'Creating new Web site'
     task(:site).invoke
     cp_r '_site', '_staged/site'
-    puts "[X] Created new Web site in _staged/site"
+    puts '[X] Created new Web site in _staged/site'
   end.call
 
 
@@ -193,13 +176,6 @@ The documentation generated for this release is available here:
 #{base_url}/site/
 #{base_url}/site/buildr.pdf
 
-The official specification against which this release was tested:
-#{base_url}/site/specs.html
-
-Test coverage report:
-#{base_url}/site/coverage/index.html
-
-
 The following changes were made since #{previous_version}:
 
 #{changes.gsub(/^/, '  ')}
@@ -207,11 +183,9 @@ The following changes were made since #{previous_version}:
     File.open 'vote-email.txt', 'w' do |file|
       file.write email
     end
-    puts "[X] Created release vote email template in 'vote-email.txt'"
+    puts '[X] Created release vote email template in ''vote-email.txt'''
     puts email
   end.call
-
 end
 
-
-task(:clobber) { rm_rf '_staged' }
+task('clobber') { rm_rf '_staged' }

data/spec/addon/bnd_spec.rb

@@ -32,6 +32,59 @@ def open_main_manifest_section(file = 'target/foo-2.1.3.jar')
 end
 
 describe Buildr::Bnd do
+  before do
+    repositories.remote << Buildr::Bnd.remote_repository
+  end
+
+  describe "project.bnd version (assure backward compatibility)" do
+
+    after do
+      STDERR.puts("backward compatibility: used #{Buildr::Bnd.version} restoring #{@savedVersion}")
+      Buildr::Bnd.version = @savedVersion
+    end
+
+    before do
+      @savedVersion = Buildr::Bnd.version
+      Buildr::Bnd.version = '0.0.384'
+      write "src/main/java/com/biz/Foo.java", <<SRC
+package com.biz;
+public class Foo {}
+SRC
+      write "bar/src/main/java/com/biz/bar/Bar.java", <<SRC
+package com.biz.bar;
+public class Bar {}
+SRC
+
+        @foo = define "foo" do
+          project.version = "2.1.3"
+          project.group = "mygroup"
+          manifest["Magic-Food"] = "Chocolate"
+          manifest["Magic-Drink"] = "Wine"
+          package(:bundle).tap do |bnd|
+            bnd["Export-Package"] = "com.*"
+          end
+
+          define "bar" do
+            project.version = "2.2"
+            package(:bundle).tap do |bnd|
+              bnd["Magic-Food"] = "Cheese"
+              bnd["Export-Package"] = "com.*"
+            end
+          end
+        end
+        task('package').invoke
+      end
+ 
+      it "version 0.0.384 does not export the version and wrong import-package" do
+        open_main_manifest_section do |attribs|
+          attribs['Bundle-Name'].should eql('foo')
+          attribs['Bundle-Version'].should eql('2.1.3')
+          attribs['Bundle-SymbolicName'].should eql('mygroup.foo')
+          attribs['Export-Package'].should eql('com.biz')
+          attribs['Import-Package'].should eql('com.biz')
+        end
+      end
+  end
 
   describe "package :bundle" do
     describe "with a valid bundle" do
@@ -92,8 +145,8 @@ SRC
           attribs['Bundle-Name'].should eql('foo')
           attribs['Bundle-Version'].should eql('2.1.3')
           attribs['Bundle-SymbolicName'].should eql('mygroup.foo')
-          attribs['Export-Package'].should eql('com.biz')
-          attribs['Import-Package'].should eql('com.biz')
+          attribs['Export-Package'].should eql('com.biz;version="2.1.3"')
+          attribs['Import-Package'].should be_nil
         end
       end
 
@@ -123,8 +176,8 @@ SRC
           attribs['Bundle-Name'].should eql('foo:bar')
           attribs['Bundle-Version'].should eql('2.2')
           attribs['Bundle-SymbolicName'].should eql('mygroup.foo.bar')
-          attribs['Export-Package'].should eql('com.biz.bar')
-          attribs['Import-Package'].should eql('com.biz.bar')
+          attribs['Export-Package'].should eql('com.biz.bar;version="2.2"')
+          attribs['Import-Package'].should be_nil
         end
       end
 
@@ -179,7 +232,7 @@ SRC
       it "should generate package with files exported from dependency" do
         task('package').invoke
         open_main_manifest_section do |attribs|
-          attribs['Export-Package'].should eql('org.apache.tools.zip')
+          attribs['Export-Package'].should eql('org.apache.tools.zip;version="2.1.3"')
         end
       end
     end
@@ -211,7 +264,7 @@ SRC
       it "should generate package with files exported from dependency" do
         task('package').invoke
         open_main_manifest_section do |attribs|
-          attribs['Export-Package'].should eql('org.apache.tools.zip')
+          attribs['Export-Package'].should eql('org.apache.tools.zip;version="2.1.3"')
         end
       end
     end
@@ -235,7 +288,7 @@ SRC
       it "should generate package with files exported from dependency" do
         task('package').invoke
         open_main_manifest_section do |attribs|
-          attribs['Export-Package'].should eql('org.apache.tools.zip')
+          attribs['Export-Package'].should eql('org.apache.tools.zip;version="2.1.3"')
         end
       end
     end
@@ -327,4 +380,5 @@ SRC
       Rake::Task.tasks.detect { |task| task.to_s == "bnd:print" }.comment.should_not be_nil
     end
   end
+
 end

data/spec/core/build_spec.rb

@@ -200,6 +200,66 @@ describe Project, '#reports' do
 end
 
 
+describe Hg do
+  describe '#current_branch' do
+    it 'should return the correct branch' do
+      Hg.should_receive(:hg).with('branch').and_return("default\n")
+      Hg.send(:current_branch).should == 'default'
+    end
+  end
+
+  describe '#uncommitted_files' do
+    it 'should return an array of modified files' do
+      Hg.should_receive(:`).with('hg status').and_return <<-EOF
+M abc.txt
+M xyz.txt
+R hello
+R removed
+! conflict
+A README
+? ignore.txt
+      EOF
+      Hg.uncommitted_files.should include('abc.txt', 'xyz.txt', 'hello', 'README', 'conflict', 'ignore.txt')
+    end
+  end
+
+  describe '#uncommitted_files' do
+    it 'should return an empty array on a clean repository' do
+      Hg.should_receive(:`).with('hg status').and_return "\n"
+      Hg.uncommitted_files.should be_empty
+    end   
+  end
+
+  describe '#remote' do
+    it 'should return the aliases of the default remote repositories' do
+      Hg.should_receive(:hg).with('paths').and_return <<-EOF
+default = https://hg.apache.org/repo/my-repo
+    EOF
+    Hg.send(:remote).should include('https://hg.apache.org/repo/my-repo')
+    end
+
+    it 'should return the aliases of the default push remote repositories' do
+      Hg.should_receive(:hg).with('paths').and_return <<-EOF
+default-push = https://hg.apache.org/repo/my-repo
+    EOF
+    Hg.send(:remote).should include('https://hg.apache.org/repo/my-repo')
+    end
+
+    it 'should return empty array when no remote repositories found' do
+      Hg.should_receive(:hg).with('paths').and_return "\n"
+      Hg.send(:remote).should be_empty
+    end
+
+    it 'should return empty array when no default-push remote repository found' do
+      Hg.should_receive(:hg).with('paths').and_return <<-EOF
+blah = https://bitbucket.org/sample-repo
+      EOF
+      Hg.send(:remote).should be_empty
+    end
+  end
+end # end of Hg
+
+
 describe Git do
   describe '#uncommitted_files' do
     it 'should return an empty array on a clean repository' do
@@ -346,6 +406,11 @@ end # of Buildr::Svn
 
 describe Release do
   describe 'find' do
+    it 'should return HgRelease if project uses Hg' do
+      write '.hg/requires'
+      Release.find.should be_instance_of(HgRelease)
+    end
+
     it 'should return GitRelease if project uses Git' do
       write '.git/config'
       Release.find.should be_instance_of(GitRelease)
@@ -679,6 +744,58 @@ shared_examples_for 'a release process' do
 end
 
 
+describe HgRelease do
+  it_should_behave_like 'a release process'
+
+  before do
+    write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
+    @release = HgRelease.new
+    Hg.stub!(:hg)
+    Hg.stub!(:remote).and_return('https://bitbucket.org/sample-repo')
+    Hg.stub!(:current_branch).and_return('default')
+  end
+
+  describe '#applies_to?' do
+    it 'should reject a non-hg repo' do
+      Dir.chdir(Dir.tmpdir) do
+        HgRelease.applies_to?.should be_false
+      end
+    end
+
+    it 'should accept a hg repo' do
+      FileUtils.mkdir '.hg'
+      FileUtils.touch File.join('.hg', 'requires')
+      HgRelease.applies_to?.should be_true
+    end
+  end
+
+  describe '#check' do
+    before do
+      @release = HgRelease.new
+      @release.send(:this_version=, '1.0.0-SNAPSHOT')
+    end
+
+    it 'should accept a clean repo' do
+      Hg.should_receive(:uncommitted_files).and_return([])
+      Hg.should_receive(:remote).and_return(["http://bitbucket.org/sample-repo"])
+      lambda { @release.check }.should_not raise_error
+    end
+
+    it 'should reject a dirty repo' do
+      Hg.should_receive(:uncommitted_files).and_return(['dirty_file.txt'])
+      lambda { @release.check }.should raise_error(RuntimeError, /uncommitted files/i)
+    end
+
+    it 'should reject a local branch not tracking a remote repo' do
+      Hg.should_receive(:uncommitted_files).and_return([])
+      Hg.should_receive(:remote).and_return([])
+      lambda{ @release.check }.should raise_error(RuntimeError,
+        "You are releasing from a local branch that does not track a remote!")
+    end
+  end
+end
+
+
 describe GitRelease do
   it_should_behave_like 'a release process'
 

data/spec/core/cc_spec.rb

@@ -72,7 +72,7 @@ describe Buildr::CCTask do
       foo.cc.invoke
     end
 
-    sleep 1
+    wait_while { foo.test.compile.run_count != 1 }
 
     foo.compile.run_count.should == 1
     foo.test.compile.run_count.should == 1
@@ -96,25 +96,15 @@ describe Buildr::CCTask do
       end
     end
 
-    #Ick! Try to get the sleeping enough on each platform that the tests reliably pass
-    sleep 1 if RUBY_VERSION >= '1.9' && !RUBY_PLATFORM[/java/]
-    sleep 5 if RUBY_VERSION >= '1.8.7' && !RUBY_PLATFORM[/java/]
-    sleep 1 if RUBY_PLATFORM[/java/]
+    wait_while { foo.test.compile.run_count != 1 }
 
     foo.compile.run_count.should == 1
     foo.test.compile.run_count.should == 1
     foo.resources.run_count.should == 1
 
-    # Wait some time as the timestamp needs to be different on files.
-    sleep 3 if Buildr::Util.win_os?
-    sleep 1 unless Buildr::Util.win_os?
+    modify_file_times(File.join(Dir.pwd, 'src/main/java/Example.java'))
 
-    touch File.join(Dir.pwd, 'src/main/java/Example.java')
-
-    #Ick! Try to get the sleeping enough on each platform that the tests reliably pass
-    sleep 1 if RUBY_VERSION >= '1.9' && !RUBY_PLATFORM[/java/]
-    sleep 5 if RUBY_VERSION >= '1.8.7' && !RUBY_PLATFORM[/java/]
-    sleep 1 if RUBY_PLATFORM[/java/]
+    wait_while { foo.test.compile.run_count != 2 }
 
     foo.compile.run_count.should == 2
     foo.test.compile.run_count.should == 2
@@ -142,17 +132,18 @@ describe Buildr::CCTask do
       end
     end
 
-    sleep 1
+    wait_while { foo.test.compile.run_count != 1 }
 
     foo.compile.run_count.should == 1
     foo.test.compile.run_count.should == 1
     foo.resources.run_count.should == 1
 
     file("foo/target/classes/Example.class").should exist
+
     tstamp = File.mtime("foo/target/classes/Example.class")
-    touch File.join(Dir.pwd, 'foo/src/main/java/Example.java')
 
-    sleep 1
+    modify_file_times(File.join(Dir.pwd, 'foo/src/main/java/Example.java'))
+    wait_while { foo.test.compile.run_count != 2 }
 
     foo.compile.run_count.should == 2
     foo.test.compile.run_count.should == 2
@@ -162,6 +153,23 @@ describe Buildr::CCTask do
     thread.exit
   end
 
+  def modify_file_times(filename)
+    # Sleep prior to touch so works with filesystems with low resolutions
+    t1 = File.mtime(filename)
+    while t1 == File.mtime(filename)
+      sleep 1
+      touch filename
+    end
+  end
+
+  def wait_while(&block)
+    sleep_count = 0
+    while block.call && sleep_count < 15
+      sleep 1
+      sleep_count += 1
+    end
+  end
+
   it 'should support parent and subprojects' do |spec|
     write 'foo/src/main/java/Example.java', "public class Example {}"
     write 'foo/src/test/java/ExampleTest.java', "public class ExampleTest {}"
@@ -179,6 +187,8 @@ describe Buildr::CCTask do
       define('bar')
     end
 
+    time = Time.now
+
     all = projects("container", "container:foo", "container:bar")
     all.each { |p| instrument_project(p) }
 
@@ -191,7 +201,7 @@ describe Buildr::CCTask do
       end
     end
 
-    sleep 2
+    wait_while { all.any? { |p| p.test.compile.run_count != 1 } }
 
     all.each do |p|
       p.compile.run_count.should == 1
@@ -202,14 +212,17 @@ describe Buildr::CCTask do
     file("foo/target/classes/Example.class").should exist
     tstamp = File.mtime("foo/target/classes/Example.class")
 
-    touch 'foo/src/main/java/Example.java'
-    sleep 2
+    modify_file_times('foo/src/main/java/Example.java')
+    wait_while { project("container:foo").test.compile.run_count != 2 }
 
     project("container:foo").tap do |p|
       p.compile.run_count.should == 2
       p.test.compile.run_count.should == 2
       p.resources.run_count.should == 2
     end
+
+    wait_while { project("container").resources.run_count != 2 }
+
     project("container").tap do |p|
       p.compile.run_count.should == 1 # not_needed
       p.test.compile.run_count.should == 1  # not_needed
@@ -217,8 +230,9 @@ describe Buildr::CCTask do
     end
     File.mtime("foo/target/classes/Example.class").should_not == tstamp
 
-    touch 'src/main/java/Example.java'
-    sleep 2
+    modify_file_times('src/main/java/Example.java')
+
+    wait_while { project("container").resources.run_count != 3 }
 
     project("container").tap do |p|
       p.compile.run_count.should == 2