buildr 1.3.1.1 → 1.3.2

data/CHANGELOG

@@ -1,3 +1,29 @@
+1.3.2 (2008-07-18)
+* Added: --prereqs command line argument to show all tasks and their
+dependencies. You can also follow with regular expression to narrow down the
+list of tasks.
+* Changed: Upgraded to Rubyforge 1.0.0.
+* Changed: BUILDR-86 Use newest versions of net-ssh and net-sftp gems.
+* Changed: BUILDR-88 Test classes/resources should come before compile
+classes/resources so they load up earlier in java classpath.
+* Changed: BUILDR-102 Update JUnit Version to 4.4.
+* Fixed: BUILDR-73 idea7x task incorrect adds target/resources to the sources
+paths.
+* Fixed: BUILDR-76 Added more specs and fixes to compile task.
+* Fixed: BUILDR-77 Layout feature not working.
+* Fixed: BUILDR-79 Remove :source option for Scala compiler
+* Fixed: BUILDR-80 Fix reference to Util#timestamp method on nailgun addon.
+* Fixed: BUILDR-82 Temporary work around for Net::SSH 2.0.2 attempting to
+load Pageant DLLs when running on JRuby/Windows.
+* Fixed: BUILDR-89 JUnit (and all other Java frameworks) no longer include
+abstract classes.
+* Fixed: BUILDR-90 Installing from source doesn't work with JRuby.
+* Fixed: BUILDR-91 When doing a release, buildr should spawn the same version of buildr
+* Fixed: BUILDR-92 IDEA 7x: add resources directories to classpath.
+* Fixed: BUILDR-95: Only download Scala test framework artifacts when required
+* Fixed: BUILDR-100 Directory structure documentation needs updating.
+* Fixed: Installation instructions updated for RubyGems 1.2.0.
+
 1.3.1.1 (2008-06-04)
 * Fixed: BUILDR-78 Broken dependency on Rubyforge Gem.
 

data/NOTICE

@@ -1,12 +1,10 @@
-=========================================================================
-==  NOTICE file for use with the Apache License, Version 2.0,          ==
-==  in this case for the Apache Buildr distribution.                   ==
-=========================================================================
-
 Apache Buildr
+Copyright 2008 The Apache Software Foundation
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+
 COPYRIGHT NOTICES
 -----------------
 Copyright 2007 Intalio

data/README

@@ -130,3 +130,4 @@ which changes might have broken your build.  To run all the test cases:
 == Notice
 
 :include:NOTICE
+

data/Rakefile

@@ -16,7 +16,6 @@
 
 require 'rake/gempackagetask'
 
-
 def spec(platform = nil)
   @specs ||= {}
   platform ||= RUBY_PLATFORM =~ /java/ ? 'java' : 'ruby'
@@ -28,7 +27,7 @@ def spec(platform = nil)
       spec.add_dependency 'ci_reporter', '1.5.1' # must come after builder dependency
     else
       # 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'])
+      spec.dependencies.unshift Gem::Dependency.new('rjb', '1.1.2')
     end
     spec
   end
@@ -54,7 +53,7 @@ ENV['incubating'] = 'true'
 ENV['staging'] = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
 
 task 'apache:license'=>spec.files
-task('apache:license').prerequisites.exclude('doc/css/syntax.css')
+#task('apache:license').prerequisites.exclude( ..not ASL.. )
 
 task 'spec:check' do
   print 'Checking that we have JRuby, Scala and Groovy available ... '
@@ -63,3 +62,5 @@ task 'spec:check' do
   fail 'Full testing requires Groovy!' unless which('groovy')
   puts 'OK'
 end
+
+

data/addon/buildr/nailgun.rb

@@ -315,6 +315,7 @@ module Buildr
     end
 
     module Util
+      extend Buildr::Util
       extend self
 
       def find_buildfile(pwd, candidates, nosearch=false)
@@ -457,7 +458,7 @@ module Buildr
         end
 
         def last_modification
-          File.timestamp(path)
+          Util.timestamp(path)
         end
         
         def should_be_loaded?
