buildr 1.4.11 → 1.4.12

data/CHANGELOG

@@ -1,3 +1,25 @@
+1.4.12 (2013-05-04)
+* Added:  BUILDR-648 Add new package(:test_jar) packaging type.
+          Submitted by Mike Pettypiece.
+* Fixed:  BUILDR-666 ZipFile.open modifies file regardless of usage.
+          Reported by Pepijn Van Eeckhoudt, fix by Alex Boisvert.
+* Change: Moved to using TravisCI to test the Linux variants.
+* Added:  Make the location of the wsdl in generated source configurable
+          in the wsgen addon.
+* Added:  When generating the GWT facet for Intellij IDEA modules, use
+          the gwt-dev maven artifact dependency if present as the SDK,
+          falling back to the existing behaviour if not possible.
+* Added:  Improved support for auto-detection of VCS dirs when creating
+          IDEA projects.
+* Added:  Added support for SuperDevMode in gwt addon and upgraded to
+          GWT 2.5.1 by default.
+* Change: BUILDR-664 Update Checkstyle addon so that extra_dependencies is
+          empty by default. Submitted by Dieter Vrancken.
+* Fixed:  BUILDR-663 require 'buildr' fails for Ruby 2.0.0.
+* Fixed:  BUILDR-665 Java artifacts in build.yaml breaking ArchiveTask.
+          Submitted by Antonio Pérez Barrero.
+* Fixed:  BUILDR-662 reported time is much shorter than actual
+
 1.4.11 (2013-03-14)
 * Fixed:  Multiple tests in TestNG 6.x versions were being incorrectly passed to
           the command line application.

data/README.rdoc

@@ -108,6 +108,8 @@ If you prefer Git, a Git fork is available from http://github.com/buildr/buildr/
 To install Buildr locally from source:
 
   cd buildr
+  export JRUBY_OPTS="-J-XX:MaxPermSize=312m -J-Xmx1024M"
+  export JAVA_OPTS="-Xmx1024m -XX:MaxPermSize=312m"
   rake install
 
 If the cutting edge doesn't work, make sure to check the CHANGELOG, to see

data/addon/buildr/checkstyle.rb

@@ -141,7 +141,7 @@ module Buildr
       end
 
       def extra_dependencies
-        @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies].flatten
+        @extra_dependencies ||= []
       end
 
       protected

data/addon/buildr/gwt.rb

