buildr 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,19 @@
+1.3.1 (2008-05-19)
+* Added: Downloading files from SFTP server, uploading to HTTP.
+* Added: jibx_bind method to use JiBX for Java<=>XML binding (by David
+Peterson).
+* Changed: Upgraded to Net::SSH 2.0 and Net::SFTP 2.0.
+* Fixed: BUILDR-67 HTTP GET now works with query parameters (Tommy Knowlton).
+* Fixed: BUILDR-68 Now accepting JAVA_HOME setting on OS X (Nathan Hamblen).
+* Fixed: JUnit now accepts java_args and passes these arguments to the JVM
+(only applicable when forking).
+* Fixed: BUILDR-70 JUnit not passing environment variables from the
+:environment option.
+* Fixed: BUILDR-75 Filter now runs if there's a target directory, even if
+there are no source files to copy over, since everyone else just checks
+resources.target for existence before depending on it.
+* Fixed: BUILDR-63 Possible fix.
+
 1.3.0 (2008-04-25)
 * Added: Testing with EasyB (Nicolas Modrzyk).
 * Added: Testing with JBehave (John Layton).

data/NOTICE

@@ -26,6 +26,3 @@ Bitstream Vera is a trademark of Bitstream, Inc.
 
 * ColorCons - http://www.mouserunner.com/
 Copyright (c) 2006 Ken Saunders
-
-* Ultraviolet stylesheets - http://ultraviolet.rubyforge.org
-Copyright (c) 2007 FIX

data/README

@@ -127,47 +127,6 @@ which changes might have broken your build.  To run all the test cases:
 :include:LICENSE
 
 
-== Third-party dependencies
-
-Even though those dependencies aren't shipped with Buildr, Buildr needs 
-the third-party libraries listed below to run. According licenses are 
-bundled under the etc/legal directory (when available).
-
-* Rake - http://rubyforge.org/projects/rake 
-Licensed under MIT/X Consortium
-Copyright 2003, 2004 by Jim Weirich.
-
-* Builder - http://rubyforge.org/projects/builder
-Licensed under MIT/X Consortium
-Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
-
-* net-ssh - http://rubyforge.org/projects/net-ssh
-Licensed under BSD
-Copyright 2004, Jamis Buck (jamis@37signals.com)
-
-* rubyzip - http://rubyforge.org/projects/rubyzip
-Licensed under the Ruby License
-Authors: Thomas Sondergaard (thomas at sondergaard.cc),
-         Technorama Ltd. (oss-ruby-zip at technorama.net),
-extra-field support contributed by Tatsuki Sugiura (sugi at nemui.org)
-
-* highline - http://rubyforge.org/projects/highline
-Licensed under the Ruby License
-Copyright 2005 Gray Productions.
-Copyright 2007 Jeremy Hinegardner.
-
-* antwrap - http://rubyforge.org/projects/antwrap
-Licensed under LGPL
-Copyright Caleb Powell 2007
-
-* rspec - http://rubyforge.org/projects/rspec
-Licensed under MIT/X Consortium
-Copyright 2005-2007 The RSpec Development Team
-
-* xml-simple - http://rubyforge.org/projects/xml-simple
-Licensed under the Ruby License
-Copyright (c) 2003 Maik Schmidt
-
-* ruwiki (archive-tar-minitar) - http://rubyforge.org/projects/ruwiki/
-Licensed under the Ruby License
-Copyright 2004 Mauricio Julio Fernández Pradier and Austin Ziegler
+== Notice
+
+:include:NOTICE

data/Rakefile

@@ -24,9 +24,11 @@ def spec(platform = nil)
     spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'buildr.gemspec'))
     spec.platform = platform
     if platform =~ /java/
-      spec.add_dependency 'ci_reporter', '~> 1.5'
+      spec.add_dependency 'jruby-openssl', '0.2'
+      spec.add_dependency 'ci_reporter', '1.5.1' # must come after builder dependency
     else
-      spec.add_dependency 'rjb', '~>1.1'
+      # Place first on the dependency list, otherwise AntWrap picks the latest RJB.
+      spec.dependencies.unshift Gem::Dependency.new('rjb', ['>=1.1.0', '<= 1.1.2'])
     end
     spec
   end

data/addon/buildr/jibx.rb

