buildr 1.3.5-java → 1.4.0-java

data/addon/buildr/javacc.rb

@@ -54,19 +54,19 @@ module Buildr
 
     def javacc(*args)
       if Hash === args.last
-        options = args.pop 
+        options = args.pop
         in_package = options[:in_package].split(".")
       else
         in_package = []
       end
       file(path_to(:target, :generated, :javacc)=>args.flatten) do |task|
         JavaCC.javacc task.prerequisites, :output=>File.join(task.name, in_package)
-      end         
+      end
     end
 
     def jjtree(*args)
       if Hash === args.last
-        options = args.pop 
+        options = args.pop
         in_package = options[:in_package].split(".")
         build_node_files = options[:build_node_files]
       else
@@ -74,7 +74,7 @@ module Buildr
       end
       file(path_to(:target, :generated, :jjtree)=>args.flatten) do |task|
         JavaCC.jjtree task.prerequisites, :output=>File.join(task.name, in_package), :build_node_files=>build_node_files
-      end         
+      end
     end
 
   end

data/addon/buildr/jetty.rb

@@ -46,15 +46,15 @@ module Buildr
     # Which version of Jetty we're using by default (change with options.jetty.version).
     VERSION = "6.1.3"
     SLF4J_VERSION = "1.4.3"
-    
+
     # Libraries used by Jetty.
     REQUIRES = [ "org.mortbay.jetty:jetty:jar:#{VERSION}", "org.mortbay.jetty:jetty-util:jar:#{VERSION}",
-      "org.mortbay.jetty:servlet-api-2.5:jar:#{VERSION}", "org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}", 
+      "org.mortbay.jetty:servlet-api-2.5:jar:#{VERSION}", "org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}",
       "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}", "org.slf4j:jcl104-over-slf4j:jar:#{SLF4J_VERSION}" ]
-     
+
     Java.classpath <<  REQUIRES
     Java.classpath << File.dirname(__FILE__)
-    
+
     # Default URL for Jetty (change with options.jetty.url).
     URL = "http://localhost:8080"
 
@@ -135,7 +135,7 @@ module Buildr
           response = http.request_get("/buildr/")
           response.is_a?(Net::HTTPSuccess) && response.body =~ /Alive/
         end
-      rescue Errno::ECONNREFUSED, Errno::EBADF 
+      rescue Errno::ECONNREFUSED, Errno::EBADF
         false
       end
     end

data/addon/buildr/nailgun.rb

@@ -21,18 +21,18 @@ require 'buildr/drb'
 
 
 module Buildr
-  
+
   # This addon is provided for fast interaction with a DRb BuildrServer (buildr/drb).
-  # 
+  #
   # This module delegates task invocation to the BuildrServer, it only implements
   # nailgun required logic (server/client).
   #
   # Usage:
   #
   #   buildr -r buildr/nailgun nailgun:start
-  # 
+  #
   # Once the server has been started you can invoke tasks using the nailgun client
-  # installed on $JRUBY_HOME/tool/nailgun. It's recommended to add this path to 
+  # installed on $JRUBY_HOME/tool/nailgun. It's recommended to add this path to
   # your PATH environment variable, so that the ng command is available at any dir.
   #
   #   ng build # invoke the build task
@@ -46,12 +46,12 @@ module Buildr
     ARTIFACT_SPEC = "com.martiansoftware:nailgun:jar:#{VERSION}"
     PORT = DRbApplication::PORT + 2
     ADDON_BIN = File.dirname(__FILE__)
-    
+
     # Returns the path to JRUBY_HOME.
     def jruby_home
       ENV['JRUBY_HOME'] || Config::CONFIG['prefix']
     end
-    
+
     # Returns the path to NAILGUN_HOME.
     def nailgun_home
       ENV['NAILGUN_HOME'] || File.expand_path('tool/nailgun', jruby_home)
@@ -109,17 +109,17 @@ module Buildr
         stdout = Util.ctor(org.jruby.RubyIO, runtime, java.io.OutputStream => nail.out)
         stderr = Util.ctor(org.jruby.RubyIO, runtime, java.io.OutputStream => nail.err)
         stdin = Util.ctor(org.jruby.RubyIO, runtime, java.io.InputStream => nail.in)
