buildr 1.4.25-x86-mswin32 → 1.5.0.dev2-x86-mswin32

data/lib/buildr/packaging/zip.rb

@@ -13,6 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require 'zip'
+
 if RUBY_VERSION >= '1.9.0' # Required to properly load RubyZip under Ruby 1.9
   $LOADED_FEATURES.unshift 'ftools'
   require 'fileutils'
@@ -26,29 +28,39 @@ if RUBY_VERSION >= '1.9.0' # Required to properly load RubyZip under Ruby 1.9
   end
 end
 
-require 'zip/zip'
-require 'zip/zipfilesystem'
-
 module Zip #:nodoc:
 
-  class ZipCentralDirectory #:nodoc:
+  class CentralDirectory #:nodoc:
     # Patch to add entries in alphabetical order.
     def write_to_stream(io)
       offset = io.tell
-      @entrySet.sort { |a,b| a.name <=> b.name }.each { |entry| entry.write_c_dir_entry(io) }
-      write_e_o_c_d(io, offset)
+      @entry_set.sort { |a,b| a.name <=> b.name }.each { |entry| entry.write_c_dir_entry(io) }
+      eocd_offset = io.tell
+      cdir_size = eocd_offset - offset
+      write_e_o_c_d(io, offset, cdir_size)
+    end
+  end
+  
+  class File
+    
+    # :call-seq:
+    #   exist() => boolean
+    #
+    # Returns true if this entry exists.
+    def exist?(entry_name)
+      !!find_entry(entry_name)
     end
   end
 
 
-  class ZipEntry
+  class Entry
 
     # :call-seq:
     #   exist() => boolean
     #
     # Returns true if this entry exists.
     def exist?()
-      Zip::ZipFile.open(zipfile) { |zip| zip.file.exist?(@name) }
+      File.open(zipfile) { |zip| zip.exist?(@name) }
     end
 
     # :call-seq:
@@ -56,7 +68,7 @@ module Zip #:nodoc:
     #
     # Returns true if this entry is empty.
     def empty?()
-      Zip::ZipFile.open(zipfile) { |zip| zip.file.read(@name) }.empty?
+      File.open(zipfile) { |zip| zip.read(@name) }.empty?
     end
 
     # :call-seq:
@@ -65,7 +77,7 @@ module Zip #:nodoc:
     # Returns true if this ZIP file entry matches against all the arguments. An argument may be
     # a string or regular expression.
     def contain?(*patterns)
-      content = Zip::ZipFile.open(zipfile) { |zip| zip.file.read(@name) }
+      content = File.open(zipfile) { |zip| zip.read(@name) }
       patterns.map { |pattern| Regexp === pattern ? pattern : Regexp.new(Regexp.escape(pattern.to_s)) }.
         all? { |pattern| content =~ pattern }
     end
@@ -89,7 +101,7 @@ module Zip #:nodoc:
               raise ZipInternalError, "unknown file type #{self.inspect}"
           end
 
-          @externalFileAttributes = (ft << 12 | (@unix_perms & 07777)) << 16
+          @external_file_attributes = (ft << 12 | (@unix_perms & 07777)) << 16
       end
 
       io <<
@@ -105,12 +117,12 @@ module Zip #:nodoc:
          @compressed_size,
          @size,
          @name ? @name.length : 0,
-         @extra ? @extra.c_dir_length : 0,
+         @extra ? @extra.c_dir_size : 0,
          @comment ? comment.to_s.length : 0,
          0,                         # disk number start
-         @internalFileAttributes,   # file type (binary=0, text=1)
-         @externalFileAttributes,   # native filesystem attributes
-         @localHeaderOffset,
+         @internal_file_attributes,   # file type (binary=0, text=1)
+         @external_file_attributes,   # native filesystem attributes
+         @local_header_offset,
          @name,
          @extra,
          @comment
@@ -142,7 +154,7 @@ module Zip #:nodoc:
               raise ZipInternalError, "unknown file type #{self.inspect}"
           end
 
-          @externalFileAttributes = (ft << 12 | (@unix_perms & 07777)) << 16
+          @external_file_attributes = (ft << 12 | (@unix_perms & 07777)) << 16
       end
 
       io <<
@@ -158,12 +170,12 @@ module Zip #:nodoc:
          @compressed_size,
          @size,
          @name ? @name.length : 0,