@@ -0,0 +1,86 @@
+# 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 'java/java'
+
+
+module Buildr
+
+  # Provides JiBX bytecode enhancement. Require explicitly using <code>require 'buildr/jibx'</code>.
+  module JiBX 
+
+    JIBX_VERSION = '1.1.5'
+    BCEL_VERSION = '5.2'
+    STAX_VERSION = '1.0-2'
+    XPP3_VERSION = '1.1.4c'
+
+    REQUIRES = [ "org.jibx:jibx-bind:jar:#{JIBX_VERSION}",
+      "org.jibx:jibx-run:jar:#{JIBX_VERSION}",
+      "org.apache.bcel:bcel:jar:#{BCEL_VERSION}",
+      "javax.xml.stream:stax-api:jar:#{STAX_VERSION}",
+      "xpp3:xpp3:jar:#{XPP3_VERSION}" ]
+
+    Java.classpath << REQUIRES
+
+    class << self
+
+      def bind(options)
+        rake_check_options options, :classpath, :output, :binding, :target, :verbose, :load
+        artifacts = Buildr.artifacts(options[:classpath]).each { |a| a.invoke }.map(&:to_s) + [options[:output].to_s]
+        binding = file(options[:binding]).tap { |task| task.invoke }.to_s
+
+        Buildr.ant 'jibx' do |ant|
+          ant.taskdef :name=>'bind', :classname=>'org.jibx.binding.ant.CompileTask',
+            :classpath => requires.join(File::PATH_SEPARATOR)
+          ant.bind :verbose => options[:verbose].to_s, :load => options[:load].to_s, :binding=>options[:binding].to_s do
+            ant.classpath :path => artifacts.join(File::PATH_SEPARATOR)
+          end
+        end
+      end
+
+    private
+
+      def requires()
+        @requires ||= Buildr.artifacts(REQUIRES).each { |artifact| artifact.invoke }.map(&:to_s)
+      end
+
+    end
+
+    def jibx_bind(options = nil)
+      
+      # FIXME - add support for :bindingfileset and :classpathset
+      # Note: either :binding or :bindingfileset should be set, and either
+      # :classpath or :classpathset should be set, and options passed to
+      # ant.bind should be adjusted accordingly. At present, only :binding
+      # and :classpath are supported (which should be fine for most!)
+      jibx_options = { :output => compile.target,
+        :classpath => compile.classpath,
+        :binding => path_to(:source, :main, :resources, 'META-INF/binding.xml'),
+        :target => compile.target,
+        :load => false,
+        :verbose => false
+      }
+
+      JiBX.bind jibx_options.merge(options || {})
+    end
+
+  end
+
+  class Project
+    include JiBX 
+  end
+end
+

data/buildr.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr'
-  spec.version        = '1.3.0'
+  spec.version        = '1.3.1'
   spec.author         = 'Apache Buildr'
   spec.email          = "#{spec.name}-user@incubator.apache.org"
   spec.homepage       = "http://incubator.apache.org/#{spec.name}/"
@@ -36,15 +36,15 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project  = 'buildr'
 
   # Tested against these dependencies.
-  spec.add_dependency 'rake',                 '~> 0.8'
-  spec.add_dependency 'builder',              '~> 2.1'
-  spec.add_dependency 'net-ssh',              '~> 1.1'
-  spec.add_dependency 'net-sftp',             '~> 1.1'
-  spec.add_dependency 'rubyzip',              '~> 0.9'
-  spec.add_dependency 'highline',             '~> 1.4'
-  spec.add_dependency 'Antwrap',              '~> 0.7'
-  spec.add_dependency 'rspec',                '~> 1.1'
-  spec.add_dependency 'xml-simple',           '~> 1.0'
-  spec.add_dependency 'archive-tar-minitar',  '~> 0.5'
-  spec.add_dependency 'rubyforge',            '~> 0.4'
+  spec.add_dependency 'rake',                 '0.8.1'
+  spec.add_dependency 'builder',              '2.1.2'
+  spec.add_dependency 'net-ssh',              '2.0.1'
+  spec.add_dependency 'net-sftp',             '2.0.0'
+  spec.add_dependency 'rubyzip',              '0.9.1'
+  spec.add_dependency 'highline',             '1.4.0'
+  spec.add_dependency 'Antwrap',              '0.7.0'
+  spec.add_dependency 'rspec',                '1.1.3'
+  spec.add_dependency 'xml-simple',           '1.0.11'
+  spec.add_dependency 'archive-tar-minitar',  '0.5.2'
+  spec.add_dependency 'rubyforge',            '0.4.5'
 end

data/doc/css/default.css

@@ -94,7 +94,7 @@ th, td {
   background-color: #FFFFFF;
 }
 
