buildr 1.3.3 → 1.3.4

data/CHANGELOG

@@ -1,3 +1,79 @@
+1.3.4 (2009-04-21)
+* Added:  BUILDR-93 Add specs for ScalaCheck integration
+* Added:  BUILDR-94 Add specs for Scala Specs integration
+* Added:  BUILDR-136 Support Scala/Java Joint Compiler (Daniel Spiewak).
+* Added:  BUILDR-159 Improved 'check' to accept both tar and tgz archives.
+* Added:  BUILDR-164 New 'artifacts:sources' task to download source code
+          for artifact jars.
+* Added:  BUILDR-222 Support Git as a version control system
+* Added   BUILDR-223 Release Task: customizable commit message
+* Added:  BUILDR-242 Include Scala-Tools Repository by Default.  
+* Added:  BUILDR-268 Allow proxying for https connections (Joel Muzzerall).
+* Added:  Info message "Packaging filename.ext" now displayed for packaging tasks
+* Added:  Added Scala.version and Scala.version_str
+* Change: require 'buildr/scala' is now officially required to use Scala features
+* Change: Introduced new options from Rake 0.8.3: -I (libdir), -R (rakelib),
+          --rules, --no-search, --silent.
+* Change: Upgraded to Rubyforge 1.0.1.
+* Change: Upgraded to use Rake 0.8.4.
+* Change: Upgraded to use Net-SSH 2.0.11.
+* Change: Upgraded to use RSpec 1.2.2.
+* Change: Upgraded to use JRuby 1.1.6 (when auto-installing).
+* Change: Buildr, no longer in incubation (hurray!): new site, mailing list, SVN, Git.
+* Change: BUILDR-171 Eclipse task generates meta-data files for projects with
+          test source code but no main source code. 
+* Change: BUILDR-177 Moved cobertura and emma extensions to lib directory.
+* Change: BUILDR-187 Source code attachment for Eclipse .classpath.
+* Change: BUILDR-188 Source code attachment for IDEA .iml file (Marko Sibakov).
+* Change: BUILDR-209 Scala Specs Should Use src/specs/scala/
+* Change: BUILDR-237 Use MacPorts Scala on OS X.
+* Change: BUILDR-260 Upgrade to Scala 2.7.3 compatible dependencies:  
+          ScalaSpecs 1.4.3, ScalaCheck 1.5 and ScalaTest 0.9.5
+* Change: Buildr now uses Jekyll to generate Web site/documentation:
+http://github.com/mojombo/jekyll/ This replaces Docter so less code to
+maintain and the same Textile/Liquid mechanism as when using Github pages.
+* Fixed:  Removed double complete/fail messages showing up on console.
+* Fixed:  BUILDR-140 Get rid of const_defined? all across the board.
+* Fixed:  BUILDR-158 Nailgun is now a delegate for buildr/drb (a pure-ruby dRuby server)
+* Fixed:  BUILDR-170 ArtifactNamespace#method_missing has a condition that is never true.
+* Fixed:  BUILDR-172 Scala compiler not loaded by default.
+* Fixed:  BUILDR-175 Fail to find child project when calling project method inside project definition.
+* Fixed:  BUILDR-185 Exception if using artifact names with hyphen (Joel
+Muzzerall).
+* Fixed:  BUILDR-192 TestNG report results are overwritten (Alexis Midon).
+* Fixed:  BUILDR-193 TestNG uses project name for suite name (not valid file
+          name on Windows).
+* Fixed:  BUILDR-194 Buildr always adds 'Manifest-Version' to generated manifest file.
+* Fixed:  BUILDR-198 Filter#run always calls mkpath with :verbose.
+* Fixed:  BUILDR-199 ArchiveTask#needed uses 'each' with no effect (Ittay Dror).
+* Fixed:  BUILDR-201 Sample project is not valid (Alexis Midon).
+* Fixed:  BUILDR-214 Buildr is stuck uploading to sftp repository (Heikki Hulkko).
+* Fixed:  BUILDR-216 Profiles documentation is wrong (Shane Witbeck).
+* Fixed:  BUILDR-218 Manifest.from_zip fails if the zip doesn't already have
+META-INF/MANIFEST.MF (Joel Muzzerall).
+* Fixed:  BUILDR-226 Release task should use XML output of "svn info" instead
+of human-readable output (Alexis Midon).
+* Fixed:  BUILDR-230 release task fails if there's a space in the path to the
+Buildfile.
+* Fixed:  BUILDR-235 JRuby download link is broke (Alexis Midon).
+* Fixed:  BUILDR-239 HTTP redirects lose authentication information (Joel
+Muzzerall).
+* Fixed:  BUILDR-240 Make TestNG print traces in the console (Alex Midon).
+* Fixed:  BUILDR-241 IDEA7X IPR generation does not pay attention to base_dir
+for submodules (Rhett Sutphin).
+* Fixed:  BUILDR-247 OpenObject does not work with Hash#only (Rhett Sutphin).
+* Fixed:  BUILDR-253 ZipTask now uses Zlib::DEFAULT_COMPRESSION instead of NO_COMPRESSION
+* Fixed:  BUILDR-255 tasks/*.rake files are loaded more than once.
+* Fixed:  BUILDR-261 ScalaSpecs should be run with Scala dependencies
+* Fixed:  BUILDR-263 package(:war).merge not working correctly with exclude()
+* Fixed:  BUILDR-271 Using buildr --environment leads to "Don't know how to
+build task XXX".
+* Fixed:  BUILDR-269 rspec bdd is broken (Jeff Hodges)
+* Fixed:  BUILDR-272 'rake gem' does not build gem under JRuby (Clinton R.
+Nixon).
+* Remove: BUILDR-215 buildr:freeze and unfreeze tasks don't work since we're
+no longer running with the rake command.
+
 1.3.3 (2008-10-08)
 * Added:  JtestR support. Implemented pending jtestr specs.
 * Added:  Growl notifications (OS X only).

data/NOTICE

@@ -1,5 +1,5 @@
 Apache Buildr
-Copyright 2008 The Apache Software Foundation
+Copyright 2007-2009 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

data/README.rdoc

@@ -2,8 +2,7 @@
 
 This is Buildr, the build system that doesn't suck.
 
-http://incubator.apache.org/buildr/
-
+http://buildr.apache.org/
 
 == Get Started
 
@@ -23,21 +22,21 @@ Make sure to set JAVA_HOME environment variable first, then:
 (Use sudo for Linux and OS X)
 
 More installation and setup instructions available online
-http://incubator.apache.org/buildr/
+http://buildr.apache.org/
 
 
 === RTFM
 
-* Buildr documentation: http://incubator.apache.org/buildr/
+* Buildr documentation: http://buildr.apache.org/
 * More about Rake: http://docs.rubyrake.org
 * Antwrap documentation: http://antwrap.rubyforge.org
 
 
 === Mailing list
 
-Users: http://mail-archives.apache.org/mod_mbox/incubator-buildr-user/
+Users: users-subscribe@buildr.apache.org http://buildr.markmail.org/search/list:users
 
-Developers: http://mail-archives.apache.org/mod_mbox/incubator-buildr-dev/
+Developers: dev-subscribe@buildr.apache.org http://buildr.markmail.org/search/list:dev
 
 Create your own Buildfile and start living the life!
 
@@ -97,14 +96,14 @@ When prompted for a platform, select ruby.
 
 You can check the latest sources from SVN:
 
-  svn co http://svn.apache.org/repos/asf/incubator/buildr/trunk
+  svn co http://svn.apache.org/repos/asf/buildr/trunk
 
 Or browse the SVN repository online:
-http://svn.apache.org/repos/asf/incubator/buildr
+http://svn.apache.org/repos/asf/buildr
 
-If you prefer Git, a Git fork is available from http://github.com/vic/buildr/tree/master:
+If you prefer Git, a Git fork is available from http://github.com/buildr/buildr/tree/master:
 
-  git clone git://github.com/vic/buildr.git
+  git clone git://github.com/buildr/buildr.git
 
 To install Buildr locally from source:
 
@@ -133,14 +132,3 @@ 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.
-
-
-== Disclaimer
-
-Apache Buildr is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized in
-a manner consistent with other successful ASF projects. While incubation status
-is not necessarily a reflection of the completeness or stability of the code,
-it does indicate that the project has yet to be fully endorsed by the ASF.

data/Rakefile

@@ -14,49 +14,32 @@
 # the License.
 
 
-require 'rake/gempackagetask'
+# We need JAVA_HOME for most things (setup, spec, etc).
+unless ENV['JAVA_HOME']
+  if RUBY_PLATFORM[/java/]
+    ENV['JAVA_HOME'] = java.lang.System.getProperty('java.home')
+  elsif RUBY_PLATFORM[/darwin/]
+    ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.framework/Home'
+  else
+    fail "Please set JAVA_HOME first (set JAVA_HOME=... or env JAVA_HOME=... rake ...)"
+  end
+end
+
 
+# Load the Gem specification for the current platform (Ruby or JRuby).
 def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
-  @specs ||= ['ruby', 'java'].inject({}) { |hash, platform|
-    $platform = platform
-    hash.update(platform=>Gem::Specification.load('buildr.gemspec'))
+  @specs ||= ['ruby', 'java'].inject({}) { |hash, spec_platform|
+    $platform = spec_platform
+    hash.update(spec_platform=>Gem::Specification.load('buildr.gemspec'))
   }
   @specs[platform]
 end
 
-
-desc 'Compile Java libraries used by Buildr'
-task 'compile' do
-  puts 'Compiling Java libraries ...'
-  sh File.expand_path('_buildr'), '--buildfile=buildr.buildfile', 'compile'
-  puts 'OK'
-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)
-Rake::GemPackageTask.new spec(RUBY_PLATFORM =~ /java/ ? 'ruby' : 'java') do |task|
-  # Block necessary otherwise doesn't do full job.
+# Tell us if we need sudo for various commands.
+def sudo_needed?
+  Config::CONFIG['host_os'] !~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i && !ENV['GEM_HOME']
 end
 
 
-ENV['incubating'] = 'true'
-ENV['staging'] = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
-
-task('apache:license').enhance FileList[spec.files].exclude('.class', '.png', '.jar', '.tif', '.textile', '.icns',
-   'README', 'LICENSE', 'CHANGELOG', 'DISCLAIMER', 'NOTICE', 'etc/KEYS', 'etc/git-svn-authors')
-
-task 'stage:check' do
-  print 'Checking that we have JRuby, Scala and Groovy available ... '
-  fail 'Full testing requires JRuby!' unless which('jruby')
-  fail 'Full testing requires Scala!' unless which('scala')
-  fail 'Full testing requires Groovy!' unless which('groovy')
-  puts 'OK'
-end
-
-task 'stage:check' do
-  # Dependency check for the other platform, i.e. if making a release with Ruby,
-  # run dependency checks with JRuby. (Also, good opportunity to upgrade other
-  # platform's dependencies)
-  sh RUBY_PLATFORM =~ /java/ ? 'ruby' : 'jruby -S rake setup dependency'
-end
+desc 'Clean up all temporary directories used for running tests, creating documentation, packaging, etc.'
+task :clobber

data/_buildr

@@ -14,25 +14,16 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
 # Run buildr from source, specifically for testing stuff without doing a rake install.
-# The _BUILDR_RB environment variable can be used to set the path to the ruby/jruby executable.
-# For example to use jruby:
-#   export _BUILDR_RB=/path/to/jruby
 
-start = Time.now
 require 'rubygems'
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib') << File.join(File.dirname(__FILE__), 'addon')
 spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'buildr.gemspec'))
 spec.dependencies.each do |dep|
   gem dep.name, dep.version_requirements.to_s
 end
+Gem.loaded_specs['buildr'] = spec # Prevents RubyGem from loading files from installed Buildr gems
+
 require 'buildr'
 Buildr.application.run
-if verbose
-  elapsed = Time.now - start
-  real = []
-  real << ("%ih" % (elapsed / 3600)) if elapsed >= 3600
-  real << ("%im" % ((elapsed / 60) % 60)) if elapsed >= 60
-  real << ("%.3fs" % (elapsed % 60))
-  puts $terminal.color("Completed in #{real.join}", :green)
-end

data/{doc/print.toc.yaml → _jbuildr}

@@ -1,3 +1,4 @@
+#!/usr/bin/env jruby
 # 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
@@ -13,17 +14,16 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-- Welcome: index.html
-- Getting Started: getting_started.html
-- Projects: projects.html
-- Building: building.html
-- Artifacts: artifacts.html
-- Packaging: packaging.html
-- Testing: testing.html
-- Settings/Profiles: settings_profiles.html
-- Languages: languages.html
-- More Stuff: more_stuff.html
-- Extending: extending.html
-- Recipes: recipes.html
-- Troubleshooting: troubleshooting.html
-- Contributing: contributing.html
+
+# Run buildr from source, specifically for testing stuff without doing a rake install.
+
+require 'rubygems'
+$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib') << File.join(File.dirname(__FILE__), 'addon')
+spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'buildr.gemspec'))
+spec.dependencies.each do |dep|
+  gem dep.name, dep.version_requirements.to_s
+end
+Gem.loaded_specs['buildr'] = spec # Prevents RubyGem from loading files from installed Buildr gems
+
+require 'buildr'
+Buildr.application.run

data/addon/buildr/cobertura.rb

@@ -14,223 +14,9 @@
 # the License.
 
 
-require 'buildr/java'
-
-
-module Buildr
-
-  # Provides the <code>cobertura:html</code> and <code>cobertura:xml</code> tasks.
-  # Require explicitly using <code>require "buildr/cobertura"</code>.
-  #
-  # You can generate cobertura reports for a single project 
-  # using the project name as prefix:
-  #
-  #   project_name:cobertura:html
-  #
-  # You can also specify which classes to include/exclude from instrumentation by 
-  # passing a class name regexp to the <code>cobertura.include</code> or 
-  # <code>cobertura.exclude</code> methods. 
-  # 
-  #   define 'someModule' do 
-  #      cobertura.include 'some.package.*'
-  #      cobertura.include /some.(foo|bar).*/
-  #      cobertura.exclude 'some.foo.util.SimpleUtil'
-  #      cobertura.exclude /*.Const(ants)?/i
-  #   end
-  module Cobertura
-
-    class << self
-
-      REQUIRES = ["net.sourceforge.cobertura:cobertura:jar:1.9", "log4j:log4j:jar:1.2.9",
-        "asm:asm:jar:2.2.1", "asm:asm-tree:jar:2.2.1", "oro:oro:jar:2.0.8"] unless const_defined?('REQUIRES')
-
-      def requires()
-        @requires ||= Buildr.artifacts(REQUIRES).each(&:invoke).map(&:to_s)
-      end
-
-      def report_to(file = nil)
-        File.expand_path(File.join(*["reports/cobertura", file.to_s].compact))
-      end
-
-      def data_file()
-        File.expand_path("reports/cobertura.ser")
-      end
-
-    end
-    
-    class CoberturaConfig # :nodoc:
-      
-      def initialize(project)
-        @project = project
-      end
-      
-      attr_reader :project
-      private :project
-
-      attr_writer :data_file, :instrumented_dir, :report_dir
-      
-      def data_file
-        @data_file ||= project.path_to(:reports, 'cobertura.ser')
-      end
-
-      def instrumented_dir
-        @instrumented_dir ||= project.path_to(:target, :instrumented, :classes)
-      end
-
-      def report_dir
-        @report_dir ||= project.path_to(:reports, :cobertura)
-      end
-
-      def report_to(file = nil)
-        File.expand_path(File.join(*[report_dir, file.to_s].compact))
-      end
-
-      # :call-seq:
-      #   project.cobertura.include(*classPatterns)
-      #
-      def include(*classPatterns)
-        includes.push(*classPatterns.map { |p| String === p ? Regexp.new(p) : p })
-        self
-      end
-      
-      def includes
-        @includeClasses ||= []
-      end
-
-      # :call-seq:
-      #   project.cobertura.exclude(*classPatterns)
-      #
-      def exclude(*classPatterns)
-        excludes.push(*classPatterns.map { |p| String === p ? Regexp.new(p) : p })
-        self
-      end
-
-      def excludes
-        @excludeClasses ||= []
-      end
-
-      def sources
-        project.compile.sources
-      end
-    end
-
-    module CoberturaExtension # :nodoc:
-      include Buildr::Extension
-
-      def cobertura
-        @cobertura_config ||= CoberturaConfig.new(self)
-      end
-
-      after_define do |project|
-        cobertura = project.cobertura
-        
-        namespace 'cobertura' do
-          unless project.compile.target.nil?
-            # Instrumented bytecode goes in a different directory. This task creates before running the test
-            # cases and monitors for changes in the generate bytecode.
-            instrumented = project.file(cobertura.instrumented_dir => project.compile.target) do |task|
-              mkdir_p task.to_s, :verbose => false
-              unless project.compile.sources.empty?
-                info "Instrumenting classes with cobertura data file #{cobertura.data_file}"
-                Buildr.ant "cobertura" do |ant|
-                  ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
-                  ant.send "cobertura-instrument", :todir=>task.to_s, :datafile=>cobertura.data_file do
-                    includes, excludes = cobertura.includes, cobertura.excludes
-                    
-                    classes_dir = project.compile.target.to_s
-                    if includes.empty? && excludes.empty? 
-                      ant.fileset :dir => classes_dir do 
-                        ant.include :name => "**/*.class"
-                      end
-                    else
-                      includes = [//] if includes.empty?
-                      Dir.glob(File.join(classes_dir, "**/*.class")) do |cls|
-                        cls_name = cls.gsub(/#{classes_dir}\/?|\.class$/, '').gsub('/', '.')
-                        if includes.any? { |p| p === cls_name } && !excludes.any? { |p| p === cls_name }
-                          ant.fileset :file => cls
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-              touch task.to_s, :verbose=>false
-            end
-            
-            task 'instrument' => instrumented
-            
-            # We now have two target directories with bytecode. It would make sense to remove compile.target
-            # and add instrumented instead, but apparently Cobertura only creates some of the classes, so
-            # we need both directories and instrumented must come first.
-            project.test.dependencies.unshift cobertura.instrumented_dir
-            project.test.with Cobertura.requires
-            project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = cobertura.data_file
-            
-            [:xml, :html].each do |format|
-              task format => ['instrument', 'test'] do 
-                info "Creating test coverage reports in #{cobertura.report_to(format)}"
-                Buildr.ant "cobertura" do |ant|
-                  ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
-                  ant.send "cobertura-report", :format=>format, 
-                    :destdir=>cobertura.report_to(format), :datafile=>cobertura.data_file do
-                    cobertura.sources.flatten.each do |src|
-                      ant.fileset(:dir=>src.to_s) if File.exist?(src.to_s)
-                    end
-                  end
-                end
-              end
-            end
-          end
-          
-        end
-
-        project.clean do
-          rm_rf [cobertura.report_to, cobertura.data_file, cobertura.instrumented_dir], :verbose=>false
-        end
-        
-      end
-      
-    end
-
-    class Buildr::Project
-      include CoberturaExtension
-    end
-
-    namespace "cobertura" do
-
-      task "instrument" do
-        Buildr.projects.each do |project|
-          project.cobertura.data_file = data_file
-          project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = data_file
-          instrument_task ="#{project.name}:cobertura:instrument"
-          task(instrument_task).invoke if Rake::Task.task_defined?(instrument_task)
-        end
-      end
-      
-      [:xml, :html].each do |format|
-        report_target = report_to(format)
-        desc "Run the test cases and produce code coverage reports in #{report_target}"
-        task format => ["instrument", "test"] do
-          info "Creating test coverage reports in #{report_target}"
-          Buildr.ant "cobertura" do |ant|
-            ant.taskdef :classpath=>requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
-            ant.send "cobertura-report", :destdir=>report_target, :format=>format, :datafile=>data_file do
-              Buildr.projects.map(&:cobertura).map(&:sources).flatten.each do |src|
-                ant.fileset :dir=>src.to_s if File.exist?(src.to_s)
-              end
-            end
-          end
-        end
-      end
-      
-      task "clean" do
-        rm_rf [report_to, data_file], :verbose=>false
-      end
-    end
-
-    task "clean" do
-      task("cobertura:clean").invoke if Dir.pwd == Rake.application.original_dir
-    end
-
-  end
+if Buildr::VERSION < '1.5'
+  Buildr.application.deprecated "'buildr/cobertura', use 'buildr/java/cobertura' instead"
+  require 'buildr/java/cobertura'
+else
+  raise "#{__FILE__} should be removed since its use is deprecated since version 1.3.4"
 end