buildr 1.5.0-x86-mswin32 → 1.5.1-x86-mswin32

data/lib/buildr/java/ecj.rb

@@ -17,9 +17,9 @@ module Buildr #:nodoc:
   module Compiler #:nodoc:
 
     class Ecj < Javac
-      
+
       VERSION = "4.5.1"
-      
+
       class << self
         # Current version of ECJ being used.
         def version

data/lib/buildr/java/jruby.rb

@@ -75,19 +75,19 @@ module Java
       @classpath ||= begin
         classpath = []
         class << classpath
-          
+
           def new_add(*args)
             warn 'Java is already loaded' if Java.loaded?
             send(:old_add, *args)
           end
-          
+
           alias_method :old_add, :<<
           alias_method :<<, :new_add
         end
         classpath
       end
     end
-    
+
     # Returns true if the JVM is loaded with all the libraries loaded on the classpath.
     def loaded?
       @loaded

data/lib/buildr/java/packaging.rb

@@ -210,6 +210,9 @@ module Buildr #:nodoc:
 
         def initialize(*args) #:nodoc:
           super
+          enhance do
+            pom.invoke rescue nil if pom && pom != self && classifier.nil?
+          end
         end
 
         # :call-seq:
@@ -223,11 +226,10 @@ module Buildr #:nodoc:
         #   package(:jar).with(:manifest=>'MANIFEST_MF')
         def with(*args)
           super args.pop if Hash === args.last
-          fail "package.with() should not contain nil values" if args.include? nil
+          fail 'package.with() should not contain nil values' if args.include? nil
           include :from=>args if args.size > 0
           self
         end
-
       end
 
 
@@ -521,8 +523,8 @@ module Buildr #:nodoc:
           buffer = ""
           xml = Builder::XmlMarkup.new(:target=>buffer, :indent => 2)
           xml.declare! :DOCTYPE, :application, :PUBLIC,
-          "-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN",
-          "http://java.sun.com/j2ee/dtds/application_1_2.dtd"
+                       '-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN',
+                       'http://java.sun.com/j2ee/dtds/application_1_2.dtd'
           xml.application do
             xml.tag! 'display-name', display_name
             desc = self.description || @project.comment

data/lib/buildr/java/rjb.rb

@@ -65,7 +65,7 @@ ENV_JAVA = {}
 #    with a partial classpath, or before all remote repositories are listed.
 # 4. Check on a clean build with empty local repository.
 module Java
-  
+
   module Package #:nodoc:
 
     def method_missing(sym, *args, &block)
@@ -78,7 +78,7 @@ module Java
   end
 
   class << self
-    
+
     # Returns the classpath, an array listing directories, JAR files and
     # artifacts.  Use when loading the extension to add any additional
     # libraries used by that extension.
@@ -89,19 +89,19 @@ module Java
       @classpath ||= begin
         classpath = []
         class << classpath
-          
+
           def new_add(*args)
             warn 'Java is already loaded' if Java.loaded?
             send(:old_add, *args)
           end
-          
+
           alias_method :old_add, :<<
           alias_method :<<, :new_add
         end
         classpath
       end
     end
-    
+
     # Returns true if the JVM is loaded with all the libraries loaded on the classpath.
     def loaded?
       @loaded

data/lib/buildr/packaging/archive.rb

@@ -327,7 +327,7 @@ module Buildr #:nodoc:
 
       # Make sure we're the last enhancements, so other enhancements can add content.
       enhance do
-        @file_map = OrderedHash.new
+        @file_map = {}
         enhance do
           send 'create' if respond_to?(:create)
           # We're here because the archive file does not exist, or one of the files is newer than the archive contents;
@@ -360,7 +360,7 @@ module Buildr #:nodoc:
     #
     #    package(:jar).clean.include path_to('desired/content')
     def clean
-      @paths = OrderedHash.new
+      @paths = {}
       @paths[''] = Path.new(self, '')
       @prepares = []
       self
@@ -485,7 +485,7 @@ module Buildr #:nodoc:
       @prepares.each { |prepare| prepare.call(self) }
       @prepares.clear
 
-      file_map = OrderedHash.new
+      file_map = {}
       @paths.each do |name, path|
         path.add_files(file_map)
       end

data/lib/buildr/packaging/artifact.rb

