buildr 1.3.5 → 1.4.0

data/lib/buildr/packaging/tar.rb

@@ -41,7 +41,7 @@ module Buildr
 
     def initialize(*args, &block) #:nodoc:
       super
-      self.gzip = name =~ /\.[t?]gz$/
+      self.gzip = name =~ /\.t?gz$/
       self.mode = '0755'
     end
 
@@ -54,13 +54,13 @@ module Buildr
     def entry(entry_name)
       Buildr::TarEntry.new(self, entry_name)
     end
-    
+
     def entries() #:nodoc:
       tar_entries = nil
       with_uncompressed_tar { |tar| tar_entries = tar.entries }
       tar_entries
     end
-    
+
     # :call-seq:
     #   with_uncompressed_tar { |tar_entries| ... }
     #
@@ -73,7 +73,7 @@ module Buildr
         Archive::Tar::Minitar.open(name, &block)
       end
     end
-    
+
   private
 
     def create_from(file_map)
@@ -110,15 +110,15 @@ module Buildr
     end
 
   end
-  
-  
+
+
   class TarEntry #:nodoc:
-    
+
     def initialize(tar_task, entry_name)
       @tar_task = tar_task
       @entry_name = entry_name
     end
-    
+
     # :call-seq:
     #   contain?(*patterns) => boolean
     #
@@ -129,7 +129,7 @@ module Buildr
       patterns.map { |pattern| Regexp === pattern ? pattern : Regexp.new(Regexp.escape(pattern.to_s)) }.
         all? { |pattern| content =~ pattern }
     end
-    
+
     # :call-seq:
     #   empty?() => boolean
     #
@@ -137,7 +137,7 @@ module Buildr
     def empty?()
       read_content_from_tar.nil?
     end
-    
+
     # :call-seq:
     #   exist() => boolean
     #
@@ -147,13 +147,13 @@ module Buildr
       @tar_task.with_uncompressed_tar { |tar| exist = tar.any? { |entry| entry.name == @entry_name } }
       exist
     end
-    
+
     def to_s #:nodoc:
       @entry_name
     end
-    
+
     private
-    
+
     def read_content_from_tar
       content = Errno::ENOENT.new("No such file or directory - #{@entry_name}")
       @tar_task.with_uncompressed_tar do |tar|
@@ -163,7 +163,7 @@ module Buildr
       content
     end
   end
-  
+
 end
 
 

data/lib/buildr/packaging/version_requirement.rb

@@ -14,14 +14,34 @@
 # the License.
 
 
+# Rubygems 1.3.6 removed the 'version' accessor so monkey-patch it back to
+# circumvent version validation.  This is needed because Gem::Version doesn't
+# accept version specs with dashes.
+unless Gem::Version.new(0).respond_to?(:version=)
+  class Gem::Version
+    def version=(version)
+      @version = version.to_s
+      @version.strip!
+
+      # re-prime @segments
+      @segments = nil
+      segments
+    end
+  end
+end
+
 module Buildr
-  
+
   #
   # See ArtifactNamespace#need
   class VersionRequirement
-    
+
     CMP_PROCS = Gem::Requirement::OPS.dup
-    CMP_REGEX = Gem::Requirement::OP_RE.dup
+    CMP_REGEX = if defined?(Gem::Requirement::OP_RE)
+      Gem::Requirement::OP_RE
+    else
+      Gem::Requirement::OPS.keys.map { |k| Regexp.quote k }.join "|"
+    end
     CMP_CHARS = CMP_PROCS.keys.join
     BOOL_CHARS = '\|\&\!'
     VER_CHARS = '\w\.\-'
@@ -29,18 +49,18 @@ module Buildr
     class << self
       # is +str+ a version string?
       def version?(str)
