buildr 1.4.6 → 1.4.7.pre2

data/addon/buildr/hibernate.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/java'
-
-
 module Buildr
 
   # Provides Hibernate Doclet and schema export tasks. Require explicitly using <code>require "buildr/hibernate"</code>.

data/addon/buildr/javacc.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/java'
-
-
 module Buildr
   # Provides JavaCC compile tasks. Require explicitly using <code>require "buildr/javacc"</code>.
   module JavaCC

data/addon/buildr/javancss.rake

@@ -0,0 +1,155 @@
+# 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 the <code>javancss:html</code> and <code>javancss:xml</code> tasks.
+  # Require explicitly using <code>require "buildr/javancss"</code>.
+  module JavaNCSS
+
+    class << self
+
+      # The specs for requirements
+      def dependencies
+        [
+          'org.codehaus.javancss:javancss:jar:32.53',
+          'javancss:ccl:jar:29.50',
+          'javancss:jhbasic:jar:29.50'
+        ]
+      end
+
+      def javancss(output_file, source_paths, options = {})
+        dependencies = (options[:dependencies] || []) + self.dependencies
+        cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
+
+        args = []
+        args << "-all"
+        args << "-xml"
+        args << "-out"
+        args << output_file
+        args << "-recursive"
+        source_paths.each do |source_path|
+          args << source_path
+        end
+
+        begin
+          Java::Commands.java 'javancss.Main', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
+        rescue => e
+          raise e if options[:fail_on_error]
+        end
+      end
+    end
+
+    class Config
+      def enabled?
+        !!@enabled
+      end
+
+      attr_writer :enabled
+
+      def html_enabled?
+        File.exist?(self.style_file)
+      end
+
+      attr_writer :config_directory
+
+      def config_directory
+        @config_directory || project._(:source, :main, :etc, :javancss)
+      end
+
+      attr_writer :report_dir
+
+      def report_dir
+        @report_dir || project._(:reports, :javancss)
+      end
+
+      attr_writer :fail_on_error
+
+      def fail_on_error?
+        @fail_on_error.nil? ? false : @fail_on_error
+      end
+
+      attr_writer :xml_output_file
+
+      def xml_output_file
+        @xml_output_file || "#{self.report_dir}/javancss.xml"
+      end
+
+      attr_writer :html_output_file
+
+      def html_output_file
+        @html_output_file || "#{self.report_dir}/javancss.html"
+      end
+
+      attr_writer :style_file
+
+      def style_file
+        @style_file || "#{self.config_directory}/javancss2html.xsl"
+      end
+
+      def source_paths
+        @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
+      end
+
+      protected
+
+      def initialize(project)
+        @project = project
+      end
+
+      attr_reader :project
+
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def javancss
+        @javancss ||= Buildr::JavaNCSS::Config.new(project)
+      end
+
+      after_define do |project|
+        if project.javancss.enabled?
+          desc "Generate JavaNCSS xml report."
+          project.task("javancss:xml") do
+            puts "JavaNCSS: Analyzing source code..."
+            mkdir_p File.dirname(project.javancss.xml_output_file)
+            Buildr::JavaNCSS.javancss(project.javancss.xml_output_file,
+                                      project.javancss.source_paths.flatten.compact,
+                                      :fail_on_error => project.javancss.fail_on_error?)
+          end
+
+          if project.javancss.html_enabled?
+            xml_task = project.task("javancss:xml")
+            desc "Generate JavaNCSS html report."
+            project.task("javancss:html" => xml_task) do
+              puts "JavaNCSS: Generating report"
+              mkdir_p File.dirname(project.javancss.html_output_file)
+              Buildr.ant "javancss" do |ant|
+                ant.xslt :in => project.javancss.xml_output_file,
+                         :out => project.javancss.html_output_file,
+                         :style => project.javancss.style_file
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::JavaNCSS::ProjectExtension
+end

data/addon/buildr/jdepend.rb

@@ -13,48 +13,162 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+module Buildr
+  # Addes the <code>projectname:jdepend:swing</code>, <code>projectname:jdepend:text</code> and
+  # <code>projectname:jdepend:xml</code> tasks.
+  #
+  # Require explicitly using <code>require "buildr/jdepend"</code>.
+  module JDepend
 
-require 'buildr/java'
+    class << self
 
+      # The specs for requirements
+      def dependencies
+        [
+          'jdepend:jdepend:jar:2.9.1'
+        ]
+      end
 
-module Buildr
+      def jdepend(output_file, target_paths, options = {})
+        dependencies = (options[:dependencies] || []) + self.dependencies
+        cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
 
-  # Addes the <code>jdepend:swing</code>, <code>jdepend:text</code> and <code>jdepend:xml</code> tasks.
-  # Require explicitly using <code>require "buildr/jdepend"</code>.
-  module Jdepend
+        args = []
+        if output_file
+          args << "-file"
+          args << output_file
+        end
+        target_paths.each do |target_path|
+          file(target_path).invoke
+          args << target_path.to_s
+        end
 
