buildr 1.3.4-java → 1.3.5-java

data/rakelib/stage.rake

@@ -29,7 +29,7 @@ task :prepare do |task, args|
   lambda do
     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?
+    #fail "Cannot release unless all local changes are in SVN:\n#{svn}" unless svn.empty?
     git = `git status`
     fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^#\t/]
     puts "[X] There are no local changes, everything is in source control"
@@ -40,7 +40,7 @@ task :prepare do |task, args|
     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
+    #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"
   end.call
 
@@ -62,6 +62,13 @@ task :prepare do |task, args|
     puts "[X] We have JRuby, Scala and Groovy"
   end.call
 
+  # Need Prince to generate PDF
+  lambda do
+    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"

data/rakelib/stage.rake~

@@ -0,0 +1,213 @@
+# 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 'digest/md5'
+require 'digest/sha1'
+
+begin # Releases upload Gems to RubyForge.
+  require 'rubyforge'
+rescue LoadError
+  task(:setup) { install_gem 'rubyforge' }
+end
+
+
+task :prepare do |task, args|
+  # Make sure we're doing a release from checked code.
+  lambda do
+    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`
+    fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^#\t/]
+    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 ... "
+    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"
+  end.call
+
+  # Need GPG to sign the packages.
+  lambda do
+    args.gpg or fail "Please run with gpg=<argument for gpg --local-user>"
+    fail "No GPG user #{args.gpg}" if `gpg2 --list-keys #{args.gpg}`.empty?
+  end.call
+
+  task(:license).invoke
+  task(:dependency).invoke
+
+  # Need JRuby, Scala and Groovy installed to run all the specs.
+  lambda do
+    puts "Checking that we have JRuby, Scala and Groovy available ... "
+    sh 'jruby --version'
+    sh 'scala -version'
+    sh 'groovy -version'
+    puts "[X] We have JRuby, Scala and Groovy"
+  end.call
+
+  # Need Prince to generate PDF
+  lambda do
+    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)
+  end.call
+
+  # We will be speccing in one platform, so also spec the other one.
+  task(RUBY_PLATFORM =~ /java/ ? 'spec:ruby' : 'spec:jruby').invoke # Test the *other* platform
+end
+
+
+task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
+  mkpath '_staged'
+
+  # Start by figuring out what has changed.
+  lambda do
+    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]
+    fail "No changeset found for version #{spec.version}" unless current
+    File.open '_staged/CHANGES', 'w' do |file|
+      file.write "#{spec.version} (#{Time.now.strftime('%Y-%m-%d')})\n"
+      file.write current
+    end
+    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
+    mkpath '_staged/dist'
+    FileList['pkg/*.{gem,zip,tgz}'].each do |source|
+      pkg = source.pathmap('_staged/dist/%n%x') 
+      cp source, pkg
+      bytes = File.open(pkg, 'rb') { |file| file.read }
+      File.open(pkg + '.md5', 'w') { |file| file.write Digest::MD5.hexdigest(bytes) << ' ' << File.basename(pkg) }
+      File.open(pkg + '.sha1', 'w') { |file| file.write Digest::SHA1.hexdigest(bytes) << ' ' << File.basename(pkg) }
+      sh 'gpg2', '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
+    end
+    cp 'etc/KEYS', '_staged'
+    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 ... "
+    url = "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
+    rows = FileList['_staged/dist/*.{gem,tgz,zip}'].map { |pkg|
+      name, md5 = File.basename(pkg), Digest::MD5.file(pkg).to_s
+      %{| "#{name}":#{url}/#{name} | "#{md5}":#{url}/#{name}.md5 | "Sig":#{url}/#{name}.asc |}
+    }
+    textile = <<-TEXTILE
+h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
+
+|_. Package |_. MD5 Checksum |_. PGP |
+#{rows.join("\n")}
+
+p>. ("Release signing keys":#{url}/KEYS)
+    TEXTILE
+    file_name = 'doc/download.textile'
+    print "Adding download links to #{file_name} ... "
+    modified = File.read(file_name).sub(/^h2\(#dist\).*$/) { |header| "#{header}\n\n#{textile}" }
+    File.open file_name, 'w' do |file|
+      file.write modified
+    end
+    puts "[X] Updated #{file_name}"
+  end.call
+
+
+  # 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"
+    task(:site).invoke
+    cp_r '_site', '_staged/site'
+    puts "[X] Created new Web site in _staged/site"
+  end.call
+
+
+  # Move everything over to people.apache.org so we can vote on it.
+  lambda do
+    url = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
+    puts "Uploading _staged directory to #{url} ..."
+    sh 'rsync', '--progress', '--recursive', '_staged/', url
+    puts "[X] Uploaded _staged directory to #{url}"
+  end.call
+  
+
+  # Prepare a release vote email. In the distant future this will also send the
+  # email for you and vote on it.
+  lambda do
+    # Need to know who you are on Apache, local user may be different (see .ssh/config).
+    whoami = `ssh people.apache.org whoami`.strip
+    base_url = "http://people.apache.org/~#{whoami}/buildr/#{spec.version}"
+    # Need changes for this release only.
+    changelog = File.read('CHANGELOG').scan(/(^(\d+\.\d+(?:\.\d+)?)\s+\(\d{4}-\d{2}-\d{2}\)\s*((:?^[^\n]+\n)*))/)
+    changes = changelog[0][2]
+    previous_version = changelog[1][1]
+
+    email = <<-EMAIL
+To: dev@buildr.apache.org
+Subject: [VOTE] Buildr #{spec.version} release
+
+We're voting on the source distributions available here:
+#{base_url}/dist/
+
+Specifically:
+#{base_url}/dist/buildr-#{spec.version}.tgz
+#{base_url}/dist/buildr-#{spec.version}.zip
+
+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(/^/, '  ')}
+    EMAIL
+    File.open 'vote-email.txt', 'w' do |file|
+      file.write email
+    end
+    puts "[X] Created release vote email template in 'vote-email.txt'"
+    puts email
+  end.call
+
+end
+
+
+task(:clobber) { rm_rf '_staged' }

data/spec/core/application_spec.rb

@@ -80,6 +80,13 @@ describe Buildr::Application do
       lambda { Buildr.application.send :load_buildfile }.should show(%r{(in .*, spec)})
     end
   end
+  
+  describe 'options' do
+    it "should have 'tasks' as the sole default rakelib" do
+      Buildr.application.send(:handle_options)
+      Buildr.application.options.rakelib.should == ['tasks']
+    end
+  end
 
   describe 'gems' do
     before do
@@ -123,7 +130,6 @@ describe Buildr::Application do
     end
   end
 
-
   describe 'load_gems' do
     before do
       class << Buildr.application
@@ -234,6 +240,83 @@ describe Buildr::Application do
     end
   end
 
+  describe 'load_tasks' do
+    before do
+      class << Buildr.application
+        public :load_tasks
+      end
+      @original_loaded_features = $LOADED_FEATURES.dup
+      Buildr.application.options.rakelib = ["tasks"]
+    end
+    
+    after do
+      $taskfiles = nil
+      ($LOADED_FEATURES - @original_loaded_features).each do |new_load|
+        $LOADED_FEATURES.delete(new_load)
+      end
+    end
+    
+    def write_task(filename)
+      write filename, <<-RUBY
+        $taskfiles ||= []
+        $taskfiles << __FILE__
+      RUBY
+    end
+    
+    def loaded_tasks
+      @loaded ||= Buildr.application.load_tasks
+      $taskfiles
+    end
+    
+    it "should load {options.rakelib}/foo.rake" do
+      write_task 'tasks/foo.rake'
+      loaded_tasks.should have(1).task
+      loaded_tasks.first.should =~ %r{tasks/foo\.rake$}
+    end
+    
+    it 'should load all *.rake files from the rakelib' do
+      write_task 'tasks/bar.rake'
+      write_task 'tasks/quux.rake'
+      loaded_tasks.should have(2).tasks
+    end
+    
+    it 'should not load files which do not have the .rake extension' do
+      write_task 'tasks/foo.rb'
+      write_task 'tasks/bar.rake'
+      loaded_tasks.should have(1).task
+      loaded_tasks.first.should =~ %r{tasks/bar\.rake$}
+    end
+    
+    it 'should load files only from the directory specified in the rakelib option' do
+      Buildr.application.options.rakelib = ['extensions']
+      write_task 'extensions/amp.rake'
+      write_task 'tasks/bar.rake'
+      write_task 'extensions/foo.rake'
+      loaded_tasks.should have(2).tasks
+      %w[amp foo].each do |filename|
+        loaded_tasks.select{|x| x =~ %r{extensions/#{filename}\.rake}}.should have(1).entry
+      end
+    end
+    
+    it 'should load files from all the directories specified in the rakelib option' do
+      Buildr.application.options.rakelib = ['ext', 'more', 'tasks']
+      write_task 'ext/foo.rake'
+      write_task 'tasks/bar.rake'
+      write_task 'tasks/zeb.rake'
+      write_task 'more/baz.rake'
+      loaded_tasks.should have(4).tasks
+    end
+    
+    it 'should not load files from the rakelib more than once' do
+      write_task 'tasks/new_one.rake'
+      write_task 'tasks/already.rake'
+      $LOADED_FEATURES << 'tasks/already.rake'
+      
+      loaded_tasks.should have(1).task
+      loaded_tasks.first.should =~ %r{tasks/new_one\.rake$}
+    end
+  end
+
 end
 
 

data/spec/core/build_spec.rb

@@ -211,7 +211,7 @@ nothing to commit (working directory clean)
       Git.uncommitted_files.should be_empty
     end
 
-    it 'should reject a dirty repository' do
+    it 'should reject a dirty repository, Git 1.4.2 or former' do
       Git.should_receive(:`).with('git status').and_return <<-EOF
 # On branch master
 #
@@ -229,6 +229,24 @@ nothing to commit (working directory clean)
       EOF
       Git.uncommitted_files.should include('lib/buildr.rb', 'error.log')
     end
+
+    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 
+# Changed but not updated:
+#   (use "git add <file>..." to update what will be committed)
+#
+#\tmodified:   lib/buildr.rb
+#\tmodified:   spec/buildr_spec.rb
+#
+# Untracked files:
+#   (use "git add <file>..." to include in what will be committed)
+#
+#\terror.log
+no changes added to commit (use "git add" and/or "git commit -a")
+      EOF
+      Git.uncommitted_files.should include('lib/buildr.rb', 'error.log')
+    end
   end
 
   describe '#remote' do
@@ -327,6 +345,31 @@ describe Svn do
 end # of Buildr::Svn
 
 
+describe Release do
+  describe 'find' do
+    it 'should return GitRelease if project uses Git' do
+      write '.git/config'
+      Release.find.should be_instance_of(GitRelease)
+    end
+
+    it 'should return SvnRelease if project uses SVN' do
+      write '.svn/xml'
+      Release.find.should be_instance_of(SvnRelease)
+    end
+
+    it 'should return nil if no known release process' do
+      Dir.chdir(Dir.tmpdir) do
+        Release.find.should be_nil
+      end
+    end
+
+    after :each do
+      Release.instance_exec { @release = nil }
+    end
+  end
+end
+
+
 describe 'a release process', :shared=>true do
 
   describe '#make' do
@@ -358,6 +401,13 @@ describe 'a release process', :shared=>true do
       file('buildfile').should contain('VERSION_NUMBER = "1.0.1-SNAPSHOT"')
     end
 
+    it 'should keep leading zeros in the next version number' do
+      write 'buildfile', "VERSION_NUMBER = '1.0.001-SNAPSHOT'"
+      @release.stub!(:tag_release)
+      @release.make
+      file('buildfile').should contain('VERSION_NUMBER = "1.0.002-SNAPSHOT"')
+    end
+
     it 'should commit the updated buildfile' do
       @release.stub!(:tag_release)
       @release.make
@@ -484,7 +534,9 @@ describe GitRelease do
 
   describe '#applies_to?' do
     it 'should reject a non-git repo' do
-      GitRelease.applies_to?.should be_false
+      Dir.chdir(Dir.tmpdir) do
+        GitRelease.applies_to?.should be_false
+      end
     end
 
     it 'should accept a git repo' do

data/spec/core/common_spec.rb

@@ -32,7 +32,7 @@ describe Buildr.method(:struct) do
   end
 
   it 'should return members when requested' do
-    @struct.members.sort.should eql(@hash.keys.map(&:to_s).sort)
+    @struct.members.map(&:to_s).sort.should eql(@hash.keys.map(&:to_s).sort)
   end
 
   it 'should return valued when requested' do

data/spec/core/compile_spec.rb

@@ -293,7 +293,8 @@ describe Buildr::CompileTask, '#invoke' do
   end
 
   it 'should run all source files as prerequisites' do
-    file(mkpath('src')).should_receive :invoke_prerequisites
+    mkpath 'src'
+    file('src').should_receive :invoke_prerequisites
     compile_task.from('src').invoke
   end