buildr 0.15.0 → 0.16.0

data/CHANGELOG

@@ -1,3 +1,15 @@
+0.16 (3/7/2007)
+* Added: zip.include :as=> to include file under specified name.
+* Added: zip.merge to include the (expanded) contents of one zip file in another.
+* Added: experimental test task using JUnit and JMock.
+* Changed: project.to_s returns name, projects returns sorted by name.
+* Changed: project definition now executed using project's base directory
+  as the current directory.
+* Fixed: artifact test cases and minor code cleanup.
+* Fixed: attempts to download artifact even if created by task.
+* Fixed: release task now deletes old tagged copy and reports SVN usage.
+* Fixed: OpenJPA not including target directory in classpath.
+
 0.15 (2/28/2007)
 * Fixed: tasks fail unless deployment server specified.
 * Changed: deploy method executes deployment, instead of returning a task.

data/lib/buildr.rb

@@ -1,13 +1,17 @@
-# Remember that all these need to be Gem dependencies.
-gem "facets"
-gem "builder"
-gem "net-ssh"
-gem "net-sftp"
-gem "rubyzip"
-gem "highline"
+# returning(obj) and with(obj)
+require "facet/kernel/with"
+# &:symbol goodness.
+require "facet/symbol/to_proc"
+# blank? on string and nil
+require "facet/string/blank"
+require "facet/nilclass/blank"
+# What it says.
+require "facet/module/alias_method_chain"
+require "facet/string/starts_with"
+
 
 module Buildr
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__))
@@ -23,6 +27,7 @@ require "tasks/zip"
 
 require "java/java"
 require "java/compile"
+require "java/test"
 require "java/javacc"
 require "java/openjpa"
 require "java/packaging"

data/lib/core/artifact.rb

@@ -1,25 +1,27 @@
 module Buildr
 
   # This module gives you a way to access the individual properties of an
-  # artifact: id, group, type and version. It can also return the artifact
-  # specification.
+  # artifact: id, group, type, classifier and version. It also provides other
+  # methods commonly used on an artifact, specifically #to_hash and #to_spec.
   module ActsAsArtifact
 
+    ARTIFACT_ATTRIBUTES = [:group, :id, :type, :classifier, :version]
+
     class << self
       def included(mod)
         mod.extend self
       end
     end
 
-    # The artifact id.
+    # The artifact identifier.
     attr_reader :id
-    # The group id.
+    # The group identifier.
     attr_reader :group
     # The file type.
     attr_reader :type
     # The version number.
     attr_reader :version
-    # Optional classifier.
+    # Optional artifact classifier.
     attr_reader :classifier
 
     # Returns the artifact specification as a hash.
@@ -31,28 +33,20 @@ module Buildr
 
     # Returns the artifact specification, in the structure:
     #   <group>:<artifact>:<type>:<version>
+    # or
+    #   <group>:<artifact>:<type>:<classifier><:<version>
     def to_spec()
       classifier.blank? ? "#{group}:#{id}:#{type}:#{version}" : "#{group}:#{id}:#{type}:#{classifier}:#{version}"
     end
 
     # Apply specification to this artifact.
     def apply_spec(spec)
-      case spec
-      when String
-        @group, @id, @type, @version, *rest = spec.split(":")
-        unless rest.empty?
-          @classifier, @version = @version, rest.shift
-          fail "Expecting project:id:type:version or project:id:type:classifier:version, found #{spec}" unless rest.empty?
-        end
-      when Hash
-        [:group, :id, :type, :version, :classifier].each { |key| instance_variable_set("@#{key}", spec[key]) }
-        @type ||= DEFAULT_FILE_TYPE
-      else
-        raise ArgumentError, "Expecting a string or a hash"
-      end
+      spec = Artifact.to_hash(spec)
+      ARTIFACT_ATTRIBUTES.each { |key| instance_variable_set("@#{key}", spec[key]) }
       self
     end
 
+    # Convenience method that returns a POM artifact.
     def pom()
       return self if type.to_s == "pom"
       artifact(:group=>group, :id=>id, :version=>version, :type=>"pom", :classifier=>classifier)