-        /^\s*[#{VER_CHARS}]+\s*$/ === str
+        /^\s*\d[#{VER_CHARS}]*\s*$/ === str
       end
-      
+
       # is +str+ a version requirement?
       def requirement?(str)
         /[#{BOOL_CHARS}#{CMP_CHARS}\(\)]/ === str
       end
-      
+
       # :call-seq:
       #    VersionRequirement.create(" >1 <2 !(1.5) ") -> requirement
       #
-      # parse the +str+ requirement 
+      # parse the +str+ requirement
       def create(str)
         instance_eval normalize(str)
       rescue StandardError => e
@@ -61,7 +81,7 @@ module Buildr
         vreq.negative = !vreq.negative
         vreq
       end
-      
+
       def normalize(str)
         str = str.strip
         if str[/[^\s\(\)#{BOOL_CHARS + VER_CHARS + CMP_CHARS}]/]
@@ -147,7 +167,7 @@ module Buildr
     def &(other)
       operation(:&, other)
     end
-    
+
     # return the parsed expression
     def to_s
       str = requirements.map(&:to_s).join(" " + @op.to_s + " ").to_s
@@ -160,7 +180,7 @@ module Buildr
     protected
     attr_reader :requirements, :op
     def operation(op, other)
-      @op ||= op 
+      @op ||= op
       if negative == other.negative && @op == op && other.requirements.size == 1
         @requirements << other.requirements.first
         self

data/lib/buildr/packaging/ziptask.rb

@@ -106,7 +106,7 @@ module Buildr
   end
 
 
-  # An object for unzipping a file into a target directory. You can tell it to include
+  # An object for unzipping/untarring a file into a target directory. You can tell it to include
   # or exclude only specific files and directories, and also to map files from particular
   # paths inside the zip file into the target directory. Once ready, call #extract.
   #
@@ -131,7 +131,7 @@ module Buildr
     # :call-seq:
     #   extract
     #
-    # Extract the zip file into the target directory.
+    # Extract the zip/tgz file into the target directory.
     #
     # You can call this method directly. However, if you are using the #unzip method,
     # it creates a file task for the target directory: use that task instead as a
@@ -148,16 +148,36 @@ module Buildr
 
       # Otherwise, empty unzip creates target as a file when touching.
       mkpath target.to_s
-      Zip::ZipFile.open(zip_file.to_s) do |zip|
-        entries = zip.collect
-        @paths.each do |path, patterns|
-          patterns.map(entries).each do |dest, entry|
-            next if entry.directory?
-            dest = File.expand_path(dest, target.to_s)
-            trace "Extracting #{dest}"
-            mkpath File.dirname(dest) rescue nil
-            entry.restore_permissions = true
-            entry.extract(dest) { true }
+      if zip_file.to_s.match /\.t?gz$/
+        #un-tar.gz
+        Zlib::GzipReader.open(zip_file.to_s) { |tar|
+          Archive::Tar::Minitar::Input.open(tar) do |inp|
+            inp.each do |tar_entry|
+              @paths.each do |path, patterns|
+                patterns.map([tar_entry]).each do |dest, entry|
+                  next if entry.directory?
+                  dest = File.expand_path(dest, target.to_s)
+                  trace "Extracting #{dest}"
+                  mkpath File.dirname(dest) rescue nil
+                  #entry.restore_permissions = true
+                  File.open(dest, 'w') {|f| f.write entry.read}
+                end
+              end
+            end
+          end
+        }
+      else
+        Zip::ZipFile.open(zip_file.to_s) do |zip|
+          entries = zip.collect
+          @paths.each do |path, patterns|
+            patterns.map(entries).each do |dest, entry|
+              next if entry.directory?
+              dest = File.expand_path(dest, target.to_s)
+              trace "Extracting #{dest}"
+              mkpath File.dirname(dest) rescue nil
+              entry.restore_permissions = true
+              entry.extract(dest) { true }
+            end
           end
         end
       end
@@ -165,6 +185,24 @@ module Buildr
       touch target.to_s
     end
 
+    #reads the includes/excludes and apply them to the entry_name
+    def included?(entry_name)
+      @paths.each do |path, patterns|
+        return true if path.nil?
+        if entry_name =~ /^#{path}/
+          short = entry_name.sub(path, '')
+          if patterns.include.any? { |pattern| File.fnmatch(pattern, entry_name) } &&
+            !patterns.exclude.any? { |pattern| File.fnmatch(pattern, entry_name) }
+            # trace "tar_entry.full_name " + entry_name + " is included"
+            return true
+          end
+        end
+      end
+      # trace "tar_entry.full_name " + entry_name + " is excluded"
+      return false
+    end
+
+
     # :call-seq:
     #   include(*files) => self
     #   include(*files, :path=>name) => self
@@ -303,7 +341,7 @@ module Buildr
   #
   # For example:
   #   unzip('all'=>'test.zip')
-  #   unzip('src'=>'test.zip').include('README', 'LICENSE') 
+  #   unzip('src'=>'test.zip').include('README', 'LICENSE')
   #   unzip('libs'=>'test.zip').from_path('libs')
   def unzip(args)
     target, arg_names, zip_file = Buildr.application.resolve_args([args])

data/lib/buildr/scala/bdd.rb

@@ -20,29 +20,36 @@ require 'buildr/java/bdd'
 require 'buildr/scala/tests'
 
 module Buildr::Scala
-  
+
   # 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 = '1.5.0'
-    
+    VERSION = '1.6.2.1'
+
     class << self
       def version
         Buildr.settings.build['scala.specs'] || VERSION
       end
-      
+
       def dependencies
-        ["org.scala-tools.testing:specs:jar:#{version}"] + Check.dependencies + JUnit.dependencies
+        unless @dependencies
+          super
+          # Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
+          @dependencies |= [ File.join(File.dirname(__FILE__)) ] +
+                           ["org.scala-tools.testing:specs:jar:#{version}"] +
+                           Check.dependencies + JUnit.dependencies + Scalac.dependencies
+        end
+        @dependencies
       end
-      
+
       def applies_to?(project)  #:nodoc:
         !Dir[project.path_to(:source, bdd_dir, lang, '**/*.scala')].empty?
       end
@@ -57,39 +64,37 @@ module Buildr::Scala
 
     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)
-      dependencies += [task.compile.target.to_s]
       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))      # we only want singletons
+      filter.filter(candidates.to_java(Java.java.lang.String)).map { |s| s[0..(s.size - 2)] }
     end
-    
+
     def run(specs, dependencies)  #:nodoc:
-      dependencies += [task.compile.target.to_s, File.join(File.dirname(__FILE__))] + Scalac.dependencies
-      
       cmd_options = { :properties => options[:properties],
                       :java_args => options[:java_args],
-                      :classpath => dependencies}
+                      :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)
+            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)
+            Java::Commands.java(runner, task.compile.target.to_s, spec + '$', cmd_options)
           end
         rescue => e
           passed