-        
+
         dir = nail.getWorkingDirectory
         argv = [nail.command] + nail.args
-        
+
         DRbApplication.remote_run :dir => dir, :argv => argv,
                                   :in => stdin, :out => stdout, :err => stderr
       rescue => e
         nail.err.println e unless SystemExit === e
         nail.exit 1
       end
-      
+
     end # Client
 
     module Server
@@ -131,24 +131,24 @@ module Buildr
 
       def start
         self.allow_nails_by_class_name = false
-        
+
         NGClient::Main.nail = NGClient.new
         self.default_nail_class = NGClient::Main
-        
+
         @thread = java.lang.Thread.new(self)
         @thread.setName(to_s)
         @thread.start
-        
+
         sleep 1 while getPort == 0
         info "#{self} Started."
       end
-      
+
       def stop
         @thread.kill
       end
 
       def to_s
-        version = "Buildr #{Buildr::VERSION} #{RUBY_PLATFORM[/java/] && '(JRuby '+JRUBY_VERSION+')'}"
+        version = "Buildr #{Buildr::VERSION} #{RUBY_PLATFORM[/java/] && '(JRuby '+ (Buildr.settings.build['jruby'] || JRUBY_VERSION) +')'}"
         self.class.name+'('+[version, @host, @port].join(', ')+')'
       end
     end # Server
@@ -157,13 +157,13 @@ module Buildr
 
       dist_zip = Buildr.download(tmp_path(NAME + '.zip') => URL)
       dist_dir = Buildr.unzip(tmp_path(NAME) => dist_zip)
-      
+
       nailgun_jar = file(tmp_path(NAME, NAME, NAME + '.jar'))
       nailgun_jar.enhance [dist_dir] unless File.exist?(nailgun_jar.to_s)
 
       attr_reader :artifact
       @artifact = Buildr.artifact(ARTIFACT_SPEC).from(nailgun_jar)
-      
+
       compiled_bin = file(tmp_path(NAME, NAME, 'ng' + Config::CONFIG['EXEEXT']) => dist_dir.target) do |task|
         unless task.to_s.pathmap('%x') == '.exe'
           Dir.chdir(task.to_s.pathmap('%d')) do
@@ -197,25 +197,25 @@ module Buildr
         server.start
       end
 
-      task('setup' => artifact) do 
+      task('setup' => artifact) do
         module Util
           include Buildr::Util
         end
-        
+
         Util.add_to_sysloader artifact.to_s
         Util.add_to_sysloader ADDON_BIN
-        
+
         class NGClient
           include org.apache.buildr.BuildrNail
           include Client
         end
-        
+
         class NGServer < com.martiansoftware.nailgun.NGServer
           include Server
-        end      
+        end
       end
-      
+
     end # ng_tasks
-      
+
   end # module Nailgun
 end

data/addon/buildr/openjpa.rb