@@ -841,7 +842,7 @@ module Buildr
         puts "Starting #{$nailgun_server}"
         $nailgun_server.start_server
 
-        is_win = Buildr::Util.win_os?
+        is_win = Util.win_os?
         bin_path = File.expand_path(installed_bin.to_s.pathmap("%d"))
         bin_name = installed_bin.to_s.pathmap("%f")
 

data/addon/buildr/xmlbeans.rb

@@ -78,7 +78,7 @@ module Buildr
         verbose(false) do
           base = generated.to_s
           FileList["#{base}/**/*.{class,xsb,xsd}"].each do |file|
-            target = File.join(compile.target.to_s, Util.relative_path(base, file))
+            target = File.join(compile.target.to_s, Util.relative_path(file, base))
             mkpath File.dirname(target) ; cp file, target
           end
         end

data/buildr.gemspec

@@ -16,14 +16,14 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr'
-  spec.version        = '1.3.1.1'
+  spec.version        = '1.3.2'
   spec.author         = 'Apache Buildr'
   spec.email          = "#{spec.name}-user@incubator.apache.org"
   spec.homepage       = "http://incubator.apache.org/#{spec.name}/"
   spec.summary        = 'A build system that doesn\'t suck'
 
   spec.files          = FileList['lib/**/*', 'addon/**/*', 'README', 'CHANGELOG', 'LICENSE', 'NOTICE', 'DISCLAIMER', 'KEYS',
-                                 '*.gemspec', 'Rakefile', 'rakelib/**/*', 'spec/**/*', 'doc/**/*'].to_ary
+                         '*.gemspec', 'Rakefile', 'rakelib/**/*', 'spec/**/*', 'doc/**/*']
   spec.require_paths  = ['lib', 'addon']
   spec.bindir         = 'bin'                               # Use these for applications.
   spec.executable     = 'buildr'
@@ -38,14 +38,14 @@ Gem::Specification.new do |spec|
   # Tested against these dependencies.
   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 'net-ssh',              '2.0.3'
+  spec.add_dependency 'net-sftp',             '2.0.1'
   spec.add_dependency 'rubyzip',              '0.9.1'
   spec.add_dependency 'highline',             '1.4.0'
-  spec.add_dependency 'rubyforge',            '0.4.5'
-  spec.add_dependency 'hoe',                  '1.3.0'
+  spec.add_dependency 'rubyforge',            '1.0.0'
+  spec.add_dependency 'hoe',                  '1.6.0'
   spec.add_dependency 'Antwrap',              '0.7.0'
-  spec.add_dependency 'rspec',                '1.1.3'
+  spec.add_dependency 'rspec',                '1.1.4'
   spec.add_dependency 'xml-simple',           '1.0.11'
   spec.add_dependency 'archive-tar-minitar',  '0.5.2'
 end

data/doc/css/syntax.css

@@ -1,43 +1,52 @@
-/**
- * From Syntax, Copyright © 2005 Jamis Buck
+/* 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.
  */
 
+
 .ruby .normal   {}
