buildr 1.4.16 → 1.4.17

data/addon/buildr/drb.rb

@@ -276,4 +276,3 @@ module Buildr
   end # DRbApplication
 
 end
-

data/addon/buildr/git_auto_version.rb

@@ -1,34 +1,34 @@
-# 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 GitAutoVersion
-    module ProjectExtension
-      include Extension
-
-      before_define do |project|
-        unless project.version
-          version_suffix = ENV['BUILD_NUMBER'] ? "-#{ENV['BUILD_NUMBER']}" : ''
-          version_prefix = ENV['VERSION_PREFIX'] ? "#{ENV['VERSION_PREFIX']}-" : ''
-          project.version = version_prefix + `git describe --tags --always`.strip + version_suffix
-        end
-      end
-    end
-  end
-end
-
-class Buildr::Project
-  include Buildr::GitAutoVersion::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 GitAutoVersion
+    module ProjectExtension
+      include Extension
+
+      before_define do |project|
+        unless project.version
+          version_suffix = ENV['BUILD_NUMBER'] ? "-#{ENV['BUILD_NUMBER']}" : ''
+          version_prefix = ENV['VERSION_PREFIX'] ? "#{ENV['VERSION_PREFIX']}-" : ''
+          project.version = version_prefix + `git describe --tags --always`.strip + version_suffix
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::GitAutoVersion::ProjectExtension
+end

data/addon/buildr/gwt.rb

@@ -1,171 +1,171 @@
-# 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
-
-      def version=(version)
-        @version = version
-      end
-
-      def version
-        @version || Buildr.settings.build['gwt'] || '2.5.1'
-      end
-
-      # The specs for requirements
-      def dependencies(version = nil)
-        ["com.google.gwt:gwt-dev:jar:#{version || self.version}"]
-      end
-
-      def gwtc_main(modules, source_artifacts, output_dir, unit_cache_dir, options = {})
-        cp = Buildr.artifacts(self.dependencies(options[:version])).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], :pathing_jar => false}])
-      end
-
-      def superdev_dependencies(version = nil)
-        self.dependencies + ["com.google.gwt:gwt-codeserver:jar:#{version || self.version}"]
-      end
-
-      def gwt_superdev(module_name, source_artifacts, work_dir, options = {})
-
-        cp = Buildr.artifacts(self.superdev_dependencies(options[:version])).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, :pathing_jar => false}])
-      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.target] + project.compile.sources + project.resources.sources).collect do |a|
-          a.is_a?(String) ? file(a) : a
-        end
-        dependencies = options[:dependencies] ? artifacts(options[:dependencies]) : (project.compile.dependencies + [project.compile.target]).collect do |dep|
-          dep.is_a?(String) ? file(dep) : dep
-        end
-
-        unit_cache_dir = project._(:target, :gwt, :unit_cache_dir, output_key)
-
-        task = project.file(output_dir) do
-          Buildr::GWT.gwtc_main(module_names,
-                                dependencies + artifacts,
-                                output_dir,
-                                unit_cache_dir,
-                                {:version => gwt_detect_version(dependencies)}.merge(options))
-        end
-        task.enhance(dependencies)
-        task.enhance([project.compile])
-        project.assets.paths << task
-        task
-      end
-
-      def gwt_superdev_runner(module_name, options = {})
-
-        dependencies = []
-        if options[:dependencies]
-          dependencies = artifacts(options[:dependencies])
-        else
-          sources = [] + project.compile.sources + project.resources.sources
-          classes = [] + project.compile.dependencies + [project.compile.target]
-          dependencies = (classes + sources).collect do |dep|
-            dep.is_a?(String) ? file(dep) : dep
-          end
-        end
-
-        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,
-                                   {:version => gwt_detect_version(dependencies)}.merge(options))
-        end
-      end
-
-      protected
-
-      def gwt_detect_version(dependencies)
-        version = nil
-        dependencies.each do |dep|
-          if dep.respond_to?(:to_spec_hash)
-            hash = dep.to_spec_hash
-            if 'com.google.gwt' == hash[:group] && 'gwt-user' == hash[:id] && :jar == hash[:type]
-              version = hash[:version]
-            end
-          end
-        end
-        version
-      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
+
+      def version=(version)
+        @version = version
+      end
+
+      def version
+        @version || Buildr.settings.build['gwt'] || '2.5.1'
+      end
+
+      # The specs for requirements
+      def dependencies(version = nil)
+        ["com.google.gwt:gwt-dev:jar:#{version || self.version}"]
+      end
+
+      def gwtc_main(modules, source_artifacts, output_dir, unit_cache_dir, options = {})
+        cp = Buildr.artifacts(self.dependencies(options[:version])).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], :pathing_jar => false}])
+      end
+
+      def superdev_dependencies(version = nil)
+        self.dependencies + ["com.google.gwt:gwt-codeserver:jar:#{version || self.version}"]
+      end
+
+      def gwt_superdev(module_name, source_artifacts, work_dir, options = {})
+
+        cp = Buildr.artifacts(self.superdev_dependencies(options[:version])).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, :pathing_jar => false}])
+      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.target] + project.compile.sources + project.resources.sources).collect do |a|
+          a.is_a?(String) ? file(a) : a
+        end
+        dependencies = options[:dependencies] ? artifacts(options[:dependencies]) : (project.compile.dependencies + [project.compile.target]).collect do |dep|
+          dep.is_a?(String) ? file(dep) : dep
+        end
+
+        unit_cache_dir = project._(:target, :gwt, :unit_cache_dir, output_key)
+
+        task = project.file(output_dir) do
+          Buildr::GWT.gwtc_main(module_names,
+                                (dependencies + artifacts).flatten.compact,
+                                output_dir,
+                                unit_cache_dir,
+                                {:version => gwt_detect_version(dependencies)}.merge(options))
+        end
+        task.enhance(dependencies)
+        task.enhance([project.compile])
+        project.assets.paths << task
+        task
+      end
+
+      def gwt_superdev_runner(module_name, options = {})
+
+        dependencies = []
+        if options[:dependencies]
+          dependencies = artifacts(options[:dependencies])
+        else
+          sources = [] + project.compile.sources + project.resources.sources
+          classes = [] + project.compile.dependencies + [project.compile.target]
+          dependencies = (classes + sources).collect do |dep|
+            dep.is_a?(String) ? file(dep) : dep
+          end
+        end
+
+        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,
+                                   {:version => gwt_detect_version(dependencies)}.merge(options))
+        end
+      end
+
+      protected
+
+      def gwt_detect_version(dependencies)
+        version = nil
+        dependencies.each do |dep|
+          if dep.respond_to?(:to_spec_hash)
+            hash = dep.to_spec_hash
+            if 'com.google.gwt' == hash[:group] && 'gwt-user' == hash[:id] && :jar == hash[:type]
+              version = hash[:version]
+            end
+          end
+        end
+        version
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::GWT::ProjectExtension
+end

