buildr 1.4.25 → 1.5.0.dev2

data/doc/packaging.textile

@@ -375,7 +375,7 @@ The bundle packaging format is included as an addon so the build file must expli
 {% highlight ruby %}
 require "buildr/bnd"
 
-repositories.remote << Buildr::Bnd.remote_repository
+repositories.remote << "http://central.maven.org/maven2"
 # uncomment the next version to override the version of bnd
 # Buildr::Bnd.version = '0.0.384'
 

data/doc/preface.textile

@@ -22,7 +22,7 @@ p(title). !images/zbuildr.png!
 
 p(preface).  !images/asf-logo.png!
 
-Copyright 2007-2009 Apache Buildr
+Copyright 2007-2016 Apache Buildr
 
 Licensed 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
 

data/doc/projects.textile

@@ -64,6 +64,19 @@ A project definition requires four pieces of information: the project name, grou
 
 Everything else depends on what that particular project is building.  And it all goes inside the project definition block, the piece of code that comes between @define <name> ..  do@ and @end@.
 
+h2(#instructions_order). Order is important
+When defining your project, the order in which you place instructions matter.
+
+For example, the project below will not pick up resources because they are defined after the package instruction.
+
+{% highlight ruby %}
+define 'testwar' do
+project.version = 1.0
+package(:war)
+project.resources.from(_('src/main/java')).exclude('*.java')
+end
+{% endhighlight ruby %}
+
 
 h2(#dir_structure). The Directory Structure
 

data/doc/releasing.textile

@@ -113,6 +113,20 @@ end
 
 The environment variable @NEXT_VERSION@ has precedence over Release.next_version.
 
+h3(#alternate_version_file). Using an alternate version file
+
+To avoid dealing with conflicts over the Buildfile, you can store the version inside version.rb next to it.
+
+version.rb:
+{% highlight ruby %}
+THIS_VERSION = "1.0.0-rc1"
+{% endhighlight %}
+
+Your Buildfile should import version.rb like so:
+{% highlight ruby %}
+require File.join(File.dirname(__FILE__), 'version.rb')
+{% endhighlight %}
+
 h2(#custom_tag_and_msg). How to specify my own tag name and commit message?
 
 As explained earlier, Buildr will create two new commits and a new tag in the version control system. Similarly to @Release.next_version@, the commit message and the tag name can be customized with @Release.message@ and @Release.tag_name@. Both could be strings or procs that would receive the released version @THIS_VERSION@ without @-SNAPSHOT@.

data/doc/settings_profiles.textile

@@ -81,6 +81,10 @@ repositories:
   remote:
    - https://intra.net/maven2
    - http://example.com
+   
+  # specify the corporate mirror
+  mirrors:
+   - http://www.corporateserver001.com/repo
 
   release_to:
     url: http://intra.net/maven2

data/lib/buildr.rb

@@ -76,6 +76,7 @@ require 'buildr/packaging/test_jar'
 require RUBY_PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
 require 'buildr/java/ant'
 require 'buildr/java/compiler'
+require 'buildr/java/ecj'
 require 'buildr/java/external'
 require 'buildr/java/tests'
 require 'buildr/java/test_result'

data/lib/buildr/core/application.rb

@@ -106,8 +106,7 @@ module Buildr
 
   class Application < Rake::Application #:nodoc:
 
-    # Deprecated: rakefile/Rakefile, removed in 1.5
-    DEFAULT_BUILDFILES = ['buildfile', 'Buildfile', 'buildfile.rb', 'Buildfile.rb'] + DEFAULT_RAKEFILES
+    DEFAULT_BUILDFILES = ['buildfile', 'Buildfile', 'buildfile.rb', 'Buildfile.rb']
 
     attr_reader :rakefiles, :requires
     private :rakefiles, :requires
@@ -331,7 +330,7 @@ module Buildr
         ['--rules', "Trace the rules resolution.",
           lambda { |value| options.trace_rules = true }
         ],
-        ['--no-search', '--nosearch', '-N', "Do not search parent directories for the Rakefile.",
+        ['--no-search', '--nosearch', '-N', "Do not search parent directories for the Buildfile.",
           lambda { |value| options.nosearch = true }
         ],
         ['--silent', '-s', "Like --quiet, but also suppresses the 'in directory' announcement.",

data/lib/buildr/core/build.rb

@@ -56,30 +56,6 @@ module Buildr #:nodoc:
 
     after_define(:build)
 
-    # *Deprecated:* Use +path_to(:target)+ instead.
-    def target
-      Buildr.application.deprecated 'Use path_to(:target) instead'
-      layout.expand(:target)
-    end
-
-    # *Deprecated:* Use Layout instead.
-    def target=(dir)
-      Buildr.application.deprecated 'Use Layout instead'
-      layout[:target] = _(dir)
-    end
-
-    # *Deprecated:* Use +path_to(:reports)+ instead.
-    def reports()
-      Buildr.application.deprecated 'Use path_to(:reports) instead'
-      layout.expand(:reports)
-    end
-
-    # *Deprecated:* Use Layout instead.
-    def reports=(dir)
-      Buildr.application.deprecated 'Use Layout instead'
-      layout[:reports] = _(dir)
-    end
-
     # :call-seq:
     #    build(*prereqs) => task
     #    build { |task| .. } => task
@@ -353,7 +329,7 @@ module Buildr #:nodoc:
     # Extract the current version number from the buildfile.
     # Raise an error if not found.
     def extract_version
-      buildfile = File.read(Buildr.application.buildfile.to_s)
+      buildfile = File.read(version_file)
       buildfile.scan(THIS_VERSION_PATTERN)[0][2]
     rescue
       fail 'Looking for THIS_VERSION = "..." in your Buildfile, none found'
@@ -373,6 +349,17 @@ module Buildr #:nodoc:
 
     # the initial value of THIS_VERSION
     attr_accessor :this_version
+    
+    # :call-seq:
+    #   version_file()
+    # Provides the file containing the version of the project.
+    # If the project contains a version.rb file next to the Buildr build file,
+    # it is used. Otherwise, always use the buildfile.
+    def version_file
+      version_rb_file = File.dirname(Buildr.application.buildfile.to_s)  + '/version.rb'
+      return version_rb_file if File.exists?(version_rb_file)
+      return Buildr.application.buildfile.to_s
+    end
 
     # :call-seq:
     #   with_release_candidate_version() { |filename| ... }
@@ -390,7 +377,7 @@ module Buildr #:nodoc:
     #   THIS_VERSION = 1.1.0
     # for the release buildfile.
     def with_release_candidate_version
-      release_candidate_buildfile = Buildr.application.buildfile.to_s + '.next'
+      release_candidate_buildfile = version_file + '.next'
 
       release_candidate_buildfile_contents = change_version { |version|
         version.gsub(/-SNAPSHOT$/, "")
@@ -398,7 +385,7 @@ module Buildr #:nodoc:
       File.open(release_candidate_buildfile, 'w') { |file| file.write release_candidate_buildfile_contents }
       begin
         yield release_candidate_buildfile
-        mv release_candidate_buildfile, Buildr.application.buildfile.to_s
+        mv release_candidate_buildfile, version_file
       ensure
         rm release_candidate_buildfile rescue nil
       end
@@ -415,7 +402,7 @@ module Buildr #:nodoc:
     def change_version
       current_version = extract_version
       new_version = yield(current_version)
-      buildfile = File.read(Buildr.application.buildfile.to_s)
+      buildfile = File.read(version_file)
       buildfile.gsub(THIS_VERSION_PATTERN) { |ver| ver.sub(/(["']).*\1/, %Q{"#{new_version}"}) }
     end
 
@@ -451,7 +438,7 @@ module Buildr #:nodoc:
       buildfile = change_version { |version| # THIS_VERSION minus SNAPSHOT
         resolve_next_version(this_version) # THIS_VERSION
       }
-      File.open(Buildr.application.buildfile.to_s, 'w') { |file| file.write buildfile }
+      File.open(version_file, 'w') { |file| file.write buildfile }
     end
 
     # Return the message to use to commit the buildfile with the next version
@@ -498,7 +485,7 @@ module Buildr #:nodoc:
     def tag_release(tag)
       unless this_version == extract_version
         info "Committing buildfile with version number #{extract_version}"
-        Hg.commit File.basename(Buildr.application.buildfile.to_s), message
+        Hg.commit File.basename(version_file), message
         Hg.push if Hg.remote
       end
       info "Tagging release #{tag}"
@@ -510,7 +497,7 @@ module Buildr #:nodoc:
     def update_version_to_next
       super
       info "Current version is now #{extract_version}"
-      Hg.commit File.basename(Buildr.application.buildfile.to_s), message
+      Hg.commit File.basename(version_file), message
       Hg.push if Hg.remote
     end
   end
@@ -546,7 +533,7 @@ module Buildr #:nodoc:
     def tag_release(tag)
       unless this_version == extract_version
         info "Committing buildfile with version number #{extract_version}"
-        Git.commit File.basename(Buildr.application.buildfile.to_s), message
+        Git.commit File.basename(version_file), message
         Git.push if Git.remote
       end
       info "Tagging release #{tag}"
@@ -559,7 +546,7 @@ module Buildr #:nodoc:
     def update_version_to_next
       super
       info "Current version is now #{extract_version}"
-      Git.commit File.basename(Buildr.application.buildfile.to_s), message
+      Git.commit File.basename(version_file), message
       Git.push if Git.remote
     end
   end
@@ -588,7 +575,7 @@ module Buildr #:nodoc:
     def update_version_to_next
       super
       info "Current version is now #{extract_version}"
-      Svn.commit Buildr.application.buildfile.to_s, message
+      Svn.commit version_file, message
     end
   end
 

data/lib/buildr/core/compile.rb

@@ -277,18 +277,6 @@ module Buildr #:nodoc:
       self
     end
 
-    # *Deprecated*: Use dependencies instead.
-    def classpath
-      Buildr.application.deprecated 'Use dependencies instead.'
-      dependencies
-    end
-
-    # *Deprecated*: Use dependencies= instead.
-    def classpath=(artifacts)
-      Buildr.application.deprecated 'Use dependencies= instead.'
-      self.dependencies = artifacts
-    end
-
     # Compilation dependencies.
     attr_accessor :dependencies
 

data/lib/buildr/core/filter.rb

@@ -308,8 +308,15 @@ module Buildr #:nodoc:
         end
         self
       end
+      
+      BINARY_FILES = [ '*.png', '*.gif', '*.jpg', '*.jpeg' ]
+
+      def is_binary?(content, path)
+        !!path && BINARY_FILES.any? { |glob| File.fnmatch(glob, path) }
+      end
 
       def transform(content, path = nil)
+        return content if is_binary?(content, path)
         type = Regexp === mapper_type ? :regexp : mapper_type
         raise ArgumentError, "Invalid mapper type: #{type.inspect}" unless respond_to?("#{type}_transform", true)
         self.__send__("#{type}_transform", content, path) { |key| config[key] || config[key.to_s.to_sym] }

data/lib/buildr/core/generate.rb

@@ -168,6 +168,7 @@ EOF
           if natures && natures.index('org.eclipse.pde.PluginNature')
             script << "  package(:jar)"
           end
+          script << "  dependencies ||= []"
           if mf && mf.main['Require-Bundle']
             mf.main['Require-Bundle'].split(',').each do
               |bundle|

data/lib/buildr/core/project.rb

@@ -214,12 +214,14 @@ module Buildr #:nodoc:
               project.send :call_callbacks, :after_define
             end
           end
-          project.enhance do |project|
-            @on_define.each { |extension| extension[project] }
-          end if @on_define
           # Enhance the project using the definition block.
           project.enhance { project.instance_exec project, &block } if block
 
+          # Mark the project as defined
+          project.enhance do |project|
+            project.send :define!
+          end
+
           # Top-level project? Invoke the project definition. Sub-project? We don't invoke
           # the project definiton yet (allow project calls to establish order of evaluation),
           # but must do so before the parent project's definition is done.
@@ -253,7 +255,7 @@ module Buildr #:nodoc:
         end
         project ||= @projects[name] # Not found in scope.
         raise "No such project #{name}" unless project
-        project.invoke unless no_invoke || Buildr.application.current_scope.join(":").to_s == project.name.to_s
+        project.invoke unless  project.defined? || no_invoke || Buildr.application.current_scope.join(":").to_s == project.name.to_s
         project
       end
 
@@ -614,7 +616,15 @@ module Buildr #:nodoc:
       @calledback ||= {}
     end
 
+    def defined?
+      @defined
+    end
+
   protected
+    def define!
+      @defined = true
+    end
+    
 
     # :call-seq:
     #   base_dir = dir

data/lib/buildr/core/test.rb

@@ -261,7 +261,7 @@ module Buildr #:nodoc:
 
     def execute(args) #:nodoc:
       if Buildr.options.test == false
-        info "Skipping tests for #{project.name}"
+        trace "Skipping tests for #{project.name}"
         return
       end
       setup.invoke
@@ -357,13 +357,11 @@ module Buildr #:nodoc:
     def using(*args)
       args.pop.each { |key, value| options[key.to_sym] = value } if Hash === args.last
       args.each do |name|
+        info name
         if TestFramework.has?(name)
           self.framework = name
         elsif name == :integration
           options[:integration] = true
-        else
-          Buildr.application.deprecated "Please replace with using(:#{name}=>true)"
-          options[name.to_sym] = true
         end
       end
       self

data/lib/buildr/core/transports.rb

@@ -279,6 +279,8 @@ module URI
         headers['User-Agent'] = "Buildr-#{Buildr::VERSION}"
         request = Net::HTTP::Get.new(request_uri.empty? ? '/' : request_uri, headers)
         request.basic_auth self.user, self.password if self.user
+        http.verify_mode = ::OpenSSL::SSL.const_get(ENV['SSL_VERIFY_MODE']) if ENV['SSL_VERIFY_MODE']
+        http.ca_path = ENV['SSL_CA_CERTS'] if ENV['SSL_CA_CERTS']
         http.request request do |response|
           case response
           when Net::HTTPNotModified

data/lib/buildr/groovy/bdd.rb

@@ -53,13 +53,6 @@ module Buildr::Groovy
           **/*Specification.groovy **/*Story.groovy
         }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
       end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated "Please use JBehave.dependencies/.version instead of JBehave::REQUIRES/VERSION"
-        dependencies
-      end
     end
 
     def tests(dependencies) #:nodoc:

data/lib/buildr/ide/eclipse.rb

@@ -460,9 +460,9 @@ module Buildr #:nodoc:
     module Scala
       include Extension
 
-      NATURE    = 'ch.epfl.lamp.sdt.core.scalanature'
-      CONTAINER = 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER'
-      BUILDER   = 'ch.epfl.lamp.sdt.core.scalabuilder'
+      NATURE    = 'org.scala-ide.sdt.core.scalanature'
+      CONTAINER = 'org.scala-ide.sdt.launching.SCALA_CONTAINER'
+      BUILDER   = 'org.scala-ide.sdt.core.scalabuilder'
 
       after_define :eclipse => :eclipse_scala
       after_define :eclipse_scala do |project|

data/lib/buildr/java/ant.rb

@@ -37,12 +37,6 @@ module Buildr #:nodoc:
         @dependencies ||= ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}"]
       end
 
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated "Please use Ant.dependencies/.version instead of Ant::REQUIRES/VERSION"
-        dependencies
-      end
     end
 
 

data/lib/buildr/java/bdd.rb

@@ -309,13 +309,6 @@ module Buildr #:nodoc:
           **/*Behaviour.java **/*Behavior.java
         }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
       end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated 'Please use JBehave.dependencies/.version instead of JBehave::REQUIRES/VERSION'
-        dependencies
-      end
     end
 
     def tests(dependencies) #:nodoc:

data/lib/buildr/java/commands.rb

@@ -75,7 +75,7 @@ module Java
             end
             manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.join(" ")}])
             tjar = Tempfile.new(['javacmd', '.jar'])
-            Zip::ZipOutputStream.open(tjar.path) do |zos|
+            Zip::OutputStream.open(tjar.path) do |zos|
               zos.put_next_entry('META-INF/MANIFEST.MF')
               zos.write manifest.to_s
               zos.write "\n"

data/lib/buildr/java/deprecated.rb

@@ -15,48 +15,6 @@
 
 module Java #:nodoc:
 
-  # *Deprecated:* In earlier versions, Java.wrapper served as a wrapper around RJB/JRuby.
-  # From this version forward, we apply with JRuby style for importing Java classes:
-  #   Java.java.lang.String.new('hai!')
-  # You still need to call Java.load before using any Java code: it resolves, downloads
-  # and installs various dependencies that are required on the classpath before calling
-  # any Java code (e.g. Ant and its tasks).
-  class JavaWrapper
-
-    include Singleton
-
-    # *Deprecated:* Append to Java.classpath directly.
-    def classpath
-      Buildr.application.deprecated 'Append to Java.classpath instead.'
-      ::Java.classpath
-    end
-
-    def classpath=(paths)
-      fail 'Deprecated: Append to Java.classpath, you cannot replace the classpath.'
-    end
-
-    # *Deprecated:* No longer necessary.
-    def setup
-      Buildr.application.deprecated 'See documentation for new way to access Java code.'
-      yield self if block_given?
-    end
-
-    # *Deprecated:* Use Java.load instead.
-    def load
-      Buildr.application.deprecated 'Use Java.load instead.'
-      ::Java.load
-    end
-
-    alias :onload :setup
-
-    # *Deprecated:* Use Java.pkg.pkg.ClassName to import a Java class.
-    def import(class_name)
-      Buildr.application.deprecated 'Use Java.pkg.pkg.ClassName to import a Java class.'
-      ::Java.instance_eval(class_name)
-    end
-  end
-
-
   class << self
 
     # *Deprecated*: Use Java::Commands.java instead.
@@ -97,24 +55,6 @@ module Java #:nodoc:
       ENV['JAVA_HOME']
     end
 
-    # *Deprecated:* In earlier versions, Java.wrapper served as a wrapper around RJB/JRuby.
-    # From this version forward, we apply with JRuby style for importing Java classes:
-    #   Java.java.lang.String.new('hai!')
-    # You still need to call Java.load before using any Java code: it resolves, downloads
-    # and installs various dependencies that are required on the classpath before calling
-    # any Java code (e.g. Ant and its tasks).
-    def wrapper
-      Buildr.application.deprecated 'See documentation for new way to access Java code.'
-      if block_given?
-        Java.load
-        yield JavaWrapper.instance
-      else
-        JavaWrapper.instance
-      end
-    end
-
-    alias :rjb :wrapper
-
   end