@@ -1,82 +1,127 @@
-# 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
-  module GWT
-
-    class << self
-      # The specs for requirements
-      def dependencies
-        ['com.google.gwt:gwt-dev:jar:2.4.0']
-      end
-
-      def gwtc_main(modules, source_artifacts, output_dir, options = {})
-        cp = Buildr.artifacts(self.dependencies).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
-        style = options[:style] || "OBFUSCATED," # "PRETTY", "DETAILED"
-        log_level = options[:log_level] #  ERROR, WARN, INFO, TRACE, DEBUG, SPAM, or ALL
-        workers = options[:workers] || 2
-
-        args = []
-        if log_level
-          args << "-logLevel"
-          args << log_level
-        end
-        args << "-strict"
-        args << "-style"
-        args << style
-        args << "-localWorkers"
-        args << workers
-        args << "-war"
-        args << output_dir
-        if options[:compile_report_dir]
-          args << "-compileReport"
-          args << "-extra"
-          args << options[:compile_report_dir]
-        end
-
-        if options[:draft_compile]
-          args << "-draftCompile"
-        end
-
-        args += modules
-
-        Java::Commands.java 'com.google.gwt.dev.Compiler', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
-      end
-    end
-
-    module ProjectExtension
-      include Extension
-
-      def gwt(module_names, options = {})
-        output_key = options[:output_key] || project.id
-        output_dir = project._(:target, :generated, :gwt, output_key)
-        artifacts = (project.compile.sources + project.resources.sources).collect do |a|
-          a.is_a?(String) ? file(a) : a
-        end
-        dependencies = artifacts(options[:dependencies]) || project.compile.dependencies
-        task = file(output_dir) do
-          Buildr::GWT.gwtc_main(module_names, dependencies + artifacts, output_dir, options.dup)
-        end
-        task.enhance(dependencies)
-        task.enhance([project.compile])
-        task
-      end
-    end
-  end
-end
-
-class Buildr::Project
-  include Buildr::GWT::ProjectExtension
-end
+# 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
+  module GWT
+
+    class << self
+      # The specs for requirements
+      def dependencies
+        %w(com.google.gwt:gwt-dev:jar:2.5.1)
+      end
+
+      def gwtc_main(modules, source_artifacts, output_dir, unit_cache_dir, options = {})
+        cp = Buildr.artifacts(self.dependencies).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
+        style = options[:style] || "OBFUSCATED," # "PRETTY", "DETAILED"
+        log_level = options[:log_level] #  ERROR, WARN, INFO, TRACE, DEBUG, SPAM, or ALL
+        workers = options[:workers] || 2
+
+        args = []
+        if log_level
+          args << "-logLevel"
+          args << log_level
+        end
+        args << "-strict"
+        args << "-style"
+        args << style
+        args << "-localWorkers"
+        args << workers
+        args << "-war"
+        args << output_dir
+        if options[:compile_report_dir]
+          args << "-compileReport"
+          args << "-extra"
+          args << options[:compile_report_dir]
+        end
+
+        if options[:draft_compile]
+          args << "-draftCompile"
+        end
+
+        if options[:enable_closure_compiler].nil? || options[:enable_closure_compiler]
+          args << "-XenableClosureCompiler"
+        end
+
+        args += modules
+
+        properties = options[:properties] ? options[:properties].dup : {}
+        properties["gwt.persistentunitcache"] = "true"
+        properties["gwt.persistentunitcachedir"] = unit_cache_dir
+
+        Java::Commands.java 'com.google.gwt.dev.Compiler', *(args + [{:classpath => cp, :properties => properties, :java_args => options[:java_args]}])
+      end
+
+      def superdev_dependencies
+        self.dependencies + %w(com.google.gwt:gwt-codeserver:jar:2.5.1)
+      end
+
+      def gwt_superdev(module_name, source_artifacts, work_dir, options = {})
+
+        cp = Buildr.artifacts(self.superdev_dependencies).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
+
+        args = []
+        args << "-port" << (options[:port] || 5050)
+        args << "-workDir" << work_dir
+        (options[:src] || []).each do |src|
+          args << "-src" << src
+        end
+        args << module_name
+
+        properties = options[:properties] ? options[:properties].dup : {}
+
+        java_args = options[:java_args] ? options[:java_args].dup : {}
+
+        Java::Commands.java 'com.google.gwt.dev.codeserver.CodeServer', *(args + [{:classpath => cp, :properties => properties, :java_args => java_args}])
+      end
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def gwt(module_names, options = {})
+        output_key = options[:output_key] || project.id
+        output_dir = project._(:target, :generated, :gwt, output_key)
+        artifacts = (project.compile.sources + project.resources.sources).collect do |a|
+          a.is_a?(String) ? file(a) : a
+        end
+        dependencies = artifacts(options[:dependencies]) || project.compile.dependencies
+
+        unit_cache_dir = project._(:target, :gwt, :unit_cache_dir, output_key)
+
+        task = file(output_dir) do
+          Buildr::GWT.gwtc_main(module_names, dependencies + artifacts, output_dir, unit_cache_dir, options.dup)
+        end
+        task.enhance(dependencies)
+        task.enhance([project.compile])
+        task
+      end
+
+      def gwt_superdev_runner(module_name, options = {})
+        dependencies = artifacts(options[:dependencies]) || project.compile.dependencies
+
+        desc "Run Superdev mode"
+        project.task("superdev") do
+          work_dir = project._(:target, :gwt, :superdev)
+          mkdir_p work_dir
+          Buildr::GWT.gwt_superdev(module_name, dependencies, work_dir, options)
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::GWT::ProjectExtension
+end

data/addon/buildr/wsgen.rb

@@ -126,6 +126,7 @@ module Buildr
       #  Buildr::Wsgen.wsdl2java(project, {_('src/main/wsdl/MyService.wsdl') => {:package => 'com.example'}})
       #  Buildr::Wsgen.wsdl2java(project, {_('src/main/wsdl/MyService.wsdl') => {:output_dir => _(:target, :wsdl, :java)}})
       #  Buildr::Wsgen.wsdl2java(project, {_('src/main/wsdl/MyService.wsdl') => {}}, :package => 'com.example' )
+      #  Buildr::Wsgen.wsdl2java(project, {_('src/main/wsdl/MyService.wsdl') => {}}, :wsdl_location => 'file:META-INF/wsdl/SpecificTaskService.wsdl' )
       def wsdl2java(project, wsdls, options = {})
         desc "Generate java from wsdl"
         project.task("wsdl2java")
@@ -139,10 +140,27 @@ module Buildr
         wsdls.each_pair do |wsdl_file, config|
           pkg = config[:package] || options[:package]
           service = config[:service] || File.basename(wsdl_file, '.wsdl')