data/addon/buildr/hibernate.rb

@@ -17,7 +17,7 @@ module Buildr
 
   # Provides Hibernate Doclet and schema export tasks. Require explicitly using <code>require "buildr/hibernate"</code>.
   module Hibernate
-    
+
     REQUIRES = Buildr.struct(
       :collections  => "commons-collections:commons-collections:jar:3.1",
       :logging      => "commons-logging:commons-logging:jar:1.0.3",
@@ -75,7 +75,7 @@ module Buildr
     def hibernate_requires()
       @requires ||= REQUIRES.dup
     end
-    
+
     # :call-seq:
     #   hibernate_doclet(options?) => task
     #
@@ -115,22 +115,22 @@ module Buildr
     #   end
     def hibernate_schemaexport(args, &block)
       path, arg_names, deps = Rake.application.resolve_args([args])
-      file(path).enhance { |task| 
+      file(path).enhance { |task|
         unless task.respond_to? :ant #this is a hack. A better way to do the job is to create a real task for all this.
           class << task ; attr_accessor :ant ; end
-          task.ant = Hibernate.schemaexport(hib_resolve_classpath) 
+          task.ant = Hibernate.schemaexport(hib_resolve_classpath)
         end
-      }  
-      
+      }
+
       if block
         file(path).enhance(deps) { |task| block.call task, task.ant }
       else
         file(path).enhance deps
       end
     end
-    
+
     protected
-    
+
     # This will download all the required artifacts before returning a classpath, and we want to do this only once.
     def hib_resolve_classpath
       Buildr.artifacts(hibernate_requires.to_a).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)