@@ -61,7 +55,11 @@ module Buildr
   end
 
 
-  # Use the artifact and artifacts method to create artifact tasks.
+  # The Artifact task maps to an artifact file in the local repository
+  # and knows how to download the file from a remote repository.
+  #
+  # The task will only download the file if it does not exist. You can
+  # enhance the task to create the artifact yourself.
   class Artifact < Rake::FileCreationTask
 
     # The default file type for artifacts, if not specified.
@@ -71,64 +69,67 @@ module Buildr
 
     class << self
 
-      # Lookup an artifact task based on its specification.
+      # Lookup a previously registered artifact task based on the
+      # artifact specification (string or hash).
       def lookup(spec)
         @artifacts ||= {}
-        @artifacts[hash_to_spec(spec)]
+        @artifacts[to_spec(spec)]
       end
 
-      # Register a task as an artifact. Returns the task when calling
-      # #artifacts. For example, a project will use this to register the
-      # packages it creates.
-      def register(task)
+      # Register an artifact task(s) for later lookup (see #lookup).
+      def register(*tasks)
         @artifacts ||= {}
-        if task.respond_to?(:to_hash)
-          @artifacts[hash_to_spec(task.to_hash)] = task
-        else
-          fail "Can only call with an artifact task"
-        end
+        fail "You can only register an artifact task, strings and hashes are just not good enough" unless
+          tasks.all? { |task| task.respond_to?(:to_spec) && task.respond_to?(:invoke) }
+        tasks.each { |task| @artifacts[task.to_spec] = task }
+        tasks
       end
 
       # Turn a spec into a hash. This method accepts a string, hash or any object
-      # that responds to the method to_spec. There are several reasons you'll want
-      # to use this method:
-      # * You can pass it anything that could possibly be a spec, and get a hash.
-      # * It will check that your spec includes the group identifier, artifact
-      #   identifier and version number, and set the file type, if not specified.
+      # that responds to the method to_spec. There are several reasons to use this
+      # method:
+      # * You can pass anything that could possibly be a spec, and get a hash.
+      # * It will check that the spec includes the group identifier, artifact
+      #   identifier and version number and set the file type, if missing.
       # * It will always return a new specs hash.
-      # * Calling to_s on the hash will return a spec string.
       #
       # :nodoc:
-      def spec_to_hash(spec)
-        return spec_to_hash(spec.to_spec) if spec.respond_to?(:to_spec)
-        if String === spec
-          group, id, type, version, *rest = spec.split(":")
-          unless rest.empty?
-            classifier, version = version, rest.shift
-            fail "Expecting project:id:type:version or project:id:type:classifier:version, found #{spec}" unless rest.empty?
-          end
-          fail "Missing file type for #{spec}" if type.blank?
-          spec_to_hash :group=>group, :id=>id, :type=>type, :version=>version, :classifier=>classifier
-        elsif Hash === spec 
-          spec = spec.clone
+      def to_hash(spec)
+        if spec.respond_to?(:to_spec)
+          to_hash spec.to_spec
+        elsif Hash === spec
+          # Sanitize the hash and check it's valid.
+          spec = ARTIFACT_ATTRIBUTES.inject({}) { |h, k| h[k] = spec[k] ; h }
           fail "Missing group identifier for #{spec.inspect}" if spec[:group].blank?
           fail "Missing artifact identifier for #{spec.inspect}" if spec[:id].blank?
           fail "Missing version for #{spec.inspect}" if spec[:version].blank?
           spec[:type] = DEFAULT_FILE_TYPE if spec[:type].blank?
           spec
+        elsif String === spec
+          group, id, type, version, *rest = spec.split(":")
+          unless rest.empty?
+            # Optional classifier comes before version.
+            classifier, version = version, rest.shift
+            fail "Expecting <project:id:type:version> or <project:id:type:classifier:version>, found <#{spec}>" unless rest.empty?
+          end
+          to_hash :group=>group, :id=>id, :type=>type, :version=>version, :classifier=>classifier
         else
-          fail "Spec must be a string, hash or object that responds to to_spec"
+          fail "Expecting a String, Hash or object that responds to to_spec"
         end
       end
 