-.ruby .comment  { color: #7f7f7f; }
-.ruby .keyword  { color: #153582; font-weight: bold; }
-.ruby .method   { color: #066; }
-.ruby .class    { color: #074; }
-.ruby .module   { color: #050; }
-.ruby .punct    { color: #447; font-weight: bold; }
-.ruby .symbol   { color: #099; }
-.ruby .string   { color: #944; background: #FFE; }
-.ruby .char     { color: #F07; }
-.ruby .ident    { color: #004; }
-.ruby .constant { color: #07F; }
-.ruby .regex    { color: #B66; background: #FEF; }
-.ruby .number   { color: #F99; }
-.ruby .attribute { color: #7BB; }
-.ruby .global   { color: #7FB; }
-.ruby .expr     { color: #227; }
-.ruby .escape   { color: #277; }
+.ruby .comment  { color: gray; }
+.ruby .method   { color: lightblue; }
+.ruby .punct    {  color: darkblue; }
+.ruby .keyword, .ruby .symbol   { color: blue; }
+.ruby .string, .ruby .regex { color: green; }
+.ruby .char     { }
+.ruby .ident    { color: black; }
+.ruby .constant, ruby .class, ruby .module { color: darkblue; }
+.ruby .number   { color: blue; }
+.ruby .attribute { }
+.ruby .global   { }
+.ruby .expr     { }
+.ruby .escape   { }
 
 .xml .normal    {}
-.xml .namespace { color: #B66; font-weight: bold; }
-.xml .tag       { color: #4c00ff; }
-.xml .comment   { color: #7f7f7f; }
-.xml .punct     { color: #447; font-weight: bold; }
-.xml .string    { color: #944; }
-.xml .number    { color: #F99; }
-.xml .attribute { color: #BB7; }
+.xml .namespace { color: darkblue; }
+.xml .tag       { color: blue; }
+.xml .comment   { color: gray; }
+.xml .punct     { color: darkblue; }
+.xml .string    { }
+.xml .number    { }
+.xml .attribute { color: blue; }
 
 .yaml .document { }
 .yaml .type     { }
-.yaml .key      { color: #4c00ff}
-.yaml .comment  { color: #7f7f7f; }
-.yaml .punct    { }
+.yaml .key      { color: blue; }
+.yaml .comment  { color: gray; }
+.yaml .punct    { color: darkblue; }
 .yaml .string   { }
 .yaml .number   { }
 .yaml .time     { }
 .yaml .date     { }
-.yaml .ref      { color: #00c0c0 }
-.yaml .anchor   { color: #00c0c0 }
+.yaml .ref      { color: green; }
+.yaml .anchor   { color: green; }

data/doc/pages/building.textile

@@ -249,7 +249,6 @@ also override this by setting the environment variable @debug@ to @off@. |
 program. |
 | @:other@        | Array of options passed to the compiler (e.g.
 @:other=>'-Xprint-types'@). |
-| @:source@       | Source code compatibility (e.g. '1.5'). |
 | @:target@       | Bytecode compatibility (e.g. '1.4'). |
 | @:warnings@     | Issue warnings when compiling.  True when running in verbose
 mode. |

data/doc/pages/contributing.textile

@@ -55,6 +55,8 @@ Did we mention Buildr is an open source project?  In fact, when you install
 Buildr you get all the source code, documentation, test case and everything you
 need to use it, extend it and patch it.  Have a look in your Gem directory.
 
+h4. Using SVN
+
 But if you want to work with the latest and greatest, you'll want to check out
 "Buildr from SVN":http://svn.apache.org/repos/asf/incubator/buildr:
 
@@ -65,13 +67,31 @@ $ svn co http://svn.apache.org/repos/asf/incubator/buildr/trunk buildr
 You can also browse the "Buildr
 repository":http://svn.apache.org/repos/asf/incubator/buildr.
 
+h4. Using Git
+
 Not a fan SVN?  We understand.  You can also grab a copy of "Buildr from
-Github":http://github.com/vic/buildr/tree/master:
+GitHub":http://github.com/vic/buildr/tree/master:
 
 {{{!sh
 $ git clone git://github.com/vic/buildr.git
 }}}
 
+The GitHub repository is maintained by contributors to this project, but is
+*not* an official Apache repository.  To obtain Buildr from the official Apache
+repository, consider using @giv-svn@ instead.
+
+If you want to learn more about Git, you can start by watching Scott Chacon’s
+"Git presentation":http://en.oreilly.com/rails2008/public/asset/attachment/2816
+(PDF), or any of the "Git screencasts":http://www.gitcasts.com/.  For more,
+there's also the "Git Internals
+book":http://peepcode.com/products/git-internals-pdf.
+
+And keep this "Git cheat
+sheet":http://ktown.kde.org/~zrusin/git/git-cheat-sheet-medium.png handy at
+hand. Very useful.
+
+h4. Installing from Source
+
 To install Buildr from the source directory:
 
 {{{!sh

data/doc/pages/download.textile

@@ -4,15 +4,28 @@ h1. Download
 h2.  Installing Buildr
 
 The easiest way to install Buildr is using the fabulous RubyGems package
-manager.  Of course, you will need either Ruby or JRuby, and we recommend a
-recent version of RubyGems and if this sounds foreign to you, don't worry.
-We'll show you how to install Buildr on Linux, OS/X, Windows and JRuby in the
-"Getting Started guide":getting_started.html, we even provide automated
-installation scripts.
+manager.  Of course, you will need either Ruby or JRuby, and we recommend
+upgrading to the most recent version of RubyGems.  If this sounds foreign to
+you, don't worry.  We'll show you how to install Buildr on Linux, OS/X, Windows
+and JRuby in the "Getting Started guide":getting_started.html, we even provide
+automated installation scripts.
+
+The *official Apache distribution* consists of the digitally signed binaries
+(gems) and source packages "available below":#binaries_and_source_code.  To
+install these binaries, you must first download them to disk and then install
+them using the @gem install@ command (or @rake install@ for a source
+distribution).
+
+In addition, contributors to this project maintain a separate distribution over
+on "RubyForge":http://rubyforge.org/projects/buildr.  Using this distribution,
+you're able to install Buildr directly from the remote gem repository and to
+automatically upgrade when a new release comes out.  The RubyForge distribution
+is *not* an official Apache distribution.
 
 
 h2.  Binaries and Source Code
 
+
 h3. buildr 1.3.1-incubating (2008-05-19)
 
 |_. Package |_. MD5 Checksum |_. PGP |

data/doc/pages/getting_started.textile

@@ -3,12 +3,16 @@ h1. Getting Started
 h2.  Installing Buildr
 
 The installation instructions are slightly different for each operating system.
-If you are using Ruby, pick the one that best matches your operating system and
-target platform.
+Pick the one that best matches your operating system and target platform.
 
-p(note).  The current release of Buildr for Ruby does not work with Java 6 and
-can only be used with Java 1.5 or earlier.  "Buildr for JRuby":#jruby works
-nicely with Java 6, consider using that instead.
+The @gem install@ and @gem update@ commands install Buildr from a binary
+distribution provided through "RubyForge":http://rubyforge.org/projects/buildr.
+This distribution is maintained by contributors to this project, but is *not*
+an official Apache distribution.  You can obtain the official Apache
+distribution files from the "download page":download.html.
+
+The current release of Buildr for Ruby may not work well with Java 6, only
+Java 1.5 or earlier.  If you need to use Java 6, consider "Buildr for JRuby":#jruby.
 
 
 h3.  Linux
@@ -34,9 +38,9 @@ The Debian package for @rubygems@ will not allow you to install Buildr, so you
 need to install RubyGems from source:
 
 {{{!sh
-$ curl -OL http://rubyforge.org/frs/download.php/29548/rubygems-1.0.1.tgz
-$ tar xzf rubygems-1.0.1.tgz
-$ cd rubygems-1.0.1
+$ wget http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz 
+$ tar xzf rubygems-1.2.0.tgz
+$ cd rubygems-1.2.0
 $ sudo ruby setup.rb
 $ sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
 }}}
@@ -200,7 +204,7 @@ you are using by default.  If you see @(JRuby ...)@, Buildr is running on that
 version of JRuby.
 
 
-h2. Conventions
+h2. Document Conventions
 
 Lines that start with @$@ are command lines, for example:
 
@@ -320,10 +324,17 @@ method before the project or task definition.
 So next let's talk about "projects":projects.html.
 
 
-h2. More Info
+h2. Learning More
+
+*Ruby*  It pays to pick up Ruby as a second (or first) programming language.
+It's fun, powerful and slightly addictive.  If you're interested in learning
+Ruby the language, a good place to start is "Programming Ruby: The Pragmatic
+Programmer's Guide":http://www.pragprog.com/titles/ruby/programming-ruby,
+fondly known as the _Pickaxe book_.
 
-*API* The "Buildr API":http://incubator.apache.org/buildr/rdoc/index.html
-documentation.
+For a quicker read (and much more humor), "Why’s (Poignant) Guide to
+Ruby":http://poignantguide.net/ruby/ is available online.  More resources are
+listed on the "ruby-lang web site":http://www.ruby-lang.org/en/documentation/.
 
 *Rake* Buildr is based on Rake, a Ruby build system that handles tasks and
 dependencies.  Check out the "Rake documentation":http://docs.rubyrake.org/ for

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.1":whats_new.html.
+Check out "all that's new in Buildr 1.3.2":whats_new.html.
 
 * Buildr 1.3 now runs on JRuby 1.1
 * Support for building Scala projects

data/doc/pages/packaging.textile

@@ -508,13 +508,16 @@ Of course, you'll need to tell Buildr about the release server:
 repositories.release_to = 'sftp://john:secret@release/usr/share/repo'
 }}}
 
-We're using the SFTP protocol, currently the only protocol Buildr uses for
-uploads.  The URL contains the release server ("release"), path to repository
-("user/share/repo") and username/password for access.  The way SFTP works, you
-specify the path on the release server, and give the user permissions to create
-directories and files inside the repository.  The file system path is different
-from the path you use to download these artifacts through an HTTP server, and
-starts at the root, not the user's home directory.
+This example uses the SFTP protocol.  In addition, you can use the HTTP
+protocol -- Buildr supports HTTP and HTTPS, Basic Authentication and uploads
+using PUT -- or point to a directory on your file system.
+
+The URL in this example contains the release server ("release"), path to
+repository ("user/share/repo") and username/password for access.  The way SFTP
+works, you specify the path on the release server, and give the user
+permissions to create directories and files inside the repository.  The file
+system path is different from the path you use to download these artifacts
+through an HTTP server, and starts at the root, not the user's home directory.
 
 Of course, you'll want to specify the release server URL in the Buildfile, but
 leave the username/password settings private in your local @buildr.rb@ file.

data/doc/pages/projects.textile

@@ -79,9 +79,9 @@ projects.
 
 Java projects are laid out so the source files are in the @src/main/java@
 directory and compile into the @target/classes@ directory.  Resource files go
-in the @src/main/resources@ directory, also copied over to @target/classes@.
-Likewise, unit tests come from @src/test/java@ and @src/test/resources@, and
-end life in @target/test/classes@.
+in the @src/main/resources@ directory, and copied over to @target/resources@.
+Likewise, tests come from @src/test/java@ and @src/test/resources@, and end
+life in @target/test/classes@ and @target/test/resources@, respectively.
 
 WAR packages pick up additional files from the aptly named @src/main/webapp@.
 And most stuff, including generated source files are parked under the @target@

data/doc/pages/whats_new.textile

@@ -1,5 +1,24 @@
 h1.  What's New
 
+h2.  Buildr 1.3.2
+
+* New @--prereqs@ command line argument lists all the tasks and their
+  dependencies. You can also filter specific tasks by following with a regular
+  expression, for example, @--prereqs foo@.
+* Upgraded to latest release of Net::SSH, Net::SFTP, RubyForge and RubyGems.
+* Upgraded to JUnit 4.4 and fixed case where abstract classes extending
+  TestCase would lead to tests failing.
+* The target/test/class and /resources directories now come first in the
+  classpath, ahead of any code compiled code and resources copied over from
+  src/main.
+* Fixed: BUILDR-90 Installing from source doesn't work with JRuby.
+* Fixed: BUILDR-91 When doing a release, buildr should spawn the same version
+  of buildr
+* Fixed: BUILDR-92 IDEA 7x: add resources directories to classpath.
+* Fixed: BUILDR-95: Only download Scala test framework artifacts when required
+* Fixed: BUILDR-100 Directory structure documentation needs updating.
+* Fixed: Installation instructions updated for RubyGems 1.2.0.
+
 h2.  Buildr 1.3.1
 
 * Fixed to specific Gem dependencies, so should install cleanly on Windows.