@@ -35,7 +35,7 @@ module Buildr #:nodoc:
   module ActsAsArtifact
 
     ARTIFACT_ATTRIBUTES = [:group, :id, :type, :classifier, :version]
-    MAVEN_METADATA = "maven_metadata.xml"
+    MAVEN_METADATA = 'maven-metadata.xml'
 
     class << self
     private
@@ -73,10 +73,12 @@ module Buildr #:nodoc:
     # Optional artifact classifier.
     attr_reader :classifier
 
+    attr_accessor :buildr_project
+
     def snapshot?
       version =~ /-SNAPSHOT$/
     end
-    
+
     def final_version
       return version unless snapshot?
       Time.now.strftime("%Y%m%d.%H%M%S")
@@ -145,19 +147,23 @@ module Buildr #:nodoc:
     #
     # Creates POM XML for this artifact.
     def pom_xml
-      Proc.new do
-        xml = Builder::XmlMarkup.new(:indent=>2)
-        xml.instruct!
-        xml.project do
-          xml.modelVersion  '4.0.0'
-          xml.groupId       group
-          xml.artifactId    id
-          xml.version       version
-          xml.classifier    classifier if classifier
+      if self.buildr_project
+        Buildr::CustomPom.pom_xml(self.buildr_project, self)
+      else
+        Proc.new do
+          xml = Builder::XmlMarkup.new(:indent => 2)
+          xml.instruct!
+          xml.project do
+            xml.modelVersion '4.0.0'
+            xml.groupId group
+            xml.artifactId id
+            xml.version version
+            xml.classifier classifier if classifier
+          end
         end
       end
     end
-    
+
     # :call-seq:
     #   maven_metadata_xml => string
     #
@@ -260,12 +266,12 @@ module Buildr #:nodoc:
     def group_path
       group.gsub('.', '/')
     end
-    
+
     def upload_name
       return File.basename(name) unless snapshot?
       return File.basename(name).gsub(/SNAPSHOT/, "#{final_version}-1")
     end
-    
+
     def extract_type(type)
       return :jar if type == :bundle
       type
@@ -664,7 +670,7 @@ module Buildr #:nodoc:
       spec = Artifact.to_hash(spec)
       File.join(local, spec[:group].split('.'), spec[:id], spec[:version], Artifact.hash_to_file_name(spec))
     end
-    
+
     # :call-seq:
     #   mirrors => Array
     #
@@ -684,7 +690,7 @@ module Buildr #:nodoc:
       end
       @mirrors
     end
-    
+
     # :call-seq:
     #   remote = Array
     #   remote = url
@@ -733,20 +739,20 @@ module Buildr #:nodoc:
       end
       @remote
     end
-    
+
     # :call-seq:
     #   remote_uri => Array
     #
     # Returns an array of all the remote repositories as instances of URI
     #
-    # Supports 
+    # Supports
     #  * String urls: "http://example.com/repo"
     #  * URI: URI.parse( "http://example.com/repo" )
     #  * Hash: { :url => "http://example.com/repo", :user => "user", :pass => "pass" }
     #
     def remote_uri
       remote
-      
+
       uris = []
       @remote.each do |repo|
         case repo
@@ -761,7 +767,7 @@ module Buildr #:nodoc:
             if ( username = (repo[:username] || repo['username'] || repo[:user] || repo['user']) )
               uri.user = username
             end
-            
+
             if ( password = (repo[:password] || repo['password'] || repo[:pass] || repo['pass']) )
               uri.password = password
             end
@@ -769,14 +775,14 @@ module Buildr #:nodoc:
           else
             fail( "Repository Hash format missing url: #{repo}" )
           end
-          
-        when String then 
+
+        when String then
           uris << URI.parse(repo)
-        else 
+        else
           fail( "Unsupported Repository format: #{repo}" )
         end
       end
-      
+
       uris
     end
 

data/lib/buildr/packaging/package.rb

@@ -168,6 +168,7 @@ module Buildr #:nodoc:
         else
           # Make it an artifact using the specifications, and tell it how to create a POM.
           package.extend ActsAsArtifact
+          package.buildr_project = self
           package.send :apply_spec, spec.only(*Artifact::ARTIFACT_ATTRIBUTES)
 
           # Create pom associated with package