-      # Convert a hash back to a spec string.
-      def hash_to_spec(hash)
+      # Convert a hash back to a spec string. This method accepts
+      # a string, hash or any object that responds to to_spec.
+      # :nodoc:
+      def to_spec(hash)
+        hash = to_hash(hash) unless Hash === hash
         version = ":#{hash[:version]}" unless hash[:version].blank?
         classifier = ":#{hash[:classifier]}" unless hash[:classifier].blank?
         "#{hash[:group]}:#{hash[:id]}:#{hash[:type] || DEFAULT_FILE_TYPE}#{classifier}#{version}"
       end
 
       # Convert a hash to a file name.
+      # :nodoc:
       def hash_to_file_name(hash)
         version = "-#{hash[:version]}" unless hash[:version].blank?
         classifier = "-#{hash[:classifier]}" unless hash[:classifier].blank?
@@ -137,30 +138,32 @@ module Buildr
 
     end
 
-    def initialize(*args)
+    def execute()
+      # Default behavior: download the artifact from one of the remote
+      # repositories if the file does not exist. But this default behavior
+      # is counter useful if the artifact knows how to build itself
+      # (e.g. download from a different location), so don't perform it
+      # if the task found a different way to create the artifact.
       super
-      enhance do |task|
-        # Download the artifact form one of the remote repositories if the
-        # file does not exist in the local repository, and no other behavior
-        # specified. If this task has been enhanced, delegate to the other
-        # enhancers. We don't know if this is the first or other enhancement,
-        # but we only need to know it's not the only one.
-        if @actions.size == 1
-          repositories.download(to_spec)
-        end
+      unless Rake.application.options.dryrun || File.exist?(name)
+        repositories.download(to_spec)
       end
     end
 
   end
 
 
-  # Singleton object for specifying the local, remote and release repositories.
+  # Holds the path to the local repository, URLs for remote repositories, and
+  # settings for the deployment repository.
   class Repositories
     include Singleton
 
     # Returns the path to the local repository.
     #
     # The default path is .m2/repository relative to the home directory.
+    # You can change the location of the local repository by using a symbol
+    # link or by setting a different path. If you set a different path, do it
+    # in the buildr.rb file instead of the Rakefile. 
     def local()
       @local ||= ENV["local_repo"] || File.join(ENV["HOME"], ".m2", "repository")
     end
@@ -176,7 +179,7 @@ module Buildr
     #   locate :group=>"log4j", :id=>"log4j", :version=>"1.1"
     #     => ~/.m2/repository/log4j/log4j/1.1/log4j-1.1.jar
     def locate(spec)
-      spec = Artifact.spec_to_hash(spec) unless Hash === spec
+      spec = Artifact.to_hash(spec)
       File.join(local, spec[:group].split("."), spec[:id], spec[:version], Artifact.hash_to_file_name(spec))
     end
 
@@ -210,10 +213,10 @@ module Buildr
     # and store it in the local repository. Returns the path if downloaded,
     # otherwise raises an exception.
     def download(spec)
-      spec = Artifact.spec_to_hash(spec) unless Hash === spec
+      spec = Artifact.to_hash(spec) unless Hash === spec
       path = locate(spec)
       
-      puts "Downloading #{Artifact.hash_to_spec(spec)}" if Rake.application.options.trace
+      puts "Downloading #{Artifact.to_spec(spec)}" if Rake.application.options.trace
       return path if remote.any? do |repo_id, repo_url|
         begin
           rel_path = spec[:group].gsub(".", "/") +
@@ -232,13 +235,16 @@ module Buildr
           false
         end
       end
-      fail "Failed to download #{Artifact.hash_to_spec(spec)}, tried the following repositories:\n#{repositories.remote.values.join("\n")}"
+      fail "Failed to download #{Artifact.to_spec(spec)}, tried the following repositories:\n#{repositories.remote.values.join("\n")}"
     end
 
-    # Specifies deployment target for all artifacts generated by this project.
+    # Specifies the deployment repository. Accepts a hash with the different
+    # repository settings (e.g. url, username, password). Anything else is
+    # interepted as the URL.
     #
     # For example:
-    #   repositories.deploy_to = "sftp://example.com/var/www/maven/"
+    #   repositories.deploy_to = { :url=>"sftp://example.com/var/www/maven/",
+    #                              :username="john", :password=>"secret" }
     # or:
     #   repositories.deploy_to = "sftp://john:secret@example.com/var/www/maven/"
     def deploy_to=(options)
@@ -246,13 +252,21 @@ module Buildr
       @deploy_to = options
     end
 
+    # Returns the current deployment repository configuration. This is a more
+    # convenient way to specify deployment in the Rakefile, and override it
+    # locally. For example:
+    #   # Rakefile
+    #   repositories.deploy_to[:url] ||= "sftp://example.com"
+    #   # buildr.rb
+    #   repositories.deploy_to[:url] = "sftp://acme.org"
     def deploy_to()
-      @deploy_to || {}
+      @deploy_to ||= {}
     end
 
   end
 
-  # Returns a global object for setting local and remote repositories.
+
+  # Returns a global object for setting local, remote and deploy repositories.
   # See Repositories.
   def repositories()
     Repositories.instance
@@ -276,14 +290,13 @@ module Buildr
   #   download(artifact("dojo:dojo-widget:zip:2.0")=>
   #     "http://download.dojotoolkit.org/release-2.0/dojo-2.0-widget.zip")
   def artifact(spec, &block)
-    spec = Artifact.spec_to_hash(spec)
+    spec = Artifact.to_hash(spec)
     unless task = Artifact.lookup(spec)
       task = Artifact.define_task(repositories.locate(spec))
       Artifact.register(task)
     end
     task.apply_spec spec
-    task.enhance(&block) if block_given?
-    task
+    task.enhance &block
   end
 
   # Creates multiple artifacts from a set of specifications and returns
@@ -320,7 +333,7 @@ module Buildr
       case spec
       when Hash
         set |= [artifact(spec)]
-      when /:.*:.*:/
+      when /:/
         set |= [artifact(spec)]
       when String
         set |= [file(spec)]
@@ -331,7 +344,7 @@ module Buildr
       when Array
         set |= artifacts(*spec)
       else
-        fail "Invalid artifact specification: #{spec || 'nil'}"
+        fail "Invalid artifact specification: #{spec.to_s || 'nil'}"
       end
       set
     end

data/lib/core/build.rb

@@ -1,25 +1,82 @@
+require "open3"
+
+
 module Buildr
 