+          wsdl_location = config[:wsdl_location]
           java_file = "#{ws_dir}/#{pkg.gsub('.', '/')}/#{service}.java"
           project.file(java_file) do
             mkdir_p ws_dir
-            `wsimport -keep -Xnocompile -target #{target} -s #{ws_dir} -p #{pkg} -wsdllocation META-INF/wsdl/#{service}.wsdl #{wsdl_file}`
+            command = []
+            command << "wsimport"
+            command << "-keep"
+            command << "-Xnocompile"
+            command << "-target"
+            command << target
+            command << "-s"
+            command << ws_dir
+            command << "-p"
+            command << pkg
+            if wsdl_location
+              command << "-wsdllocation"
+              command << wsdl_location
+            end
+            command << wsdl_file
+
+            `#{command.join(' ')}`
             if $? != 0 || !File.exist?(java_file)
               rm_rf java_file
               raise "Problem building webservices"

data/buildr.gemspec

@@ -89,7 +89,9 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_development_dependency 'ci_reporter', '1.7.2'
 
   # NOTE: Must update all-in-one.rake if this is updated
-  spec.add_development_dependency 'ffi-ncurses', '0.4.0' if $platform.to_s == 'java'
+  # ffi-ncurses Fails on several varieties of Ubuntu due to being unable to locate ncursesw library
+  # Should be able to just disable it
+  #spec.add_development_dependency 'ffi-ncurses', '0.4.0' if $platform.to_s == 'java'
   spec.add_development_dependency 'win32console' if $platform.to_s == 'x86-mswin32'
   # Ideally we would depend on psych when the platform has >= 1.9.2 support and jruby platform version > 1.6.6
   #spec.add_development_dependency 'psych' if RUBY_VERSION >= '1.9.2'

data/doc/_layouts/default.html

@@ -46,7 +46,7 @@
           </li>
           <li>Reference
             <ol class="toc">
-              <li><a href='rdoc'>API</a></li>
+              <li><a href='rdoc/Buildr.html'>API</a></li>
               <li><a href='http://docs.rubyrake.org'>Rake</a></li>
               <li><a href='http://antwrap.rubyforge.org'>Antwrap</a></li>
               <li><a href='http://cwiki.apache.org/confluence/display/BUILDR/Common+Problems+and+Solutions'>Troubleshooting</a></li>

data/doc/download.textile

@@ -20,16 +20,28 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.4.11 (2013-03-14)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.11-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.11/buildr-1.4.11-java.gem | "2ad2134527b9fc7f4726a7b2350318c0":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11-java.gem.asc |
+| "buildr-1.4.11-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.11/buildr-1.4.11-x86-mswin32.gem | "ada93b14069c418d727c7f225e02b082":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11-x86-mswin32.gem.asc |
+| "buildr-1.4.11.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.11/buildr-1.4.11.gem | "89c09e4bfdbbd571d76e4b6f41c30ece":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11.gem.asc |
+| "buildr-1.4.11.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.11/buildr-1.4.11.tgz | "ca7b4812001388883923b86caedbf16c":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11.tgz.asc |
+| "buildr-1.4.11.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.11/buildr-1.4.11.zip | "d8e2cb88e0c365fb226404d2d9de3dfc":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.11/buildr-1.4.11.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.11/KEYS)
+
+
 h3. buildr 1.4.10 (2013-02-17)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.10-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.10/buildr-1.4.10-java.gem | "06f29fa49671a966397a771203e4aa79":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10-java.gem.asc |
-| "buildr-1.4.10-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.10/buildr-1.4.10-x86-mswin32.gem | "3c998b0df3ed8d917fe163687ed37c4f":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10-x86-mswin32.gem.asc |
-| "buildr-1.4.10.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.10/buildr-1.4.10.gem | "8c0335202c0acc4bfbb039edd8b23502":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10.gem.asc |
-| "buildr-1.4.10.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.10/buildr-1.4.10.tgz | "8f55b1a170a34dd37e01050c38a5195a":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10.tgz.asc |
-| "buildr-1.4.10.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.10/buildr-1.4.10.zip | "7e07c179383dc904e67b665444f3d4aa":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.10/buildr-1.4.10.zip.asc |
+| "buildr-1.4.10-java.gem":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10-java.gem | "06f29fa49671a966397a771203e4aa79":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10-java.gem.asc |
+| "buildr-1.4.10-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10-x86-mswin32.gem | "3c998b0df3ed8d917fe163687ed37c4f":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10-x86-mswin32.gem.asc |
+| "buildr-1.4.10.gem":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.gem | "8c0335202c0acc4bfbb039edd8b23502":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.gem.asc |
+| "buildr-1.4.10.tgz":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.tgz | "8f55b1a170a34dd37e01050c38a5195a":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.tgz.asc |
+| "buildr-1.4.10.zip":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.zip | "7e07c179383dc904e67b665444f3d4aa":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.10/buildr-1.4.10.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.10/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.10/KEYS)
 
 
 h3. buildr 1.4.9 (2012-11-08)