-    REQUIRES = ["jdepend:jdepend:jar:2.9.1"]
+        # If no output file then we must be trying to run the swing app
+        command = output_file ? 'jdepend.xmlui.JDepend' : 'jdepend.swingui.JDepend'
 
-    class << self
+        begin
+          Java::Commands.java command, *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
+        rescue => e
+          raise e if options[:fail_on_error]
+        end
+      end
+    end
 
-      def requires()
-        @requires ||= Buildr.artifacts(REQUIRES).each(&:invoke).map(&:to_s)
+    class Config
+      def enabled?
+        !!@enabled
       end
 
-      def paths()
-        Project.projects.map(&:compile).each(&:invoke).map(&:target).
-          map(&:to_s).select { |path| File.exist?(path) }.map { |path| File.expand_path(path) }
+      attr_writer :enabled
+
+      def html_enabled?
+        File.exist?(self.style_file)
       end
 
-    end
+      attr_writer :config_directory
 
-    namespace "jdepend" do
+      def config_directory
+        @config_directory || project._(:source, :main, :etc, :jdepend)
+      end
+
+      attr_writer :report_dir
+
+      def report_dir
+        @report_dir || project._(:reports, :jdepend)
+      end
+
+      attr_writer :fail_on_error
 
-      desc "Runs JDepend on all your projects (Swing UI)"
-      task "swing" do
-        Java::Commands.java "jdepend.swingui.JDepend", paths, :classpath=>requires, :name=>"JDepend"
+      def fail_on_error?
+        @fail_on_error.nil? ? false : @fail_on_error
       end
 
-      desc "Runs JDepend on all your projects (Text UI)"
-      task "text" do
-        Java::Commands.java "jdepend.textui.JDepend", paths, :classpath=>requires, :name=>"JDepend"
+      attr_writer :xml_output_file
+
+      def xml_output_file
+        @xml_output_file || "#{self.report_dir}/jdepend.xml"
       end
 
-      desc "Runs JDepend on all your projects (XML output to jdepend.xml)"
-      task "xml" do
-        Java::Commands.java "jdepend.xmlui.JDepend", "-file", "jdepend.xml", paths, :classpath=>requires, :name=>"JDepend"
-        puts "Created jdepend.xml"
+      attr_writer :html_output_file
+
+      def html_output_file
+        @html_output_file || "#{self.report_dir}/jdepend.html"
+      end
+
+      attr_writer :style_file
+
+      def style_file
+        @style_file || "#{self.config_directory}/jdepend.xsl"
+      end
+
+      def target_paths
+        @target_paths ||= [self.project.compile.target, self.project.test.compile.target]
+      end
+
+      def to_options
+        {
+            :fail_on_error => project.jdepend.fail_on_error?,
+            # Set user home so that jdepend.properties will be loaded from there if present
+            :properties => { 'user.home' => project.jdepend.config_directory }
+        }
+      end
+
+      protected
+
+      def initialize(project)
+        @project = project
+      end
+
+      attr_reader :project
+
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def jdepend
+        @jdepend ||= Buildr::JDepend::Config.new(project)
+      end
+
+      after_define do |project|
+        if project.jdepend.enabled?
+          desc "Generate JDepend xml report."
+          project.task("jdepend:xml") do
+            puts "JDepend: Analyzing source code..."
+            mkdir_p File.dirname(project.jdepend.xml_output_file)
+            Buildr::JDepend.jdepend(project.jdepend.xml_output_file,
+                                    project.jdepend.target_paths.flatten.compact,
+                                    project.jdepend.to_options)
+          end
+
+          desc "Run JDepend with Swing UI."
+          project.task("jdepend:swing") do
+            puts "JDepend: Analyzing source code..."
+            Buildr::JDepend.jdepend(nil,
+                                    project.jdepend.target_paths.flatten.compact,
+                                    project.jdepend.to_options)
+          end
+
+          if project.jdepend.html_enabled?
+            xml_task = project.task("jdepend:xml")
+            desc "Generate JDepend html report."
+            project.task("jdepend:html" => xml_task) do
+              puts "JDepend: Generating report"
+              mkdir_p File.dirname(project.jdepend.html_output_file)
+              Buildr.ant "jdepend" do |ant|
+                ant.xslt :in => project.jdepend.xml_output_file,
+                         :out => project.jdepend.html_output_file,
+                         :style => project.jdepend.style_file
+              end
+            end
+
+          end
+        end
       end
     end
   end
 end
+
+class Buildr::Project
+  include Buildr::JDepend::ProjectExtension
+end

data/addon/buildr/jetty.rb

@@ -13,15 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require 'uri'
 require 'net/http'
-require 'buildr/core/project'
-require 'buildr/java'
-require 'buildr/packaging'
 require 'thread'
 
-
 module Buildr
 
   # Provides a collection of tasks and methods for using Jetty, specifically as a server

data/addon/buildr/jibx.rb

@@ -1,86 +1,85 @@
-# 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
-
+# 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
+