-         @extra ? @extra.c_dir_length : 0,
+         @extra ? @extra.c_dir_size : 0,
          @comment ? @comment.length : 0,
          0,                         # disk number start
-         @internalFileAttributes,   # file type (binary=0, text=1)
-         @externalFileAttributes,   # native filesystem attributes
-         @localHeaderOffset,
+         @internal_file_attributes,   # file type (binary=0, text=1)
+         @external_file_attributes,   # native filesystem attributes
+         @local_header_offset,
          @name,
          @extra,
          @comment].pack('VCCvvvvvVVVvvvvvVV')
@@ -174,13 +186,4 @@ module Zip #:nodoc:
 
     end
   end
-
-  class ZipEntrySet
-    alias_method :original_push, :"<<"
-    alias_method :push, :"<<"
-
-    def <<(entry)
-      original_push(entry) if entry != nil
-    end
-  end
 end

data/lib/buildr/packaging/ziptask.rb

@@ -42,17 +42,17 @@ module Buildr #:nodoc:
     # for example:
     #   package(:jar).entry("META-INF/LICENSE").should contain(/Apache Software License/)
     def entry(entry_name)
-      ::Zip::ZipEntry.new(name, entry_name)
+      ::Zip::Entry.new(name, entry_name)
     end
 
     def entries #:nodoc:
-      @entries ||= Zip::ZipFile.open(name) { |zip| zip.entries }
+      @entries ||= Zip::File.open(name) { |zip| zip.entries }
     end
 
   private
 
     def create_from(file_map)
-      Zip::ZipOutputStream.open name do |zip|
+      Zip::OutputStream.open name do |zip|
         seen = {}
         mkpath = lambda do |dir|
           dirname = (dir[-1..-1] =~ /\/$/) ? dir : dir + '/'
@@ -63,7 +63,9 @@ module Buildr #:nodoc:
           end
         end
 
-        file_map.each do |path, content|
+        paths = file_map.keys.sort
+        paths.each do |path|
+          content = file_map[path]
           warn "Warning:  Path in zipfile #{name} contains backslash: #{path}" if path =~ /\\/
           mkpath.call File.dirname(path)
           if content.respond_to?(:call)
@@ -166,7 +168,7 @@ module Buildr #:nodoc:
           end
         }
       else
-        Zip::ZipFile.open(zip_file.to_s) do |zip|
+        Zip::File.open(zip_file.to_s) do |zip|
           entries = zip.collect
           @paths.each do |path, patterns|
             patterns.map(entries).each do |dest, entry|

data/lib/buildr/scala.rb

@@ -15,7 +15,6 @@
 
 
 ENV['SCALA_HOME'] ||= '/opt/local/share/scala/' if File.exist?('/opt/local/share/scala/lib/scala-compiler.jar')
-Buildr.repositories.remote << 'http://oss.sonatype.org/content/repositories/releases'
 
 require 'buildr/scala/compiler'
 require 'buildr/scala/tests'

data/lib/buildr/scala/bdd.rb

@@ -15,118 +15,6 @@
 
 module Buildr::Scala #:nodoc:
 