data/doc/index.textile

@@ -46,24 +46,15 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
-Highlights from Buildr 1.4.11 (2013-03-14)
-
-* Fixed:  Multiple tests in TestNG 6.x versions were being incorrectly passed to the command line application.
-
-
-Highlights from Buildr 1.4.10 (2013-02-10)
-
-* Added:  Support a single intermediate directory for each project hierarchy through an addon 'buildr/single_intermediate_layout'.
-* Fixed:  Scala 2.10 support - compiler now uses additional/separate jars introduced in 2.10 such as scala-reflect.jar and scala-actor.jar
-* Added:  Add an addon for NSIS.
-* Change: BUILDR-612 - Support the TestNG 6.x versions and default to 6.8.
-* Added:  BUILDR-599 - Support the passing of arguments to testng test runner.
-* Fixed:  Observer the per-project source version when generating IDEA module files.
-* Change: Sort the components in IDEA project files in the same order the idea sorts them.
-* Added:  Created an addon 'buildr/wsgen' for generating wsdls from java and java from wsdls using the underlying wsgen tool.
-* Added:  Create a 'buildr/gpg' addon that signs and uploads signatures when uploading artifacts. Inspired by a similar extension in the Apache ODE project by Tammo van Lessen.
-* Change: Require 'bundler/setup' as part of buildr startup to ensure that buildr always runs with up to date dependencies if a Gemfile is present.
-* Added:  Create a simple extension that modifies the project layout to place generated files at the top level.
+Highlights from Buildr 1.4.12 (2013-05-04)
+
+* Added:  BUILDR-648 Add new package(:test_jar) packaging type. Submitted by Mike Pettypiece.
+* Fixed:  BUILDR-666 ZipFile.open modifies file regardless of usage. Reported by Pepijn Van Eeckhoudt, fix by Alex Boisvert.
+* Change: Moved to using TravisCI to test the Linux variants.
+* Added:  Make the location of the wsdl in generated source configurable in the wsgen addon.
+* Added:  Added support for SuperDevMode in gwt addon and upgraded to GWT 2.5.1 by default.
+* Change: BUILDR-664 Update Checkstyle addon so that extra_dependencies is empty by default. Submitted by Dieter Vrancken.
+* Fixed:  BUILDR-663 require 'buildr' fails for Ruby 2.0.0.
 
 This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
 

data/lib/buildr.rb

@@ -69,6 +69,7 @@ require 'buildr/packaging/ziptask'
 require 'buildr/packaging/tar'
 require 'buildr/packaging/gems'
 require 'buildr/packaging/zip'
+require 'buildr/packaging/test_jar'
 require RUBY_PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
 require 'buildr/java/ant'
 require 'buildr/java/compiler'

data/lib/buildr/clojure.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-module Buildr::Clojure
+module Buildr::Clojure #:nodoc:
 
   REQUIRES = ArtifactNamespace.for(self) do |ns|
     ns.clojure! 'org.clojure:clojure:jar:1.2.0'

data/lib/buildr/clojure/shell.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr::Shell
+module Buildr::Shell #:nodoc:
 
   class Clojure < Base
     include JRebel

data/lib/buildr/core/application.rb

@@ -124,6 +124,7 @@ module Buildr
     end
 
     def run
+      @start = Time.now
       standard_exception_handling do
         init 'Buildr'
         load_buildfile
@@ -234,7 +235,6 @@ module Buildr
         elsif options.execute
           eval options.execute
         else
-          @start = Time.now
           top_level_tasks.each { |task_name| invoke_task(task_name) }
           if verbose
             elapsed = Time.now - @start
@@ -690,5 +690,6 @@ module FileUtils
       @fileutils_output.puts @fileutils_label + msg
     end
   end
-  private_module_function :fu_output_message
+  module_function :fu_output_message
+  private_class_method :fu_output_message
 end

data/lib/buildr/core/build.rb

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
+module Buildr #:nodoc:
 
   class Options
 
@@ -604,7 +604,6 @@ module Buildr
 
 end
 
-
-class Buildr::Project
+class Buildr::Project #:nodoc:
   include Buildr::Build
 end