+  BUILD_TASKS = {
+    :build    =>"Build the project",
+    :clean    =>"Clean files generated during a build",
+    :package  =>"Create packages",
+    :install  =>"Install packages created by the project",
+    :uninstall=>"Remove previously installed packages",
+    :deploy   =>"Deploy packages created by the project"
+  }
+
+  # Handles the build and clean tasks.
+  BUILD_TASKS.each { |name, comment| LocalDirectoryTask.define_task(name).add_comment(comment) }
+
+  Project.on_define do |project|
+    BUILD_TASKS.each { |name, comment| project.recursive_task name }
+  end
+
+  class Project
+    def build(*args, &block)
+      returning(@build_task ||= task("build")) do |task|
+        task.enhance args, &block
+      end
+    end
+
+    def clean(*args, &block)
+      returning(@clean_task ||= task("clean")) do |task|
+        task.enhance args, &block
+      end
+    end
+  end
+
+  Project.on_define do |project|
+    project.build
+    project.clean
+  end
+
+
   class ReleaseTask < Rake::Task
 
     VERSION_NUMBER_PATTERN  = /VERSION_NUMBER\s*=\s*(["'])(.*)\1/
     NEXT_VERSION_PATTERN    = /NEXT_VERSION\s*=\s*(["'])(.*)\1/
 
+    class << self
+      def svn_ignores()
+        @ignores = (@ignores || []).map { |pat| pat.is_a?(Regexp) ? pat : Regexp.new("^.*\s+#{Regexp.escape pat}$") }
+      end
+    end
+
     def initialize(*args)
       super
       enhance do |task|
         # Make sure we don't have anything uncommitted in SVN.
-        fail "Uncommitted SVN files violate the First Principle Of Release!" unless
-          svn("status").empty?
-        # Load the Rakefile and find the version numbers.
+        check_status
+        # Update current version to next version before deploying.
         next_ver = update_version
-        # Run the deployment externally using the new version number.
+        # Run the deployment externally using the new version number
+        # (from the modified Rakefile).
         sh "rake deploy"
+        # Update the next version as well to the next increment and commit.
         update_next_version next_ver
-        tag_repository
+        # Tag the repository for this release.
+        tag_repository next_ver
+        # Update the next version to end with -SNAPSHOT.
+        update_version_to_snapshot next_ver
       end
     end
 
+    def check_status()
+      ignores = ReleaseTask.svn_ignores
+      status = svn("status", "--ignore-externals", :verbose=>false).
+        reject { |line| line =~ /^X\s/ || ignores.any? { |pat| line =~ pat } }
+      fail "Uncommitted SVN files violate the First Principle Of Release!\n#{status}" unless
+        status.empty?
+    end
+
     # Change the Rakefile and update the current version number to the
     # next version number (VERSION_NUMBER = NEXT_VERSION). We need this
     # before making a release with the next version. Return the next version.
@@ -54,54 +111,43 @@ module Buildr
       File.open(Rake.application.rakefile, "w") { |file| file.write rakefile }
 
       # Commit new version number.
-      svn "commit", "-m", "Changed release number to #{version}"
+      svn "commit", "-m", "Changed version number to #{version}", Rake.application.rakefile
     end
 
     # Create a tag in the SVN repository.
-    def tag_repository()
+    def tag_repository(version)
       # Copy to tag.
       cur_url = svn("info").scan(/URL: (.*)/)[0][0]
-      new_url = cur_url.sub(/trunk$/, "tags/#{cur_ver}")
-      svn "copy", cur_url, new_url
+      new_url = cur_url.sub(/trunk$/, "tags/#{version}")
+      svn "remove", new_url, "-m", "Removing old copy" rescue nil
+      svn "copy", cur_url, new_url, "-m", "Release #{version}"
     end
 
-    def svn(*args)
-      stdin, stdout, stderr = Open3.popen3("svn", *args)
-      stdin.close
-      error = stderr.read
-      fail error unless error.empty?
-      stdout.read
+    def update_version_to_snapshot(version)
+      version += "-SNAPSHOT"
+      rakefile = File.read(Rake.application.rakefile)
+      rakefile.gsub!(VERSION_NUMBER_PATTERN) { |ver| ver.sub(/(["']).*\1/, %Q{"#{version}"}) }
+      File.open(Rake.application.rakefile, "w") { |file| file.write rakefile }
+      # Commit new version number.
+      svn "commit", "-m", "Changed version number to #{version}", Rake.application.rakefile
     end
-  end
 
-  # Handles the build and clean tasks.
-  desc "Clean all projects"
-  LocalDirectoryTask.define_task("clean")
-  desc "Build all projects"
-  LocalDirectoryTask.define_task("build")
-  desc "Make a release"
-  ReleaseTask.define_task "release"
-
-  class Project
-    def build(*args, &block)
-      returning(@build_task ||= recursive_task("build")) do |task|
-        task.enhance args, &block
+    def svn(*args)
+      if Hash === args.last
+        options = args.pop
+      else
+        options = { :verbose=>verbose }
       end
-    end
-
-    def clean(*args, &block)
-      returning(@clean_task ||= recursive_task("clean")) do |task|
-        task.enhance args, &block
+      puts ["svn", *args].join(" ") if options[:verbose]
+      Open3.popen3("svn", *args) do |stdin, stdout, stderr|
+        stdin.close
+        error = stderr.read
+        fail error unless error.empty?
+        returning(stdout.read) { |output| puts output if Rake.application.options.trace }
       end
     end
   end
 
-  Project.on_create do |project|
-    desc "Clean all files generated during the build process"
-    project.clean
-
-    desc "Build this project"
-    project.build
-  end
-
+  desc "Make a release"
+  ReleaseTask.define_task "release"
 end