buildr 1.3.5-java → 1.4.0-java

data/lib/buildr/packaging/artifact_search.rb

@@ -22,7 +22,7 @@ module Buildr
   # Search best artifact version from remote repositories
   module ArtifactSearch
     extend self
-    
+
     def include(method = nil)
       (@includes ||= []).tap { push method if method }
     end
@@ -61,11 +61,11 @@ module Buildr
         "\n You may need to use an specific version instead of a requirement" unless result
       spec.merge :version => result
     end
-    
+
     def requirement?(spec)
       VersionRequirement.requirement?(spec[:version])
     end
-    
+
     private
     def search_methods
       [].tap do
@@ -90,7 +90,7 @@ module Buildr
         in_memory
       end
     end
-    
+
     def local_versions(spec, repo)
       path = (spec[:group].split(/\./) + [spec[:id]]).flatten.join('/')
       Dir[File.expand_path(path + "/*", repo)].map { |d| d.pathmap("%f") }.sort.reverse
@@ -119,7 +119,7 @@ module Buildr
           vers << a.innerHTML.chop if a.innerHTML[-1..-1] == '/'
           vers
         }.sort.reverse
-      else 
+      else
         fail "Don't know how to parse #{from}: \n#{xml.inspect}"
       end
     end

data/lib/buildr/packaging/gems.rb

@@ -59,13 +59,17 @@ module Buildr
     def create_from(file_map)
       spec.mark_version
       spec.validate
-      Gem::Package.open(name, 'w', nil) do |pkg|
-        pkg.metadata = spec.to_yaml
-        file_map.each do |path, content|
-          next if content.nil? || File.directory?(content.to_s)
-          pkg.add_file_simple(path, File.stat(name).mode & 0777, File.size(content.to_s)) do |os|
-            File.open(content.to_s, "rb") do |file|
-              os.write file.read(4096)  until file.eof?
+
+      File.open(name, 'w') do |io|
+        Gem::Package.open(io, 'w', nil) do |pkg|
+          pkg.metadata = spec.to_yaml
+          file_map.each do |path, content|
+            p "path #{path} content #{content}"
+            next if content.nil? || File.directory?(content.to_s)
+            pkg.add_file_simple(path, File.stat(content.to_s).mode & 0777, File.size(content.to_s)) do |os|
+              File.open(content.to_s, "rb") do |file|
+                os.write file.read(4096)  until file.eof?
+              end
             end
           end
         end

data/lib/buildr/packaging/package.rb

@@ -43,7 +43,7 @@ module Buildr
       end
     end
 
-    before_define do |project|
+    before_define(:package => :build) do |project|
       [ :package, :install, :uninstall, :upload ].each { |name| project.recursive_task name }
       # Need to run build before package, since package is often used as a dependency by tasks that
       # expect build to happen.
@@ -52,6 +52,8 @@ module Buildr
       project.version ||= project.parent && project.parent.version
     end
 
+    after_define(:package)
+
     # The project's identifier. Same as the project name, with colons replaced by dashes.
     # The ID for project foo:bar is foo-bar.
     def id
@@ -123,16 +125,17 @@ module Buildr
     # The file name is determined from the specification passed to the package method, however, some
     # packagers need to override this.  For example, package(:sources) produces a file with the extension
     # 'zip' and the classifier 'sources'.  If you need to overwrite the default implementation, you should
-    # also include a method named package_as_[type]_respec.  For example:
+    # also include a method named package_as_[type]_spec.  For example:
     #   def package_as_sources_spec(spec) #:nodoc:
-    #     { :type=>:zip, :classifier=>'sources' }.merge(spec)
+    #     # Change the source distribution to .jar extension
+    #     spec.merge({ :type=>:jar, :classifier=>'sources' })
     #   end
     def package(*args)
       spec = Hash === args.last ? args.pop.dup : {}
       no_options = spec.empty? # since spec is mutated
       if spec[:file]
         rake_check_options spec, :file, :type
-        spec[:type] = args.shift || spec[:type] || spec[:file].split('.').last
+        spec[:type] = args.shift || spec[:type] || spec[:file].split('.').last.to_sym
         file_name = spec[:file]
       else
         rake_check_options spec, *ActsAsArtifact::ARTIFACT_ATTRIBUTES
@@ -148,9 +151,9 @@ module Buildr
           spec = send("package_as_#{spec[:type]}_spec", spec) if respond_to?("package_as_#{spec[:type]}_spec")
           file_name = path_to(:target, Artifact.hash_to_file_name(spec))
         end
-        package = (no_options && packages.detect { |pkg| pkg.type == spec[:type] && 
-                  (spec[:classifier].nil? || pkg.classifier == spec[:classifier])}) ||
-          packages.find { |pkg| pkg.name == file_name }                             ||
+        package = (no_options && packages.detect { |pkg| pkg.type == spec[:type] &&
+          (pkg.respond_to?(:classifier) ? pkg.classifier : nil) == spec[:classifier]}) ||
+          packages.find { |pkg| pkg.name == file_name } ||
           packager.call(file_name)
       else
         Buildr.application.deprecated "We changed the way package_as methods are implemented.  See the package method documentation for more details."

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.rb

@@ -20,6 +20,7 @@ Buildr.repositories.remote << 'http://scala-tools.org/repo-releases'
 require 'buildr/scala/compiler'
 require 'buildr/scala/tests'
 require 'buildr/scala/bdd'
+require 'buildr/scala/doc'
 require 'buildr/scala/shell'
 
 Object::Scala = Buildr::Scala

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