@@ -26,7 +26,7 @@ module Buildr
 
     REQUIRES = [ "org.apache.openjpa:openjpa:jar:#{VERSION}",
       "commons-collections:commons-collections:jar:3.1",
-      "commons-dbcp:commons-dbcp:jar:1.2.1", 
+      "commons-dbcp:commons-dbcp:jar:1.2.1",
       "commons-lang:commons-lang:jar:2.1",
       "commons-pool:commons-pool:jar:1.2",
       "javax.persistence:persistence-api:jar:1.0",

data/addon/buildr/protobuf.rb

@@ -0,0 +1,75 @@
+# 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
+  # Provides Protocol buffer code generation tasks. Require explicitly using <code>require "buildr/protobuf"</code>.
+  module Protobuf
+    class << self
+      def protoc(*args)
+        options = Hash === args.last ? args.pop : {}
+        rake_check_options options, :output, :lang, :include
+
+        options[:lang] ||= :java
+        options[:output] ||= File.expand_path "target/generated/protoc"
+        options[:include] ||= []
+
+        command_line = []
+
+        command_line << "--#{options[:lang]}_out=#{options[:output]}" if options[:output]
+
+        (paths_from_sources(*args) + options[:include]).each { |i| command_line << "-I#{i}" }
+
+        command_line += files_from_sources(*args)
+
+        mkdir_p( options[:output] )
+
+        system protoc_path, *command_line
+      end
+
+      def protoc_path
+        ENV['PROTOC'] || "protoc"
+      end
+
+      def files_from_sources(*args)
+        args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "/**/*.proto"] : f }.flatten
+      end
+
+      def paths_from_sources(*args)
+        args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? f : File.dirname(f) }
+      end
+    end
+
+    def protoc(*args)
+      if Hash === args.last
+        options = args.pop
+      else
+        options = {}
+      end
+
+      options[:output] ||= path_to(:target, :generated, :protoc)
+      options[:lang] ||= compile.language if compile.language
+
+      file(options[:output]=>Protobuf.files_from_sources(*args)) do |task|
+        Protobuf.protoc task.prerequisites, options
+      end
+    end
+
+  end
+
+  class Project
+    include Protobuf
+  end
+end

data/addon/buildr/xmlbeans.rb

@@ -23,12 +23,12 @@ module Buildr
   # Provides XMLBeans schema compiler. Require explicitly using <code>require "buildr/xmlbeans"</code>.
   #
   #   require 'buildr/xmlbeans'
-  #   define 'some_proj' do 
+  #   define 'some_proj' do
   #      compile_xml_beans _(:source, :main, :xsd) # the directory with *.xsd
   #   end
   module XMLBeans
 
-    # You can use ArtifactNamespace to customize the versions of 
+    # You can use ArtifactNamespace to customize the versions of
     # <code>:xmlbeans</code> or <code>:stax</code> used by this module:
     #
     #   require 'buildr/xmlbeans'
@@ -37,7 +37,7 @@ module Buildr
       ns.xmlbeans! 'org.apache.xmlbeans:xmlbeans:jar:2.3.0', '>2'
       ns.stax_api! 'stax:stax-api:jar:>=1.0.1'
     end
-    
+
     class << self
 
       def compile(*args)
@@ -48,7 +48,7 @@ module Buildr
         Buildr.ant "xmlbeans" do |ant|
           ant.taskdef :name=>"xmlbeans", :classname=>"org.apache.xmlbeans.impl.tool.XMLBean",
             :classpath=>requires.join(File::PATH_SEPARATOR)
-          ant.xmlbeans :srconly=>"true", :srcgendir=>options[:output].to_s, :classgendir=>options[:output].to_s, 
+          ant.xmlbeans :srconly=>"true", :srcgendir=>options[:output].to_s, :classgendir=>options[:output].to_s,
             :javasource=>options[:javasource] do
             args.flatten.each { |file| ant.fileset File.directory?(file) ? { :dir=>file } : { :file=>file } }
           end
@@ -58,7 +58,7 @@ module Buildr
       end
 
       def requires()
-        @requires ||= REQUIRES.artifacts.each(&:invoke).map(&:to_s)
+        @requires ||= REQUIRES.artifacts
       end
     end
 

data/buildr.buildfile

@@ -22,14 +22,14 @@ repositories.remote << 'http://scala-tools.org/repo-releases/'
 
 
 define 'buildr' do
-  compile.using :source=>'1.4', :target=>'1.4', :debug=>false
+  compile.using :source=>'1.5', :target=>'1.5', :debug=>false
 
   define 'java' do
     compile.using(:javac).from(FileList['lib/buildr/java/**/*.java']).into('lib/buildr/java')
   end
 
   define 'scala' do
-    compile.using(:scalac).from(FileList['lib/buildr/scala/**/*.scala']).into('lib/buildr/scala')
+    compile.using(:javac).from(FileList['lib/buildr/scala/**/*.java']).into('lib/buildr/scala')
   end
 
   desc 'Buildr extra packages (Antlr, Cobertura, Hibernate, Javacc, JDepend, Jetty, OpenJPA, XmlBeans)'