@@ -177,7 +178,7 @@ module Buildr #:nodoc:
                 pom_filename = Util.replace_extension(self.name, 'pom')
                 spec = {:group=>group, :id=>id, :version=>version, :type=>:pom}
                 @pom = Buildr.artifact(spec, pom_filename)
-                @pom.content @pom.pom_xml
+                @pom.content Buildr::CustomPom.pom_xml(self.buildr_project, self)
               end
               @pom
             end

data/lib/buildr/packaging/zip.rb

@@ -40,9 +40,9 @@ module Zip #:nodoc:
       write_e_o_c_d(io, offset, cdir_size)
     end
   end
-  
+
   class File
-    
+
     # :call-seq:
     #   exist() => boolean
     #

data/lib/buildr/scala/bdd.rb

@@ -20,11 +20,11 @@ module Buildr::Scala #:nodoc:
     @bdd_dir = :spec
 
     VERSION = case
-      when Buildr::Scala.version?("2.8.0"),  Buildr::Scala.version?("2.8.1"), Buildr::Scala.version?("2.8.2")
+      when Buildr::Scala.version?('2.8.0'),  Buildr::Scala.version?('2.8.1'), Buildr::Scala.version?('2.8.2')
         '1.5'
-      when Buildr::Scala.version?("2.9")
+      when Buildr::Scala.version?('2.9')
         '1.11'
-      when  Buildr::Scala.version?("2.10")
+      when  Buildr::Scala.version?('2.10')
         '1.12.3'
       else
         '3.7' # default for Scala 2.11 and beyond
@@ -46,27 +46,27 @@ module Buildr::Scala #:nodoc:
           when Buildr.settings.build['scala.specs2.artifact']
             Buildr.settings.build['scala.specs2.artifact']
           else
-            if Buildr::Scala.version < "2.11"
+            if Buildr::Scala.version < '2.11'
               "specs2_#{Buildr::Scala.version_without_build_number}"
             else
               "specs2_#{Buildr::Scala.version_major_minor}"
             end
         end
       end
-      
+
       def type
-        if Buildr::Scala.version < "2.11"
-          "jar"
+        if Buildr::Scala.version < '2.11'
+          'jar'
         else
-          "pom"
+          'pom'
         end
       end
 
       def scalaz_dependencies
-        if Buildr::Scala.version?("2.8")
+        if Buildr::Scala.version?('2.8')
           []
-        elsif Buildr::Scala.version < "2.11"
-          default_version = "6.0.1"
+        elsif Buildr::Scala.version < '2.11'
+          default_version = '6.0.1'
           custom_version = Buildr.settings.build['scala.specs2-scalaz']
           version = (custom_version =~ /:/) ? Buildr.artifact(custom_version).version : default_version
 
@@ -74,9 +74,9 @@ module Buildr::Scala #:nodoc:
 
           custom_spec = Buildr.settings.build['scala.specs2-scalaz']
           spec = [ (custom_spec =~ /:/) ? custom_spec : "org.specs2:#{artifact}:jar:#{version}" ]
-          Buildr.transitive(spec, :scopes => [nil, "compile", "runtime", "provided", "optional"], :optional => true)
+          Buildr.transitive(spec, :scopes => [nil, 'compile', 'runtime', 'provided', 'optional'], :optional => true)
         else
-          default_version = "7.2.2"
+          default_version = '7.2.2'
           custom_version = Buildr.settings.build['scala.specs2-scalaz']
           version = (custom_version =~ /:/) ? Buildr.artifact(custom_version).version : default_version
 
@@ -84,7 +84,7 @@ module Buildr::Scala #:nodoc:
 
           custom_spec = Buildr.settings.build['scala.specs2-scalaz']
           spec = [ (custom_spec =~ /:/) ? custom_spec : "org.scalaz:#{artifact}:jar:#{version}" ]
-          [Buildr.transitive(spec, :scopes => [nil, "compile", "runtime", "provided", "optional"], :optional => true), "org.scala-lang.modules:scala-xml_2.11:jar:1.0.1"]
+          [Buildr.transitive(spec, :scopes => [nil, 'compile', 'runtime', 'provided', 'optional'], :optional => true), 'org.scala-lang.modules:scala-xml_2.11:jar:1.0.1']
         end
       end
 
