buildr 1.3.5 → 1.4.0

data/rakelib/doc.rake

@@ -71,6 +71,13 @@ task :site=>['_site', :rdoc, '_reports/specs.html', '_reports/coverage', 'buildr
   cp_r '_reports/coverage', '_site'
   fail 'No coverage report in site directory' unless File.exist?('_site/coverage/index.html')
   cp 'CHANGELOG', '_site'
+  open("_site/.htaccess", "w") do |htaccess|
+    htaccess << %Q{
+<FilesMatch "CHANGELOG">
+ForceType 'text/plain; charset=UTF-8'
+</FilesMatch>
+}
+  end
   cp 'buildr.pdf', '_site'
   fail 'No PDF in site directory' unless File.exist?('_site/buildr.pdf')
   puts 'OK'

data/rakelib/package.rake

@@ -67,7 +67,7 @@ task :snapshot=>[:package] do
   cp FileList['pkg/{*.gem,*.tgz,*.zip}'], '_snapshot/gems'
   puts "Generating gem index ..."
   sh 'gem', 'generate_index', '--directory', '_snapshot'
-  puts "Copying gem and index back to Apache" 
+  puts "Copying gem and index back to Apache"
   sh 'rsync', '--progress', '--recursive', '_snapshot/', 'people.apache.org:public_html/buildr/snapshot/'
 end
 task(:clobber) { rm_rf '_snapshot' }

data/rakelib/release.rake

@@ -45,6 +45,9 @@ task :release do
 
   # Upload binary and source packages to RubyForge.
   lambda do
+    sh 'rubyforge', 'login'
+    # update rubyforge projects, processors, etc. in local config
+    sh 'rubyforge', 'config'
     files = FileList["_release/#{spec.version}/dist/*.{gem,tgz,zip}"]
     puts "Uploading #{spec.version} to RubyForge ... "
     rubyforge = RubyForge.new.configure
@@ -63,7 +66,7 @@ task :release do
   # Create an SVN tag for this release.
   lambda do
     info = `svn info` + `git svn info` # Using either svn or git-svn
-    if url = info[/^URL:/] && info.scan(/^URL: (.*)/)[0][0] 
+    if url = info[/^URL:/] && info.scan(/^URL: (.*)/)[0][0]
       new_url = url.sub(/(trunk$)|(branches\/\w*)$/, "tags/#{spec.version}")
       unless url == new_url
         sh 'svn', 'copy', url, new_url, '-m', "Release #{spec.version}" do |ok, res|
@@ -80,7 +83,7 @@ task :release do
 
 
   # Update CHANGELOG to next release number.
-  lambda do 
+  lambda do
     next_version = spec.version.to_s.split('.').map { |v| v.to_i }.
       zip([0, 0, 1]).map { |a| a.inject(0) { |t,i| t + i } }.join('.')
     modified = "#{next_version} (Pending)\n\n" + File.read('CHANGELOG')
@@ -89,7 +92,7 @@ task :release do
     end
     puts "[X] Updated CHANGELOG and added entry for next release"
   end.call
- 
+
 
   # Update source files to next release number.
   lambda do
@@ -98,7 +101,7 @@ task :release do
 
     ver_file = "lib/#{spec.name}.rb"
     if File.exist?(ver_file)
-      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" } 
+      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
       File.open ver_file, 'w' do |file|
         file.write modified
       end
@@ -107,7 +110,7 @@ task :release do
 
     spec_file = "#{spec.name}.gemspec"
     if File.exist?(spec_file)
-      modified = File.read(spec_file).sub(/(s(?:pec)?\.version\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" } 
+      modified = File.read(spec_file).sub(/(s(?:pec)?\.version\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
       File.open spec_file, 'w' do |file|
         file.write modified
       end
@@ -115,7 +118,7 @@ task :release do
     end
   end.call
 
- 
+
   # Prepare release announcement email.
   lambda do
     changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]

data/rakelib/rspec.rake

@@ -18,34 +18,53 @@ begin
   require 'spec/rake/spectask'
   directory '_reports'
 
+  def default_spec_opts
+    default = %w{--format failing_examples:failed --format html:_reports/specs.html --backtrace}
+    default << '--colour' if $stdout.isatty
+    default
+  end
+  
   desc "Run all specs"
   Spec::Rake::SpecTask.new :spec=>['_reports', :compile] do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
     task.spec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
-    task.spec_opts = %w{--format specdoc --format failing_examples:failed --format html:_reports/specs.html --backtrace}    
-    task.spec_opts << '--colour' if $stdout.isatty
+    task.spec_opts = default_spec_opts
+    task.spec_opts << '--format specdoc'
   end
   file('_reports/specs.html') { task(:spec).invoke }
 
   desc 'Run all failed examples from previous run'
   Spec::Rake::SpecTask.new :failed do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
-    task.spec_opts = %w{--format specdoc --format failing_examples:failed --example failed --backtrace}    
-    task.spec_opts << '--colour' if $stdout.isatty
+    task.spec_opts = default_spec_opts
+    task.spec_opts << '--format specdoc' << '--example failed'
   end
 
   desc 'Run RSpec and generate Spec and coverage reports (slow)'
   Spec::Rake::SpecTask.new :coverage=>['_reports', :compile] do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
-    task.spec_opts = %W{--format progress --format failing_examples:failed --format html:_reports/specs.html --backtrace}    
-    task.spec_opts << '--colour' if $stdout.isatty
+    task.spec_opts = default_spec_opts
+    task.spec_opts << '--format progress'
     task.rcov = true
     task.rcov_dir = '_reports/coverage'
     task.rcov_opts = %w{--exclude / --include-file ^lib --text-summary}
   end
   file('_reports/coverage') { task(:coverage).invoke }
 
-
+  task :load_ci_reporter do
+    gem 'ci_reporter'
+    ENV['CI_REPORTS'] = '_reports/ci'
+    # CI_Reporter does not quote the path to rspec_loader which causes problems when ruby is installed in C:/Program Files
+    ci_rep_path = Gem.loaded_specs['ci_reporter'].full_gem_path
+    ENV["SPEC_OPTS"] = [ENV["SPEC_OPTS"], default_spec_opts, "--require", "\"#{ci_rep_path}/lib/ci/reporter/rake/rspec_loader.rb\"", "--format", "CI::Reporter::RSpec"].join(" ")
+  end
+  
+  desc 'Run all specs with CI reporter'
+  task :ci=>[:load_ci_reporter, :spec] 
+  
   # Useful for testing with JRuby when using Ruby and vice versa.
   namespace :spec do
     desc "Run all specs specifically with Ruby"

data/rakelib/setup.rake

@@ -17,7 +17,7 @@
 require 'jruby' if RUBY_PLATFORM[/java/]
 require 'rubygems/source_info_cache'
 
-RAKE_SUDO = case (ENV['RAKE_SUDO'] or 'yes').strip.downcase
+RAKE_SUDO = case (ENV['RAKE_SUDO'] or 'false').strip.downcase
   when 'yes', 'true'
     true
   else
@@ -35,7 +35,14 @@ def install_gem(name, options = {})
     args = []
     args << 'sudo' << 'env' << "JAVA_HOME=#{ENV['JAVA_HOME']}" if sudo_needed? and RAKE_SUDO
     args << rb_bin << '-S' << 'gem' << 'install' << name
-    args << '--version' << dep.version_requirements.to_s
+
+    if (spec.respond_to? :requirement)
+      args << '--version' << dep.requirement.to_s
+    else
+      # Dependency.version_requirements deprecated in rubygems 1.3.6
+      args << '--version' << dep.version_requirements.to_s
+    end
+
     args << '--source' << options[:source] if options[:source]
     args << '--source' << 'http://gems.rubyforge.org'
     args << '--install-dir' << ENV['GEM_HOME'] if ENV['GEM_HOME']
@@ -49,6 +56,11 @@ desc "If you're building from sources, run this task first to setup the necessar
 task :setup do
   missing = spec.dependencies.select { |dep| Gem::SourceIndex.from_installed_gems.search(dep).empty? }
   missing.each do |dep|
-    install_gem dep.name, :version=>dep.version_requirements
+    if (spec.respond_to? :requirement)
+      install_gem dep.name, :version=>dep.requirement
+    else
+      # Dependency.version_requirements deprecated in rubygems 1.3.6
+      install_gem dep.name, :version=>dep.version_requirements
+    end
   end
 end

data/rakelib/stage.rake

@@ -23,13 +23,14 @@ rescue LoadError
   task(:setup) { install_gem 'rubyforge' }
 end
 
+gpg_cmd = 'gpg2'
 
 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?
+    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,14 +41,19 @@ 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
 
   # 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?
+    gpg_ok = `gpg2 --list-keys #{args.gpg}`
+    if !$?.success?
+      gpg_ok = `gpg --list-keys #{args.gpg}` 
+      gpg_cmd = 'gpg'
+    end
+    fail "No GPG user #{args.gpg}" if gpg_ok.empty?
   end.call
 
   task(:license).invoke
@@ -73,7 +79,7 @@ task :prepare do |task, args|
   lambda do
     puts "[!] Make sure you have admin privileges to make a release on RubyForge"
     rubyforge = RubyForge.new.configure
-    rubyforge.login 
+    rubyforge.login
     rubyforge.scrape_project(spec.name)
   end.call
 
@@ -106,14 +112,14 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
     task(:package).invoke
     mkpath '_staged/dist'
     FileList['pkg/*.{gem,zip,tgz}'].each do |source|
-      pkg = source.pathmap('_staged/dist/%n%x') 
+      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
+      sh gpg_cmd, '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
     end
-    cp 'etc/KEYS', '_staged'
+    cp 'etc/KEYS', '_staged/dist'
     puts "[X] Created and signed release packages in _staged/dist"
   end.call
 
@@ -121,10 +127,11 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
   # 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}"
+    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|
       name, md5 = File.basename(pkg), Digest::MD5.file(pkg).to_s
-      %{| "#{name}":#{url}/#{name} | "#{md5}":#{url}/#{name}.md5 | "Sig":#{url}/#{name}.asc |}
+      %{| "#{name}":#{mirror}/#{name} | "#{md5}":#{official}/#{name}.md5 | "Sig":#{official}/#{name}.asc |}
     }
     textile = <<-TEXTILE
 h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
@@ -132,7 +139,7 @@ h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
 |_. Package |_. MD5 Checksum |_. PGP |
 #{rows.join("\n")}
 
-p>. ("Release signing keys":#{url}/KEYS)
+p>. ("Release signing keys":#{official}/KEYS)
     TEXTILE
     file_name = 'doc/download.textile'
     print "Adding download links to #{file_name} ... "
@@ -161,7 +168,7 @@ p>. ("Release signing keys":#{url}/KEYS)
     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.

data/spec/addon/drb_spec.rb

@@ -12,16 +12,16 @@
 # 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('../spec_helpers', File.dirname(__FILE__))
 require 'stringio'
 Sandbox.require_optional_extension 'buildr/drb'
 
 
-describe Buildr::DRbApplication do 
+describe Buildr::DRbApplication do
 
-  module DRbHelper 
+  module DRbHelper
     attr_accessor :app, :drb, :cfg
 
     def use_stdio(stdin = nil, stdout = nil, stderr = nil)
@@ -30,7 +30,7 @@ describe Buildr::DRbApplication do
       stderr ||= StringIO.new
       cfg.update :in => stdin, :out => stdout, :err => stderr
     end
-    
+
     def remote_run(*argv)
       cfg.update :argv => argv
       drb.remote_run(cfg)
@@ -48,7 +48,7 @@ describe Buildr::DRbApplication do
             $stdout.puts "#{t.name} from #{t.source}"
           end
 
-          task('hello') do 
+          task('hello') do
             $stdout.puts 'hi'
           end
 
@@ -81,7 +81,7 @@ describe Buildr::DRbApplication do
   end
 
   include DRbHelper
-  
+
   before(:each) do
     @in, @out, @err = $stdin, $stdout, $stderr
     @cfg = {
@@ -96,7 +96,7 @@ describe Buildr::DRbApplication do
   after(:each) do
     $stdin, $stdout, $stderr = @in, @out, @err
   end
-  
+
   describe '.run' do
     it 'starts server if no server is running' do
       drb.should_receive(:connect).and_raise DRb::DRbConnError
@@ -114,11 +114,11 @@ describe Buildr::DRbApplication do
   end
 
   describe '.remote_run' do
-    
+
     describe 'stdout' do
-      it 'is redirected to client' do 
+      it 'is redirected to client' do
         use_stdio
-        Buildr.application.should_receive(:remote_run) do 
+        Buildr.application.should_receive(:remote_run) do
           $stdout.puts "HELLO"
         end
         remote_run
@@ -126,10 +126,10 @@ describe Buildr::DRbApplication do
       end
     end
 
-    describe 'stderr' do 
+    describe 'stderr' do
       it 'is redirected to client' do
         use_stdio
-        Buildr.application.should_receive(:remote_run) do 
+        Buildr.application.should_receive(:remote_run) do
           $stderr.puts "HELLO"
         end
         remote_run
@@ -142,7 +142,7 @@ describe Buildr::DRbApplication do
         use_stdio
         cfg[:in].should_receive(:gets).and_return("HELLO\n")
         result = nil
-        Buildr.application.should_receive(:remote_run) do 
+        Buildr.application.should_receive(:remote_run) do
           result = $stdin.gets
         end
         remote_run
@@ -152,7 +152,7 @@ describe Buildr::DRbApplication do
 
     describe 'server ARGV' do
       it 'is replaced with client argv' do
-        Buildr.application.should_receive(:remote_run) do 
+        Buildr.application.should_receive(:remote_run) do
           ARGV.should eql(['hello'])
         end
         remote_run 'hello'
@@ -164,7 +164,7 @@ describe Buildr::DRbApplication do
         app.instance_eval { @rakefile = nil }
         write_buildfile
       end
-      
+
       it 'should load the buildfile' do
         app.should_receive(:top_level)
         lambda { remote_run }.should run_task('foo')
@@ -172,14 +172,14 @@ describe Buildr::DRbApplication do
     end
 
     describe 'with unmodified buildfile' do
-      
-      before(:each) do 
+
+      before(:each) do
         write_buildfile
         app.options.rakelib = []
         app.send :load_buildfile
         drb.save_snapshot(app)
       end
-      
+
       it 'should not reload the buildfile' do
         app.should_not_receive(:reload_buildfile)
         app.should_receive(:top_level)
@@ -235,12 +235,12 @@ describe Buildr::DRbApplication do
         remote_run 'foo:empty'
         app.instance_eval { @rules.size }.should eql(orig)
       end
-            
+
     end
 
     describe 'with modified buildfile' do
-      
-      before(:each) do 
+
+      before(:each) do
         write_buildfile
         app.options.rakelib = []
         app.send :load_buildfile
@@ -251,12 +251,12 @@ describe Buildr::DRbApplication do
             $stdout.puts "#{t.name} from #{t.source}"
           end
           define('foo') do
-            task('hello') do 
+            task('hello') do
               $stdout.puts 'bye'
             end
             task('empty')
             define('bar') do
-              
+
             end
           end
         }
@@ -277,7 +277,7 @@ describe Buildr::DRbApplication do
         remote_run
         app.lookup('foo:delete_me').should be_nil
       end
-      
+
       it 'should redefine tasks actions' do
         actions = app.lookup('foo:empty').instance_eval { @actions }
         actions.should be_empty # no action