data/lib/buildr/scala/compiler.rb

@@ -19,30 +19,52 @@ require 'buildr/core/compile'
 require 'buildr/packaging'
 
 module Buildr::Scala
-  DEFAULT_VERSION = '2.7.5'   # currently the latest (Jun 19, 2009)
-  
+  DEFAULT_VERSION = '2.7.7'   # currently the latest (Oct 31, 2009)
+
   class << self
-    
-    # Retrieves the Scala version string from the 
-    # standard library or nil if Scala is not
-    # available.
+
     def version_str
-      begin
-        # Scala version string normally looks like "version 2.7.3.final"
-        Java.scala.util.Properties.versionString.sub 'version ', ''
-      rescue
-        nil
+      warn "Use of Scala.version_str is deprecated.  Use Scala.version instead"
+      version
+    end
+
+    def installed_version
+      unless @installed_version
+        @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|
+              zipfile.read 'library.properties'
+            end
+
+            version_str = props.match(/version\.number\s*=\s*([^\s]+)/).to_a[1]
+
+            if version_str
+              md = version_str.match(/\d+\.\d[\d\.]*/) or
+                fail "Unable to parse Scala version: #{version_str}"
+
+              md[0].sub(/.$/, "") # remove trailing dot, if any
+            end
+          rescue => e
+            warn "Unable to parse library.properties in $SCALA_HOME/lib/scala-library.jar: #{e}"
+            nil
+          end
+        end
       end
+
+      @installed_version
     end
-    
+
     def version
-      if version_str
-        # any consecutive sequence of numbers followed by dots
-        match = version_str.match(/\d+\.\d[\d\.]*/) or
-          fail "Unable to parse Scala version: #{version_str} "
-        match[0].sub(/.$/, "") # remove trailing dot, if any
+      Buildr.settings.build['scala.version'] || installed_version || DEFAULT_VERSION
+    end
+
+    def compatible_28?
+      major, minor = version.match(/^(\d)\.(\d)/).to_a[1,2]
+      if major && minor
+        (major.to_i == 2 && minor.to_i >= 8) || (major.to_i > 2)
       else
-        DEFAULT_VERSION       # TODO return the version installed from Maven repo
+        false
       end
     end
   end
@@ -60,7 +82,7 @@ module Buildr::Scala
   # * :debug       -- Generate debugging info.
   # * :other       -- Array of options to pass to the Scalac compiler as is, e.g. -Xprint-types
   class Scalac < Buildr::Compiler::Base
-    
+
     # The scalac compiler jars are added to classpath at load time,
     # if you want to customize artifact versions, you must set them on the
     #
@@ -69,27 +91,36 @@ module Buildr::Scala
     # namespace before this file is required.  This is of course, only
     # if SCALA_HOME is not set or invalid.
     REQUIRES = ArtifactNamespace.for(self) do |ns|
-      ns.library!      'org.scala-lang:scala-library:jar:>=' + DEFAULT_VERSION
-      ns.compiler!     'org.scala-lang:scala-compiler:jar:>=' + DEFAULT_VERSION
+      version = Buildr.settings.build['scala.version'] || DEFAULT_VERSION
+      ns.library!      'org.scala-lang:scala-library:jar:>=' + version
+      ns.compiler!     'org.scala-lang:scala-compiler:jar:>=' + version
     end
-    
+
     class << self
       def scala_home
         env_home = ENV['SCALA_HOME']