-  # Specs is a Scala based BDD framework.
-  # To use in your project:
-  #
-  #   test.using :specs
-  #
-  # This framework will search in your project for:
-  #   src/spec/scala/**/*.scala
-  class Specs < Buildr::TestFramework::JavaBDD
-    @lang = :scala
-    @bdd_dir = :spec
-
-    VERSION = case
-      when Buildr::Scala.version?("2.8.0")
-        '1.6.5'
-      when Buildr::Scala.version?("2.8.1"), Buildr::Scala.version?("2.8.2"), Buildr::Scala.version?("2.9.0")
-        '1.6.8'
-      else
-        '1.6.9'
-    end
-
-    class << self
-      def version
-        custom = Buildr.settings.build['scala.specs']
-        (custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
-      end
-
-      def specs
-        custom = Buildr.settings.build['scala.specs']
-        [ (custom =~ /:/) ? custom : "org.scala-tools.testing:#{artifact}:jar:#{version}" ]
-      end
-
-      def artifact
-        Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr::Scala.version_without_build}"
-      end
-
-      def dependencies
-        unless @dependencies
-          super
-          # Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
-          @dependencies |= [ File.join(File.dirname(__FILE__)) ] +
-                           specs +
-                           Check.dependencies + JUnit.dependencies + Scalac.dependencies
-        end
-        @dependencies
-      end
-
-      def applies_to?(project)  #:nodoc:
-        scala_files = Dir[project.path_to(:source, bdd_dir, lang, '**/*.scala')]
-        return false if scala_files.empty?
-        scala_files.detect { |f| find(f, /\s+(org\.specs\.)/) }
-      end
-
-    private
-      def const_missing(const)
-        return super unless const == :REQUIRES # TODO: remove in 1.5
-        Buildr.application.deprecated "Please use Scala::Specs.dependencies/.version instead of ScalaSpecs::REQUIRES/VERSION"
-        dependencies
-      end
-
-      def find(file, pattern)
-        File.open(file, "r") do |infile|
-          while (line = infile.gets)
-            return true if line.match(pattern)
-          end
-        end
-        false
-      end
-    end
-
-    def initialize(task, options) #:nodoc:
-      super
-
-      specs = task.project.path_to(:source, :spec, :scala)
-      task.compile.from specs if File.directory?(specs)
-
-      resources = task.project.path_to(:source, :spec, :resources)
-      task.resources.from resources if File.directory?(resources)
-    end
-
-    def tests(dependencies)
-      candidates = filter_classes(dependencies, :interfaces => ['org.specs.Specification'])
-
-      Java.load   # Java is already loaded, but just in case
-
-      filter = Java.org.apache.buildr.JavaTestFilter.new(dependencies.to_java(Java.java.lang.String))
-      filter.add_fields ['MODULE$'].to_java(Java.java.lang.String)
-      filter.filter(candidates.to_java(Java.java.lang.String)).map { |s| s[0..(s.size - 2)] }
-    end
-
-    def run(specs, dependencies)  #:nodoc:
-      cmd_options = { :properties => options[:properties],
-                      :java_args => options[:java_args],
-                      :classpath => dependencies,
-                      :name => false }
-
-      runner = 'org.apache.buildr.SpecsSingletonRunner'
-      specs.inject [] do |passed, spec|
-        begin
-          unless Util.win_os?
-            Java::Commands.java(runner, task.compile.target.to_s, '-c', spec + '$', cmd_options)
-          else
-            Java::Commands.java(runner, task.compile.target.to_s, spec + '$', cmd_options)
-          end
-        rescue => e
-          passed
-        else
-          passed << spec
-        end
-      end
-    end
-  end
-
   class Specs2 < Buildr::TestFramework::JavaBDD
     @lang = :scala
     @bdd_dir = :spec
@@ -136,8 +24,10 @@ module Buildr::Scala #:nodoc:
         '1.5'
       when Buildr::Scala.version?("2.9")
         '1.11'
+      when  Buildr::Scala.version?("2.10")
+        '1.12.3'
       else
-        '1.12.3' # default for Scala 2.10 and beyond
+        '3.7' # default for Scala 2.11 and beyond
     end
 
     class << self
@@ -148,7 +38,7 @@ module Buildr::Scala #:nodoc:
 
       def specs
         custom = Buildr.settings.build['scala.specs2']
-        [ (custom =~ /:/) ? custom : "org.specs2:#{artifact}:jar:#{version}" ]
+        [ (custom =~ /:/) ? custom : "org.specs2:#{artifact}:pom:#{version}" ]
       end
 
       def artifact
@@ -156,14 +46,26 @@ module Buildr::Scala #:nodoc:
           when Buildr.settings.build['scala.specs2.artifact']
             Buildr.settings.build['scala.specs2.artifact']
           else
-            "specs2_#{Buildr::Scala.version_without_build}"
+            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"
+        else
+          "pom"
         end
       end
 
       def scalaz_dependencies
         if Buildr::Scala.version?("2.8")
           []
-        else
+        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
@@ -173,6 +75,16 @@ 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)
+        else
+          default_version = "7.2.2"
+          custom_version = Buildr.settings.build['scala.specs2-scalaz']
+          version = (custom_version =~ /:/) ? Buildr.artifact(custom_version).version : default_version
+
+          artifact = Buildr.settings.build['scala.specs2-scalaz.artifact'] || "scalaz-core_#{Buildr::Scala.version_major_minor}"
+
+          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"]
         end
       end
 
@@ -246,10 +158,4 @@ module Buildr::Scala #:nodoc:
   end
 end
 