data/buildr.gemspec

@@ -16,11 +16,11 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr'
-  spec.version        = '1.3.5'
+  spec.version        = '1.4.0'
   spec.author         = 'Apache Buildr'
   spec.email          = "users@buildr.apache.org"
   spec.homepage       = "http://buildr.apache.org/"
-  spec.summary        = "A build system that doesn't suck"
+  spec.summary        = "Build like you code"
   spec.description    = <<-TEXT
 Apache Buildr is a build system for Java-based applications, including support
 for Scala, Groovy and a growing number of JVM languages and tools.  We wanted
@@ -33,7 +33,7 @@ for those one-off tasks, with a language that's a joy to use.
   # Rakefile needs to create spec for both platforms (ruby and java), using the
   # $platform global variable.  In all other cases, we figure it out from RUBY_PLATFORM.
   spec.platform       = $platform || RUBY_PLATFORM[/java/] || 'ruby'
-  
+
   spec.files          = Dir['{addon,bin,doc,etc,lib,rakelib,spec}/**/*', '*.{gemspec,buildfile}'] +
                         ['LICENSE', 'NOTICE', 'CHANGELOG', 'README.rdoc', 'Rakefile', '_buildr', '_jbuildr']
   spec.require_paths  = 'lib', 'addon'
@@ -53,12 +53,13 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'net-sftp',             '2.0.2'
   spec.add_dependency 'rubyzip',              '0.9.1'
   spec.add_dependency 'highline',             '1.5.1'
-  spec.add_dependency 'rubyforge',            '1.0.5'
+  spec.add_dependency 'json_pure',            '1.4.0'
+  spec.add_dependency 'rubyforge',            '2.0.3'
   spec.add_dependency 'hoe',                  '2.3.3'
-  spec.add_dependency 'rjb',                  '1.1.9' if spec.platform.to_s == 'ruby'
-  spec.add_dependency 'rjb',                  '1.1.6' if spec.platform.to_s == 'x86-mswin32'
+  spec.add_dependency 'rjb',                  '1.2.5' if spec.platform.to_s == 'ruby'
+  spec.add_dependency 'rjb',                  '1.2.5' if spec.platform.to_s == 'x86-mswin32' 
   spec.add_dependency 'Antwrap',              '0.7.0'
-  spec.add_dependency 'rspec',                '1.2.8'
+  spec.add_dependency 'rspec',                '>= 1.2.9'
   spec.add_dependency 'xml-simple',           '1.0.12'
   spec.add_dependency 'archive-tar-minitar',  '0.5.2'
   spec.add_dependency 'jruby-openssl',        '0.5.2' if spec.platform.to_s == 'java'

data/doc/_layouts/default.html

@@ -15,8 +15,8 @@
   <body>
     <div id='wrap'>
       <div id='header'>
-        <a href='http://buildr.apache.org/' title="The build system that doesn't suck"><img alt='buildr' src='images/buildr.png'></a>
-        <div class='tagline'>The build system that doesn't suck</div>
+        <a href='http://buildr.apache.org/' title="Build like you code"><img alt='buildr' src='images/buildr.png'></a>
+        <div class='tagline'>Build like you code</div>
       </div>
       <div id='pages'>
         <ol class='toc'>

data/doc/artifacts.textile

@@ -52,7 +52,7 @@ p(note). Buildr projects also define a @group@ attribute which can lead to some
 If you have several artifacts you always use together, consider placing them in an array.  Methods that accept lists of artifacts also accept arrays.  For example:
 
 {% highlight ruby %}