-th {
+th, thead td {
   border-bottom: none;
   background-color: #E5E5E5;
   text-align: left;

data/doc/pages/contributing.textile

@@ -115,8 +115,8 @@ $ rake spec
 
 We always @rake spec@ before making a release.
 
-You can also check out the "RSpec report":report.html and "test coverage
-report":coverage/index.html for the current version of Buildr.  And if you want to help us on the journey to 100% test coverage, we'll be ever so grateful!
+You can also check out the "RSpec report":report.html which provides the
+official specification against which we test each release.
 
 
 h2.  Documentation

data/doc/pages/download.textile

@@ -13,6 +13,16 @@ installation scripts.
 
 h2.  Binaries and Source Code
 
+h3. buildr 1.3.0-incubating (2008-05-01)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.3.0-incubating.gem":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.gem | "37758d0a8dabc570799b0a58d23d19f0":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.gem.md5 | "Sig":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.gem.asc |
+| "buildr-1.3.0-java-incubating.gem":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-java-incubating.gem | "6a3a86740077f739c111514e0e2b9e06":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-java-incubating.gem.md5 | "Sig":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-java-incubating.gem.asc |
+| "buildr-1.3.0-incubating.tgz":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.tgz | "acd84ad8c5031962e65b0036f3bc2e76":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.tgz.md5 | "Sig":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.tgz.asc |
+| "buildr-1.3.0-incubating.zip":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.zip | "d85945f05efd0e512e6d769e3dd1cc98":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.zip.md5 | "Sig":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/KEYS)
+
 
 p(note). When downloading from files please check the
 "md5sum":http://www.apache.org/dev/release-signing#md5 and verify the

data/doc/pages/getting_started.textile

@@ -145,21 +145,21 @@ For Linux and OS/X:
 
 {{{!sh
 $ export PATH=$PATH:[path to JRuby]/bin:$JAVA_HOME/bin
-$ gem install buildr
+$ jruby -S gem install buildr
 }}}
 
 For Windows:
 
 {{{!sh
 > set PATH=%PATH%;[path to JRuby]/bin;%JAVA_HOME%/bin
-> gem install buildr
+> jruby -S gem install buildr
 }}}
 
 To upgrade to a new version or install a specific version:
 
 {{{!sh
-$ sudo gem update buildr
-$ sudo gem install buildr -v 1.3.0
+$ jruby -S gem update buildr
+$ jruby -S gem install buildr -v 1.3.0
 }}}
 
 You can also use this script "to install Buildr on

data/doc/pages/index.textile

@@ -30,7 +30,7 @@ write code using variables, functions and objects.
 
 h2.  News
 
-Check out "all that's new in Buildr 1.3":whats_new.html.
+Check out "all that's new in Buildr 1.3.1":whats_new.html.
 
 * Buildr 1.3 now runs on JRuby 1.1
 * Support for building Scala projects

data/doc/pages/whats_new.textile

@@ -1,5 +1,28 @@
 h1.  What's New
 
+h2.  Buildr 1.3.1
+
+* Fixed to specific Gem dependencies, so should install cleanly on Windows.
+* Buildr now supports publishing files to HTTP server for remote repositories
+  that support HTTP uploads (PUT).
+* Buildr now supports reading files from SFTP server and upgrades to 
+  Net::SSH 2.0 and Net::SFTP 2.0.
+* HTTP downloads now accept URLs with query parameters (Tommy Knowlton).
+* On OS X if you are not using the default JDK, you can set the JAVA_HOME
+  environment variable to point to any other JDK (Nathan Hamblen).
+* JUnit properly passes options[:environment] as environment variables to the
+  test case.  In addition options[:java_args] are now passed as arguments to
+  the JVM, for example to set heap size, only applicable when forking (the
+  default mode when running JUnit).
+* Fixed BUILDR-75: Filter now runs if there's a target directory, even if
+  there are no source files to copy over, and creates an empty target
+  directory.  The previous behavior caused some problems with code that checked
+  if resource.target was nil, but didn't check if there are any
+  resource.sources to process.
+* Added the jibx_bind method to use JiBX for Java<=>XML binding (by David
+  Peterson).
+
+
 h2.  Buildr 1.3
 
 h3.  Multiple Languages
@@ -349,13 +372,10 @@ h3.  Other
 
 * Buildr 1.3 upgrades to Rake 0.8, RSpec 1.1, RJB 1.1 and OpenJPA
 1.0.1.  Buildr no longer includes or uses Facets.
-
 * JUnit tests now operate on all compiled test classes that extend
 @junit.framework.TestCase@ or use the @Test@ annotation; TestNG test cases are
 filtered by annotation.  Test cases no longer have to use a specific file name.
-
 * Remote repositories now support HTTP Basic Authentication.
-
 * The prepare task has been removed, if you need to, simply add a prerequisite
 to the compile task.
 
@@ -364,26 +384,19 @@ h3.  Documentation
 
 * The "What's new?":whats_new.html page (this one, actually), summarizes all
 the important new features and changes in each release.
-
 * The "Recipes":recipes.html page (also available in the PDF) lists recipes for
 using Buildr, collected from the mailing list.  Feel free to contribute tips,
 tricks and techniques.
-
 * The "Troubleshooting":troubleshooting.html page (also available in the PDF)
 collects troubleshooting ideas from the mailing list.
-
 * The "Getting Started":getting_started.html has been rewritten to cover all
 you need to know about downloading and installing Buildr on Linux, OS/X,
 Windows and with JRuby (1.1 or later).
-
 * A new "Contributing":contributing.html page has more details on how to file
 bugs, policy for submitting patches, running Buildr test cases, and helping
 with the documentation.
-
 * A new page for "Settings and Profiles":settings_profiles.html.
-
 * The "Extending Buildr":extending.html page that deals with writing your own
 tasks, creating extensions and specifying alternative layouts.
-
-* The site also includes "RSpec report":specs.html and "Test coverage
-report":coverage/index.html.
+* The site also includes "RSpec report":specs.html which provides the official
+  specification against which we test each release.

data/doc/scripts/buildr-git.rb

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env ruby
 # 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
@@ -393,10 +393,11 @@ def perform(options)
     # Create github origin aliases
     `git config alias.get "!git apache-fetch && git fetch origin"`
     `git config alias.mrg "!git apache-merge && git merge origin"`
+    `git config alias.rbs "!git rebase --onto #{svn_branch} origin/master master"`
     `git config alias.put "!git apache-push && git push origin"`
     
     # This is Victor's cronjob
-    `git config alias.synchronize "!git get && git mrg && git put"`
+    `git config alias.synchronize "!git get && git rbs && git put"`
     
     # Final notices.
     puts <<-NOTICE + notice

data/doc/site.toc.yaml

@@ -14,7 +14,7 @@
 # the License.
 
 - Main:  
-  - Welcome: /
+  - Welcome: index.html
   - Download and Installation: download.html
   - Printable PDF: buildr.pdf
   - New: whats_new.html

data/lib/buildr.rb

@@ -18,14 +18,13 @@ $KCODE = 'utf8'
 # in order to work around a bug in jruby (1.0.1 and trunk as of oct11, 2007)
 # needle and net/ssh need to be loaded before -anything- else. please see
 # http://jira.codehaus.org/browse/JRUBY-1188 for more info.
-require 'needle'
 require 'net/ssh'
 
 require 'highline/import'
 require 'builder' # A different kind of buildr, one we use to create XML.
 
 module Buildr
-  VERSION = '1.3.0'.freeze # unless const_defined?(:VERSION)
+  VERSION = '1.3.1'.freeze # unless const_defined?(:VERSION)
 end
 
 require 'buildr/core'

data/lib/buildr/core/application.rb

@@ -173,9 +173,10 @@ module Buildr
         standard_exception_handling do
           find_buildfile
           load_gems
+          load_artifacts
+          load_tasks
           load_buildfile
           top_level
-          load_tasks
         end
       end
       if verbose
@@ -187,6 +188,16 @@ module Buildr
       end
     end
 
+    # Load artifact specs from the build.yaml file, making them available 
+    # by name ( ruby symbols ).
+    def load_artifacts #:nodoc:
+      hash = settings.build['artifacts']
+      return unless hash
+      raise "Expected 'artifacts' element to be a hash" unless Hash === hash
+      # Currently we only use one artifact namespace to rule them all. (the root NS)
+      Buildr::ArtifactNamespace.load(:root => hash)
+    end
+      
     # Load/install all Gems specified in build.yaml file.
     def load_gems #:nodoc:
       missing_deps, installed = listed_gems.partition { |gem| gem.is_a?(Gem::Dependency) }

data/lib/buildr/core/common.rb

@@ -18,7 +18,6 @@ require 'rake'
 require 'tempfile'
 require 'open-uri'
 $LOADED_FEATURES << 'rubygems/open-uri.rb' # avoid loading rubygems' open-uri
-require 'uri/open-sftp'
 require 'buildr/core/util'
 require 'buildr/core/transports'