buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

data/lib/buildr/shell.rb

@@ -19,7 +19,7 @@ module Buildr
     class << self
       def add(p)
         @providers ||= {}
-        
+
         if p.lang == :none
           @providers[:none] ||= []
           @providers[:none] << p
@@ -28,11 +28,11 @@ module Buildr
         end
       end
       alias :<< :add
-      
+
       def providers
         @providers ||= {}
       end
-      
+
       def each
         providers.each do |lang, p|
           if lang == :none
@@ -46,51 +46,51 @@ module Buildr
       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']
-          
+          @rebel_home = ENV['REBEL_HOME'] or ENV['JREBEL'] or ENV['JREBEL_HOME']
+
           if @rebel_home and File.directory? @rebel_home
-            @rebel_home += File::SEPARATOR + 'javarebel.jar'
+            @rebel_home += File::SEPARATOR + 'jrebel.jar'
           end
         end
-        
+
         if @rebel_home and File.exists? @rebel_home
           @rebel_home
         else
           nil
         end
       end
-      
+
       def rebel_args
         if rebel_home
           [
@@ -101,44 +101,44 @@ module Buildr
           []
         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|
+
+    before_define(:shell => :compile) 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|
+
+    after_define(:shell => :compile) 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
@@ -147,12 +147,12 @@ module Buildr
         end
       end
     end
-    
+
     class ShellConfig
       def initialize(project)
         @project = project
       end
-      
+
       def using(*args)
         if args.size > 0
           @using ||= args.first
@@ -160,20 +160,20 @@ module Buildr
           @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

data/rakelib/all-in-one.rake

@@ -0,0 +1,113 @@
+# 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.
+
+desc "Create JRuby all-in-one distribution"
+task "all-in-one" => 'all-in-one:all-in-one' 
+
+namespace :'all-in-one' do
+  
+  version = "1.5.1"
+  jruby_distro = "jruby-bin-#{version}.tar.gz"
+  url = "http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{jruby_distro}"
+  dir = "jruby-#{version}"
+  
+  task "all-in-one" => [:gem,
+      # Prepare to run
+      :prepare,
+      # Download and extract JRuby
+      :download_and_extract,
+      # Cleanup JRuby distribution
+      :clean_dist,
+      # Install Buildr gem and dependencies
+      :install_dependencies,
+      # Add Buildr executables/scripts
+      :add_execs,
+      # Package distribution
+      :package
+    ]
+
+  desc 'Prepare to run'
+  task :prepare do
+    mkpath '_all-in-one'
+    cd '_all-in-one'
+  end
+
+  desc 'Download and extract JRuby'
+  task :download_and_extract do
+    unless File.exist? jruby_distro
+      puts "Downloading JRuby from #{url} ..."
+      sh 'wget', url
+      puts "[X] Downloaded JRuby"
+    end
+
+    rm_rf dir if File.exist? dir
+
+    puts "Extracting JRuby to #{dir} ..."
+    sh 'tar', 'xzf', jruby_distro
+    puts "[X] Extracted JRuby"
+    cd dir
+  end
+
+  desc 'Cleanup JRuby distribution'
+  task :clean_dist do
+    puts 'Cleaning...'
+    rm_rf 'docs'
+    mkpath 'jruby-docs'
+    mv Dir["COPYING*"], 'jruby-docs'
+    mv Dir["LICENSE*"], 'jruby-docs'
+    mv 'README', 'jruby-docs'
+    rm_rf 'lib/ruby/1.9'
+    rm_rf 'lib/ruby/gems/1.8/doc'
+    rm_rf 'samples'
+    rm_rf 'share'
+  end
+  
+  desc 'Install Buildr gem and dependencies'
+  task :install_dependencies do
+    puts "Install Buildr gem ..."
+    sh "bin/jruby", '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first,
+       '--no-rdoc', '--no-ri'
+    puts "[X] Install Buildr gem"
+  end
+  
+  desc 'Add Buildr executables/scripts'
+  task :add_execs do
+    cp 'bin/jruby.exe', 'bin/_buildr.exe'
+    cp Dir["../../all-in-one/*"], 'bin'
+  end
+  
+  desc 'Package distribution'
+  task :package do
+    puts "Zipping distribution ..."
+    cd '..'
+    new_dir  = "#{spec.name}-#{spec.version}"
+    mv dir, new_dir
+    zip = "#{new_dir}.zip"
+    rm zip if File.exist? zip
+    sh 'zip', '-q', '-r', zip, new_dir
+    puts "[X] Zipped distribution"
+   
+    puts "Tarring distribution ..."
+    tar = "#{new_dir}.tar.gz"
+    rm tar if File.exist? tar
+    sh 'tar', 'czf', tar, new_dir
+    puts "[X] Tarred distribution"
+    
+    rm_rf new_dir
+  end
+  
+end
+
+task(:clobber) { rm_rf '_all-in-one' }

data/rakelib/checks.rake

@@ -18,7 +18,7 @@ desc "Check that source files contain the Apache license"
 task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
   puts "Checking that files contain the Apache license ... "
   required = task.prerequisites.select { |fn| File.file?(fn) }
-  missing = required.reject { |fn| 
+  missing = required.reject { |fn|
     comments = File.read(fn).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|^-#\s+(.*?)$|<!--(.*?)-->/m).
       map { |match| match.compact }.flatten.join("\n")
     comments =~ /Licensed to the Apache Software Foundation/ && comments =~ /http:\/\/www.apache.org\/licenses\/LICENSE-2.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"