buildr 1.3.4-java → 1.3.5-java

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/release.rake

@@ -32,12 +32,12 @@ task :release do
     host, remote_dir = target.split(':')
     sh 'ssh', host, 'rm', '-rf', remote_dir rescue nil
     sh 'ssh', host, 'mkdir', remote_dir
-    sh 'rsync', '--progress', '--recursive', '_release/dist/', target
+    sh 'rsync', '--progress', '--recursive', "_release/#{spec.version}/dist/", target
     puts "[X] Uploaded packages to www.apache.org/dist"
 
     target = "people.apache.org:/www/#{spec.name}.apache.org/"
     puts "Uploading new site to #{spec.name}.apache.org ..."
-    sh 'rsync', '--progress', '--recursive', '--delete', '_release/site/', target
+    sh 'rsync', '--progress', '--recursive', '--delete', "_release/#{spec.version}/site/", target
     sh 'ssh', 'people.apache.org', 'chmod', '-R', 'g+w', "/www/#{spec.name}.apache.org/*"
     puts "[X] Uploaded new site to #{spec.name}.apache.org"
   end.call
@@ -45,16 +45,16 @@ task :release do
 
   # Upload binary and source packages to RubyForge.
   lambda do
-    files = FileList['_release/dist/*.{gem,tgz,zip}']
+    files = FileList["_release/#{spec.version}/dist/*.{gem,tgz,zip}"]
     puts "Uploading #{spec.version} to RubyForge ... "
     rubyforge = RubyForge.new.configure
-    rubyforge.login 
-    rubyforge.userconfig.merge!('release_changes'=>'_release/CHANGES',  'preformatted' => true)
+    rubyforge.login
+    rubyforge.userconfig.merge!('release_changes'=>"_release/#{spec.version}/CHANGES",  'preformatted' => true)
     rubyforge.add_release spec.rubyforge_project.downcase, spec.name.downcase, spec.version.to_s, *files
 
     puts "Posting news to RubyForge ... "
-    changes = File.read('_release/CHANGES')[/.*?\n(.*)/m, 1]
-    rubyforge.post_news spec.rubyforge_project.downcase, "Buildr #{spec.versions} released",
+    changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
+    rubyforge.post_news spec.rubyforge_project.downcase, "Buildr #{spec.version} released",
       "#{spec.description}\n\nNew in Buildr #{spec.version}:\n#{changes.gsub(/^/, '  ')}\n"
     puts "[X] Uploaded gems and source files to #{spec.name}.rubyforge.org"
   end.call
@@ -118,7 +118,7 @@ task :release do
  
   # Prepare release announcement email.
   lambda do
-    changes = File.read('_release/CHANGES')[/.*?\n(.*)/m, 1]
+    changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
     email = <<-EMAIL
 To: users@buildr.apache.org, announce@apache.org
 Subject: [ANNOUNCE] Apache Buildr #{spec.version} released

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]