-        
+
         @home ||= (if !env_home.nil? && File.exists?(env_home + '/lib/scala-library.jar') && File.exists?(env_home + '/lib/scala-compiler.jar')
           env_home
         else
           nil
         end)
       end
-      
+
       def installed?
         !scala_home.nil?
       end
 
+      def use_installed?
+        if installed? && Buildr.settings.build['scala.version']
+          Buildr.settings.build['scala.version'] == Scala.installed_version
+        else
+          Buildr.settings.build['scala.version'].nil? && installed?
+        end
+      end
+
       def dependencies
-        if installed?
+        if use_installed?
           ['scala-library', 'scala-compiler'].map { |s| File.expand_path("lib/#{s}.jar", scala_home) }
         else
           REQUIRES.artifacts.map(&:to_s)
@@ -97,23 +128,24 @@ module Buildr::Scala
       end
 
       def use_fsc
-        installed? && ENV["USE_FSC"] =~ /^(yes|on|true)$/i
+        use_installed? && ENV["USE_FSC"] =~ /^(yes|on|true)$/i
       end
-      
+
       def applies_to?(project, task) #:nodoc:
         paths = task.sources + [sources].flatten.map { |src| Array(project.path_to(:source, task.usage, src.to_sym)) }
         paths.flatten!
-        
+
         # Just select if we find .scala files
         paths.any? { |path| !Dir["#{path}/**/*.scala"].empty? }
       end
     end
-    
+
     Javac = Buildr::Compiler::Javac
 
     OPTIONS = [:warnings, :deprecation, :optimise, :target, :debug, :other, :javac]
-    
-    Java.classpath << dependencies
+
+    # Lazy evaluation to allow change in buildfile
+    Java.classpath << lambda { dependencies }
 
     specify :language=>:scala, :sources => [:scala, :java], :source_ext => [:scala, :java],
             :target=>'classes', :target_ext=>'class', :packaging=>:jar
@@ -124,25 +156,41 @@ module Buildr::Scala
       options[:warnings] = verbose if options[:warnings].nil?
       options[:deprecation] ||= false
       options[:optimise] ||= false
+      options[:make] ||= :transitivenocp if Scala.compatible_28?
       options[:javac] ||= {}
-      
+
       @java = Javac.new(project, options[:javac])
     end
 
     def compile(sources, target, dependencies) #:nodoc:
-      check_options options, OPTIONS
+      check_options(options, OPTIONS + (Scala.compatible_28? ? [:make] : []))
+
+      java_sources = java_sources(sources)
+      enable_dep_tracing = Scala.compatible_28? && java_sources.empty?
+
+      dependencies.unshift target if enable_dep_tracing
 
       cmd_args = []
-      cmd_args << '-classpath' << (dependencies + Scalac.dependencies).join(File::PATH_SEPARATOR)
+      cmd_args << '-classpath' << dependencies.join(File::PATH_SEPARATOR)
       source_paths = sources.select { |source| File.directory?(source) }
       cmd_args << '-sourcepath' << source_paths.join(File::PATH_SEPARATOR) unless source_paths.empty?
       cmd_args << '-d' << File.expand_path(target)
       cmd_args += scalac_args
+
+      if enable_dep_tracing
+        dep_dir = File.expand_path(target)
+        Dir.mkdir dep_dir unless File.exists? dep_dir
+
+        cmd_args << '-make:' + options[:make].to_s
+        cmd_args << '-dependencyfile'
+        cmd_args << File.expand_path('.scala-deps', dep_dir)
+      end
+
       cmd_args += files_from_sources(sources)
 
       unless Buildr.application.options.dryrun
         trace((['scalac'] + cmd_args).join(' '))
-        
+
         if Scalac.use_fsc
           system(([File.expand_path('bin/fsc', Scalac.scala_home)] + cmd_args).join(' ')) or
             fail 'Failed to compile, see errors above'
@@ -151,15 +199,14 @@ module Buildr::Scala
           begin
             Java.scala.tools.nsc.Main.process(cmd_args.to_java(Java.java.lang.String))
           rescue => e
-            fail "Scala compiler crashed:\n#{e.inspect}" 
+            fail "Scala compiler crashed:\n#{e.inspect}"
           end
           fail 'Failed to compile, see errors above' if Java.scala.tools.nsc.Main.reporter.hasErrors
         end
- 
-        java_sources = java_sources(sources)
+
         unless java_sources.empty?
           trace 'Compiling mixed Java/Scala sources'
-          
+
           # TODO  includes scala-compiler.jar
           deps = dependencies + Scalac.dependencies + [ File.expand_path(target) ]
           @java.compile(java_sources, target, deps)
@@ -187,7 +234,7 @@ module Buildr::Scala
     end
 
   end
-    
+
 end
 
 # Scala compiler comes first, ahead of Javac, this allows it to pick