@@ -92,9 +92,9 @@ module Buildr::Scala #:nodoc:
         unless @dependencies
           super
 
-          # Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
+          # Add utility classes and other dependencies
           options = {
-            :scopes => [nil, "compile", "runtime", "provided", "optional"],
+            :scopes => [nil, 'compile', 'runtime', 'provided', 'optional'],
             :optional => true
           }
           @dependencies |= [ File.join(File.dirname(__FILE__)) ] + Buildr.transitive(specs, options) +
@@ -113,7 +113,7 @@ module Buildr::Scala #:nodoc:
     private
 
       def find(file, pattern)
-        File.open(file, "r") do |infile|
+        File.open(file, 'r') do |infile|
           while (line = infile.gets)
             return true if line.match(pattern)
           end
@@ -133,21 +133,21 @@ module Buildr::Scala #:nodoc:
     end
 
     def tests(dependencies)
-      filter_classes(dependencies, :interfaces => ['org.specs2.Specification', 'org.specs2.mutable.Specification'])
+      filter_classes(dependencies, :interfaces => %w(org.specs2.Specification org.specs2.mutable.Specification))
     end
 
     def run(specs, dependencies)  #:nodoc:
-      properties = { "specs2.outDir" => task.compile.target.to_s }
+      properties = {'specs2.outDir' => task.compile.target.to_s }
 
       cmd_options = { :properties => options[:properties].merge(properties),
                       :java_args => options[:java_args],
                       :classpath => dependencies,
                       :name => false }
 
-      runner = 'org.apache.buildr.Specs2Runner'
+      runner = 'org.specs2.runner.ClassRunner'
       specs.inject [] do |passed, spec|
         begin
-          Java::Commands.java(runner, spec, cmd_options)
+          Java::Commands.java('io.tmio.scalamain.Main', runner, 'run', spec, cmd_options)
         rescue => e
           passed
         else

data/lib/buildr/scala/compiler.rb

@@ -20,7 +20,7 @@ module Buildr::Scala
   class << self
 
     def version_str
-      warn "Use of Scala.version_str is deprecated.  Use Scala.version instead"
+      warn 'Use of Scala.version_str is deprecated. Use Scala.version instead'
       version
     end
 
@@ -65,7 +65,7 @@ module Buildr::Scala
     def version_without_build
       version.split('-')[0]
     end
-    
+
     # returns Scala version without tiny number.
     # e.g.  "2.11.8" => "2.11"
     def version_major_minor
@@ -90,6 +90,7 @@ module Buildr::Scala
     DEFAULT_ZINC_VERSION  = '0.3.12'
     DEFAULT_SBT_VERSION   = '0.13.12'
     DEFAULT_JLINE_VERSION = '2.14.2'
+    DEFAULT_SCALAMAIN_VERSION = '1.0.3'
 
     class << self
       def scala_home
@@ -116,7 +117,7 @@ module Buildr::Scala
 
       def dependencies
         scala_dependencies = if use_installed?
-          ['scala-library', 'scala-compiler'].map { |s| File.expand_path("lib/#{s}.jar", scala_home) }
+          %w(scala-library scala-compiler).map { |s| File.expand_path("lib/#{s}.jar", scala_home) }
         else
           REQUIRES.artifacts.map(&:to_s)
         end
@@ -127,7 +128,7 @@ module Buildr::Scala
       end
 
       def use_fsc
-        use_installed? && ENV["USE_FSC"] =~ /^(yes|on|true)$/i
+        use_installed? && ENV['USE_FSC'] =~ /^(yes|on|true)$/i
       end
 
       def applies_to?(project, task) #:nodoc:
@@ -164,11 +165,13 @@ module Buildr::Scala
       zinc_version  = Buildr.settings.build['zinc.version']  || DEFAULT_ZINC_VERSION
       sbt_version   = Buildr.settings.build['sbt.version']   || DEFAULT_SBT_VERSION
       jline_version = Buildr.settings.build['jline.version'] || DEFAULT_JLINE_VERSION