-# Backwards compatibility stuff.  Remove in 1.5.
-module Buildr #:nodoc:
-  ScalaSpecs = Scala::Specs
-end
-
-Buildr::TestFramework << Buildr::Scala::Specs
 Buildr::TestFramework << Buildr::Scala::Specs2

data/lib/buildr/scala/compiler.rb

@@ -15,7 +15,7 @@
 
 # The Scala Module
 module Buildr::Scala
-  DEFAULT_VERSION = '2.9.2'
+  DEFAULT_VERSION = '2.11.8'
 
   class << self
 
@@ -29,7 +29,7 @@ module Buildr::Scala
         @installed_version = if Scalac.installed?
           begin
             # try to read the value from the properties file
-            props = Zip::ZipFile.open(File.expand_path('lib/scala-library.jar', Scalac.scala_home)) do |zipfile|
+            props = Zip::File.open(File.expand_path('lib/scala-library.jar', Scalac.scala_home)) do |zipfile|
               zipfile.read 'library.properties'
             end
 
@@ -65,6 +65,12 @@ 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
+      version.split('.')[0..1].join('.')
+    end
   end
 
   # Scalac compiler:
@@ -81,9 +87,9 @@ module Buildr::Scala
   # * :other       -- Array of options to pass to the Scalac compiler as is, e.g. -Xprint-types
   class Scalac < Buildr::Compiler::Base
 
-    DEFAULT_ZINC_VERSION  = '0.1.0'
-    DEFAULT_SBT_VERSION   = '0.12.0'
-    DEFAULT_JLINE_VERSION = '1.0'
+    DEFAULT_ZINC_VERSION  = '0.3.12'
+    DEFAULT_SBT_VERSION   = '0.13.12'
+    DEFAULT_JLINE_VERSION = '2.14.2'
 
     class << self
       def scala_home
@@ -148,6 +154,9 @@ module Buildr::Scala
         # added in Scala 2.10
         ns.reflect!      'org.scala-lang:scala-reflect:jar:>=' + version
         ns.actors!       'org.scala-lang:scala-actors:jar:>=' + version
+        ns.xml!          'org.scala-lang.modules:scala-xml_2.11:jar:1.0.5'
+        ns.parser_combinators! 'org.scala-lang.modules:scala-parser-combinators_2.11:jar:1.0.4'
+
       end
     end
 
@@ -174,12 +183,17 @@ 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
+      end
       options[:debug] = Buildr.options.debug if options[:debug].nil?
       options[:warnings] = verbose if options[:warnings].nil?
       options[:deprecation] ||= false
       options[:optimise] ||= false
       options[:make] ||= :transitivenocp if Scala.version? 2.8
-      options[:javac] ||= {}
       @java = Javac.new(project, options[:javac])
     end
 
@@ -252,7 +266,8 @@ module Buildr::Scala
       cmd_args << '-compiler-interface' << REQUIRES.compiler_interface_sources.artifact
       cmd_args << '-scala-library' << dependencies.find { |d| d =~ /scala-library/ }
       cmd_args << '-scala-compiler' << dependencies.find { |d| d =~ /scala-compiler/ }
-      cmd_args << '-classpath' << dependencies.join(File::PATH_SEPARATOR)
+      cmd_args << '-scala-extra' << dependencies.find { |d| d =~ /scala-reflect/ }
+      cmd_args << '-classpath' << (dependencies + [ File.join(File.dirname(__FILE__)) ]).join(File::PATH_SEPARATOR)
       source_paths = sources.select { |source| File.directory?(source) }
       cmd_args << '-Ssourcepath' << ("-S" + source_paths.join(File::PATH_SEPARATOR)) unless source_paths.empty?
       cmd_args << '-d' << File.expand_path(target)
@@ -264,10 +279,9 @@ module Buildr::Scala
       cmd_args += files_from_sources(sources)
 
       unless Buildr.application.options.dryrun
-        trace((['com.typesafe.zinc.Main.main'] + cmd_args).join(' '))
-
+        trace((['org.apache.buildr.ZincRunner'] + cmd_args).join(' '))
         begin
-          Java::Commands.java 'com.typesafe.zinc.Main', *(cmd_args + [{ :classpath => Scalac.dependencies}])
+          Java::Commands.java 'org.apache.buildr.ZincRunner', *(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