-OPENJPA = ['org.apache.openjpa:openjpa-all:jar:0.9.7',
+OPENJPA = ['org.apache.openjpa:openjpa:jar:1.2.1',
   'net.sourceforge.serp:serp:jar:1.12.0']
 AXIS_OF_WS = [AXIS2, AXIOM]
 
@@ -125,7 +125,7 @@ You can choose to relocate the local repository by giving it a different path, f
 repositories.local = '/usr/local/maven/repository'
 {% endhighlight %}
 
-That's one change you don't want to commit into the Buildfile, so the best place to do it is in your home directory's @buildr.rb@ file.
+That's one change you don't want to commit into the Buildfile, so the best place to do it is in the @buildr.rb@ file in the @.buildr@ directory under your home directory.
 
 Buildr downloads artifacts when it needs to use them, for example, to compile a project.  You don't need to download artifacts directly.  Except when you do, for example, if you want to download all the latest artifacts and then go off-line.  It's as simple as:
 
@@ -139,7 +139,7 @@ h2(#downloading). Downloading Artifacts
 Within your buildfile you can download artifacts directly by invoking them, for example:
 
 {% highlight ruby %}
-artifact('org.apache.openjpa:openjpa-all:jar:0.9.7').invoke
+artifact('org.apache.openjpa:openjpa:jar:1.2.1').invoke
 artifacts(OPENJPA).each(&:invoke)
 {% endhighlight %}
 
@@ -208,4 +208,4 @@ upload bean
 p(tip).  Calling the @install@ (and likewise @upload@) method on an artifact run @buildr install@.  If you need to download and install an artifact, invoke the task directly with @install(<artifact>).invoke@.
 
 
-Next we're going to "package some artifacts":packaging.html.
+We'll talk more about installing and uploading in the next chapter, but right now we're going to "package some artifacts":packaging.html.

data/doc/building.textile

@@ -25,7 +25,7 @@ Buildr uses file tasks to handle dependencies, but here we're talking about the
 
 An easier way to specify dependencies is by calling the @compile.with@ method. It takes a list of arguments and adds them to the dependency list.  The @compile.with@ method is easier to use, it accepts several type of dependencies.  You can use file names, file tasks, projects, artifacts specifications and even pass arrays of dependencies.
 
-Most dependencies fall into the last three categories.  When you pass a project to @compile.with@, it picks up all the packages created by that project.  In doing so, it establishes an order of dependency between the two projects (see "Defining the Project":projects.html#defining).  For example, if you make a change in project _teh-api_ and build _teh-impl_, Buildr will detect that change, recompile and package _teh-api_ before compiling _teh-impl_.  You can also select a specific package using the @package@ or @packages@ methods (see "Packaging":packaging.html).
+Most dependencies fall into the last three categories.  When you pass a project to @compile.with@, it picks up all the packages created by that project.  In doing so, it establishes an order of dependency between the two projects (see "Defining the Project":projects.html#defining).  For example, if you make a change in project _teh-api_ and build _teh-impl_, Buildr will detect that change, recompile and package _teh-api_ before compiling _teh-impl_.  You can also select a specific package using the project's @package@ or @packages@ methods (see "Packaging":packaging.html).
 
 When you pass an artifact specification to @compile.with@, it creates an @Artifact@ task that will download that artifact from one of the remote repositories, install it in the local repository, and use it in your project. Rake's dependency mechanism is used here to make sure the artifact is downloaded once, when needed.  Check the "Artifacts":artifacts.html section for more information about artifact specification and repositories.
 
@@ -115,7 +115,7 @@ The default source and target directories, compiler settings and other options y
 h2(#resources). Resources
 
 
-The @compile@ task comes bundled with a @resources@ task.  It copies files from the @src/main/resources@ directory into @target/resources@.  Best used for copying files that you want to included in the generated code, like configuration files, i18n messages, images, etc.
+The @compile@ task comes bundled with a @resources@ task.  It copies files from the @src/main/resources@ directory into @target/resources@.  Best used for copying files that you want to include in the generated code, like configuration files, i18n messages, images, etc.
 
 The @resources@ task uses a filter that can change files as it copies them from source to destination.  The most common use is by mapping values using a hash. For example, to substitute "${version}" for the project's version number and "${copyright}" for "Acme Inc (C) 2007" :
 
@@ -140,9 +140,10 @@ test:
 You can specify a different format by passing it as the first argument. Supported formats include:
 
 |_. Format  |_. Usage |
-| @:ant@    | Map from @key@ to value. |
+| @:ant@    | Map from <code>@key@</code> to value. |
 | @:maven@  | Map from @${key}@ to value (default). |
 | @:ruby@   | Map from @#{key}@ to value. |
+| @:erb@    | Map from @<%=key%>@ to value. | 
 | @Regexp@  | Map using the matched value of the regular expression (e.g. @/=(.*?)=/@). |
 
 For example, using the @:ruby@ format instead of the default @:maven@ format:
@@ -241,4 +242,35 @@ clean { rm_rf _('staged') }
 
 The @rm_rf@ method deletes the directory and all files in it.  It's named after UNIX's infamous @rm -rf@.  Use it wisely.  This is also a good time to introduce you to @FileUtils@, a standard Ruby library that contains convenient methods for creating and deleting directories, copying and moving files, even comparing two files.  They're all free of charge when you use Buildr.
 
+
+h2(#continuous-compilation). Continuous Compilation
+
+And if all that weren't enough, Buildr also offers a time-saving feature called continuous compilation.  This feature, implemented by the @cc@ task, instructs Buildr to loop eternally, polling your project's source directories for changes.  Whenever a change is detected, Buildr immediately triggers the appropriate compilation step and goes right back to polling.  This allows you to reap many of the benefits of an incrementally compiling IDE like Eclipse without sacrificing your favorite build tool.
+
+To get started, simply invoke the @cc@ task at the command prompt:
+
+{% highlight sh %}
+$ buildr cc
+{% endhighlight %}
+
+This task will immediately invoke the @compile@ and @test:compile@ tasks on your project if necessary.  This ensures that your build is completely up to the minute before polling is initiated.  After this initial build (if required), Buildr will print a notification indicating which directories are being monitored.  By default, these directories will include any source folders (e.g. @src/main/java/@), any test directories (e.g. @src/spec/scala/@) as well as any resources (e.g. @src/main/resources/).  The Buildr process will remain running during this time, meaning that in order to test this functionality, we will need to open a new shell:
+
+{% highlight sh %}
+$ touch src/main/java/Test.java
+{% endhighlight %}
+
+The moment we run this command, Buildr will detect the change and invoke the @compile@ task.  It will *not* invoke the @test:compile@ task, since none of the test files were actually changed.  This ensures that potentially time-consuming tasks are avoided if possible.  Note that, unlike the @build@ task, the continuous compilation also does not actually run any of your tests.  Continuous compilation is designed to be a simple daemon which runs forever, quickly recompiling your project as soon as you save or delete a file.  We can terminate the continuous compilation task by pressing Ctrl-C.  Left to its own devices, the @cc@ task really will loop forever.
+
+There are several advantages to continuous compilation.  Number one is convenience.  Once you invoke the @cc@ task, you can focus exclusively on the code, editing and saving your files in an unbroken workflow.  There is no need to break your concentration to invoke Buildr manually unless you need to run the test suite, deploy the application or anything beyond compilation.  The second advantage is speed.  By using the continuous compilation process, you avoid repeatedly incurring Buildr's startup overhead.  While this startup time is kept to a minimum, it is still perceptable, particularly when running on JRuby.  Since the @cc@ task runs within a Buildr instance which has already been started, there is no need for repeated, inefficient load times.  Again, this allows you to focus more completely on what's really important: the code.
+
+By default, the @cc@ task will poll your sources once every 200 milliseconds.  We have found that this frequency strikes a nice balance between CPU load (which is insignificant) and nearly-instant detection.  However, you may wish to tune this value based on your own needs.  To do so, simply use the @cc.frequency@ property in your project definition:
+
+{% highlight ruby %}
+project 'foo' do
+  cc.frequency 1.5      # poll every one-and-a-half seconds
+end
+{% endhighlight %}
+
+If you find that the 200 ms default imposes too much overhead, try changing @cc.frequency@ to a higher value.  On the flip side, if you find that you're waiting too long for changes to be caught by the poll, tune the frequency lower.
+
 Now let's "talk about the artifacts":artifacts.html we mentioned before.