+      scalamain_version = Buildr.settings.build['scalamain.version'] || DEFAULT_SCALAMAIN_VERSION
       ns.zinc!          "com.typesafe.zinc:zinc:jar:>=#{zinc_version}"
       ns.sbt_interface! "com.typesafe.sbt:sbt-interface:jar:>=#{sbt_version}"
       ns.incremental!   "com.typesafe.sbt:incremental-compiler:jar:>=#{sbt_version}"
       ns.compiler_interface_sources! "com.typesafe.sbt:compiler-interface:jar:sources:>=#{sbt_version}"
       ns.jline!        "jline:jline:jar:>=#{jline_version}"
+      ns.scalamain!    "io.tmio:scalamain:jar:>=#{scalamain_version}"
     end
 
     Javac = Buildr::Compiler::Javac
@@ -184,7 +187,7 @@ module Buildr::Scala
     def initialize(project, options) #:nodoc:
       super
       # use common options also for javac
-      
+
       options[:javac] ||= Buildr::Compiler::Javac::OPTIONS.inject({}) do |hash, option|
         hash[option] = options[option]
         hash
@@ -272,16 +275,16 @@ module Buildr::Scala
       cmd_args << '-Ssourcepath' << ("-S" + source_paths.join(File::PATH_SEPARATOR)) unless source_paths.empty?
       cmd_args << '-d' << File.expand_path(target)
       cmd_args += scalac_args
-      cmd_args << "-debug" if trace?(:scalac)
+      cmd_args << '-debug' if trace?(:scalac)
 
       cmd_args.map!(&:to_s)
 
       cmd_args += files_from_sources(sources)
 
       unless Buildr.application.options.dryrun
-        trace((['org.apache.buildr.ZincRunner'] + cmd_args).join(' '))
+        trace((%w(io.tmio.scalamain.Main com.typesafe.zinc.Main main) + cmd_args).join(' '))
         begin
-          Java::Commands.java 'org.apache.buildr.ZincRunner', *(cmd_args + [{ :classpath => Scalac.dependencies + [ File.join(File.dirname(__FILE__)) ]}])
+          Java::Commands.java 'io.tmio.scalamain.Main', *(%w(com.typesafe.zinc.Main main) + cmd_args + [{:classpath => Scalac.dependencies + [File.join(File.dirname(__FILE__)) ]}])
         rescue => e
           fail "Zinc compiler crashed:\n#{e.inspect}\n#{e.backtrace.join("\n")}"
         end
@@ -303,7 +306,7 @@ module Buildr::Scala
 
         sources.each do |source|
           # try to extract package name from .java or .scala files
-          if ['.java', '.scala'].include? File.extname(source)
+          if %w(.java .scala).include? File.extname(source)
             name = File.basename(source).split(".")[0]
             package = findFirst(source, /^\s*package\s+([^\s;]+)\s*;?\s*/)
             packages = count(source, /^\s*package\s+([^\s;]+)\s*;?\s*/)
@@ -338,7 +341,7 @@ module Buildr::Scala
 
     def count(file, pattern)
       count = 0
-      File.open(file, "r") do |infile|
+      File.open(file, 'r') do |infile|
         while (line = infile.gets)
           count += 1 if line.match(pattern)
         end
@@ -354,19 +357,19 @@ module Buildr::Scala
     # Returns Scalac command line arguments from the set of options.
     def scalac_args #:nodoc:
       args = []
-      args << "-nowarn" unless options[:warnings]
-      args << "-verbose" if trace?(:scalac)
-      if options[:debug] == true
-        args << (Scala.version?(2.7, 2.8) ? "-g" : "-g:vars")
+      args << '-nowarn' unless options[:warnings]
+      args << '-verbose' if trace?(:scalac)
+      if !!options[:debug]
+        args << (Scala.version?(2.7, 2.8) ? '-g' : '-g:vars')
       elsif options[:debug]
         args << "-g:#{options[:debug]}"
       end
-      args << "-deprecation" if options[:deprecation]
-      args << "-optimise" if options[:optimise]
-      args << "-target:jvm-" + options[:target].to_s if options[:target]
+      args << '-deprecation' if options[:deprecation]
+      args << '-optimise' if options[:optimise]
+      args << '-target:jvm-' + options[:target].to_s if options[:target]
       args += Array(options[:other])
       if zinc?
-        args.map { |arg| "-S" + arg } + Array(options[:zinc_options])
+        args.map { |arg| '-S' + arg } + Array(options[:zinc_options])
       else
         args
       end