buildr 1.3.4 → 1.3.5

data/lib/buildr/scala/tests.rb

@@ -31,7 +31,7 @@ module Buildr::Scala
       end
       
       def dependencies
-        ["org.scalacheck:scalacheck:jar:#{version}"]
+        ["org.scala-tools.testing:scalacheck:jar:#{version}"]
       end  
 
     private
@@ -109,8 +109,9 @@ module Buildr::Scala
             ant.suite    :classname=>suite
             ant.reporter :type=>'stdout', :config=>reporter_options
             ant.reporter :type=>'file', :filename=> reportFile, :config=>reporter_options
-            ant.includes group_includes.join(" ") if group_includes
-            ant.excludes group_excludes.join(" ") if group_excludes
+            # TODO: This should be name=>value pairs!
+            #ant.includes group_includes.join(" ") if group_includes
+            #ant.excludes group_excludes.join(" ") if group_excludes
             (options[:properties] || []).each { |name, value| ant.property :name=>name, :value=>value }
           end
         end
@@ -125,9 +126,9 @@ module Buildr::Scala
         while (!completed) do
           File.open(reportFile, "r") do |input|
             while (line = input.gets) do
-              failed = (line =~ /(TEST FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
+              failed = (line =~ /(TESTS? FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
               completed |= (line =~ /Run completed\./)
-              break if (failed || completed)
+              break if (failed)
             end
           end
           wait += 1

data/lib/buildr/shell.rb

@@ -0,0 +1,180 @@
+# 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.
+
+
+module Buildr
+  module ShellProviders
+    class << self
+      def add(p)
+        @providers ||= {}
+        
+        if p.lang == :none
+          @providers[:none] ||= []
+          @providers[:none] << p
+        else
+          @providers[p.lang] = p
+        end
+      end
+      alias :<< :add
+      
+      def providers
+        @providers ||= {}
+      end
+      
+      def each
+        providers.each do |lang, p|
+          if lang == :none
+            p.each do |x|
+              yield x
+            end
+          else
+            yield p
+          end
+        end
+      end
+    end
+  end
+  
+  module Shell
+    class Base
+      attr_reader :project
+      
+      class << self
+        def lang
+          :none
+        end
+        
+        def to_sym
+          @symbol ||= name.split('::').last.downcase.to_sym
+        end
+      end
+      
+      def initialize(project)
+        @project = project
+      end
+      
+      def build?
+        true
+      end
+      
+      def launch
+        fail 'Not implemented'
+      end
+    end
+    
+    module JavaRebel
+      def rebel_home
+        unless @rebel_home
+          @rebel_home = ENV['REBEL_HOME'] or ENV['JAVA_REBEL'] or ENV['JAVAREBEL'] or ENV['JAVAREBEL_HOME']
+          
+          if @rebel_home and File.directory? @rebel_home
+            @rebel_home += File::SEPARATOR + 'javarebel.jar'
+          end
+        end
+        
+        if @rebel_home and File.exists? @rebel_home
+          @rebel_home
+        else
+          nil
+        end
+      end
+      
+      def rebel_args
+        if rebel_home
+          [
+            '-noverify',
+            "-javaagent:#{rebel_home}"
+          ]
+        else
+          []
+        end
+      end
+      
+      def rebel_props(project)
+        {}
+      end
+    end
+  end
+  
+  module ShellExtension
+    include Extension
+    
+    first_time do
+      Project.local_task 'shell'
+      
+      ShellProviders.each { |p| Project.local_task "shell:#{p.to_sym}" }    # TODO  not working
+    end
+    
+    before_define do |project|
+      ShellProviders.each do |p|
+        name = p.to_sym
+        
+        trace "Defining task #{project.name}:shell:#{name}"
+        
+        p_inst = p.new project
+        deps = if p_inst.build? then [:compile] else [] end
+        
+        project.task "shell:#{name}" => deps do
+          trace "Launching #{name} shell"
+          p_inst.launch
+        end
+      end
+    end
+    
+    after_define do |project|
+      default_shell = project.shell.using
+      
+      if default_shell
+        dep = "shell:#{default_shell.to_sym}"
+        
+        trace "Defining task shell based on #{dep}"
+        project.task :shell => dep
+      else
+        project.task :shell do
+          fail "No shell provider defined for language '#{project.compile.language}'"
+        end
+      end
+    end
+    
+    class ShellConfig
+      def initialize(project)
+        @project = project
+      end
+      
+      def using(*args)
+        if args.size > 0
+          @using ||= args.first
+        else
+          @using ||= find_shell_task
+        end
+      end
+      
+    private
+      def find_shell_task
+        lang = @project.compile.language
+        ShellProviders.providers[lang]
+      end
+    end
+    
+    # TODO  temporary hack
+    def shell
+      @shell ||= ShellConfig.new self
+    end
+  end
+  
+  class Project
+    include ShellExtension
+  end
+end

data/rakelib/doc.rake

@@ -42,13 +42,12 @@ begin
   JekyllTask.new :jekyll do |task|
     task.source = 'doc'
     task.target = '_site'
-    task.pygments = true
   end
 
 rescue LoadError
   puts "Buildr uses the mojombo-jekyll to generate the Web site. You can install it by running rake doc:setup"
   task 'doc:setup' do
-    install_gem 'mojombo-jekyll', :source=>'http://gems.github.com', :version=>'0.4.1'
+    install_gem 'mojombo-jekyll', :source=>'http://gems.github.com', :version=>'0.5.4'
     if `pygmentize -V`.empty?
       args = %w{easy_install Pygments}
       args.unshift 'sudo' unless Config::CONFIG['host_os'] =~ /windows/
@@ -60,7 +59,7 @@ end
 
 desc "Generate Buildr documentation as buildr.pdf"
 file 'buildr.pdf'=>'_site' do |task|
-  pages = File.read('doc/preface.textile').scan(/^#.*":(\S*)$/).flatten.map { |f| "_site/#{f}" }
+  pages = File.read('_site/preface.html').scan(/<li><a href=['"]([^'"]+)/).flatten.map { |f| "_site/#{f}" }
   sh 'prince', '--input=html', '--no-network', '--log=prince_errors.log', "--output=#{task.name}", '_site/preface.html', *pages
 end
 

data/rakelib/jekylltask.rb

@@ -14,6 +14,7 @@
 # the License.
 
 
+gem 'mojombo-jekyll', '~> 0.5.2' # skip past some buggy versions
 require 'rake/tasklib'
 require 'jekyll'
 
@@ -39,14 +40,11 @@ class JekyllTask < Rake::TaskLib
 
   attr_accessor :source
   attr_accessor :target
-  attr_accessor :pygments
 
   def generate(auto = false)
-    process = lambda do
-      Jekyll.pygments = @pygments
-      Jekyll.process source, target
-      touch target
-    end
+    options = { 'source'=>source, 'destination'=>target }
+    options = Jekyll.configuration(options)
+    site = Jekyll::Site.new(options)
 
     if auto
       require 'directory_watcher'
@@ -63,44 +61,22 @@ class JekyllTask < Rake::TaskLib
       dw.add_observer do |*args|
         t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
         puts "[#{t}] regeneration: #{args.size} files changed"
-        process.call
+        site.process
         puts "Done"
       end
       loop { sleep 1 }
     else
       puts "Generating documentation in #{target}"
-      process.call
-    end
-  end
-end
-
-
-# TODO: Worked around bug in Jekyll 0.4.1. Removed when 0.4.2 is out.
-# http://github.com/mojombo/jekyll/commit/c180bc47bf2f63db1bff9f6600cccbe5ad69077e#diff-0
-class Albino
-  def execute(command)
-    output = ''
-    Open4.popen4(command) do |pid, stdin, stdout, stderr|
-      stdin.puts @target
-      stdin.close
-      output = stdout.read.strip
-      [stdout, stderr].each { |io| io.close }
+      site.process
+      touch target
     end
-    output
   end
 end
 
-class Jekyll::Page
-  def render(layouts, site_payload)
-    puts "... #{@name}"
-    payload = {"page" => self.data}.deep_merge(site_payload)
-    do_layout(payload, layouts)
-  end
-end
 
 module TocFilter
   def toc(input)
-    input.scan(/<(h2)(?:>|\s+(.*?)>)(.*?)<\/\1\s*>/mi).inject(%{<ol class="toc">}) { |toc, entry|
+    input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).inject(%{<ol class="toc">}) { |toc, entry|
       id = entry[1][/^id=(['"])(.*)\1$/, 2]
       title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
       toc << %{<li><a href="##{id}">#{title}</a></li>}
@@ -108,3 +84,37 @@ module TocFilter
   end
 end
 Liquid::Template.register_filter(TocFilter)
+
+
+
+# Under Ruby 1.9 [a,b,c].to_s doesn't join the array first. (Jekyll 0.5.2 requires this)
+module Jekyll
+  class HighlightBlock < Liquid::Block
+    def render(context)
+      if context.registers[:site].pygments
+        render_pygments(context, super.join)
+      else
+        render_codehighlighter(context, super.join)
+      end
+    end
+  end
+end
+
+# Ruby 1.9 has sane closure scoping which manages to mess Liquid filters. (Liquid 2.0.0 requires this)
+module Liquid
+  class Variable
+    def render(context)
+      return '' if @name.nil?
+      @filters.inject(context[@name]) do |output, filter|
+        filterargs = filter[1].to_a.collect do |a|
+         context[a]
+        end
+        begin
+          context.invoke(filter[0], output, *filterargs)
+        rescue FilterNotFound
+          raise FilterNotFound, "Error - filter '#{filter[0]}' in '#{@markup.strip}' could not be found."
+        end
+      end
+    end
+  end
+end

data/rakelib/package.rake

@@ -51,9 +51,11 @@ end
 file Rake::GemPackageTask.new(spec).package_dir=>:compile
 file Rake::GemPackageTask.new(spec).package_dir_path=>:compile
 
-# We also need the other package (JRuby if building on Ruby, and vice versa)
+# We also need the other packages (JRuby if building on Ruby, and vice versa)
 # Must call new with block, even if block does nothing, otherwise bad things happen.
-Rake::GemPackageTask.new(spec(RUBY_PLATFORM[/java/] ? 'ruby' : 'java')) { |task| }
+@specs.values.each do |s|
+  Rake::GemPackageTask.new(s) { |task| }
+end
 
 
 desc "Upload snapshot packages over to people.apache.org"

data/rakelib/rspec.rake

@@ -19,10 +19,10 @@ begin
   directory '_reports'
 
   desc "Run all specs"
-  Spec::Rake::SpecTask.new :spec=>'_reports' do |task|
+  Spec::Rake::SpecTask.new :spec=>['_reports', :compile] do |task|
     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 --loadby mtime --backtrace}    
+    task.spec_opts = %w{--format specdoc --format failing_examples:failed --format html:_reports/specs.html --backtrace}    
     task.spec_opts << '--colour' if $stdout.isatty
   end
   file('_reports/specs.html') { task(:spec).invoke }
@@ -35,7 +35,7 @@ begin
   end
 
   desc 'Run RSpec and generate Spec and coverage reports (slow)'
-  Spec::Rake::SpecTask.new :coverage=>'_reports' do |task|
+  Spec::Rake::SpecTask.new :coverage=>['_reports', :compile] do |task|
     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

data/rakelib/setup.rake

@@ -17,6 +17,12 @@
 require 'jruby' if RUBY_PLATFORM[/java/]
 require 'rubygems/source_info_cache'
 
+RAKE_SUDO = case (ENV['RAKE_SUDO'] or 'yes').strip.downcase
+  when 'yes', 'true'
+    true
+  else
+    false
+end
 
 # Install the specified gem. Options include:
 # - :version -- Version requirement, e.g. '1.2' or '~> 1.2'
@@ -27,7 +33,7 @@ def install_gem(name, options = {})
     puts "Installing #{name} ..."
     rb_bin = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
     args = []
-    args << 'sudo' << 'env' << "JAVA_HOME=#{ENV['JAVA_HOME']}" if sudo_needed?
+    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
     args << '--source' << options[:source] if options[:source]

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' }