buildr 1.2.5 → 1.2.6

data/lib/tasks/tar.rb

@@ -1,112 +1,87 @@
-require 'buildr'
+require 'tasks/zip'
 require 'archive/tar/minitar'
 
 module Buildr
-  class TarTask < Rake::FileTask
 
-    attr_reader :included
+  # The TarTask creates a new Tar file. You can include any number of files and and directories,
+  # use exclusion patterns, and include files into specific directories.
+  #
+  # To create a GZipped Tar, either set the gzip option to true, or use the .tgz or .gz suffix.
+  #
+  # For example:
+  #   tar("test.tgz").tap do |task|
+  #     task.include "srcs"
+  #     task.include "README", "LICENSE"
+  #   end
+  #
+  # See Buildr#tar and ArchiveTask.
+  class TarTask < ArchiveTask
 
-    def initialize(*args)
-      super
-      @included = {}
-      enhance do
-        $stdout << "Creating #{t.name}.\n" if verbose
-        rm(name, :verbose=>false) rescue nil
-        mkdir_p(File.dirname(name), :verbose=>false)
-        begin
-          out = File.new(name, "w+")
-          out = Zlib::GzipWriter.new(out) if (/.tgz$/ =~ name)
-          create_tar_internal(out)
-        rescue
-          rm(name, :verbose=>false) rescue nil
-          raise
-        end
-      end
-    end
+    # To create a GZipped Tar, either set this option to true, or use the .tgz/.gz suffix.
+    attr_accessor :gzip
+    # Permission mode for files contained in the Tar.  Defaults to 0755.
+    attr_accessor :mode
 
-    def with(options)
-      options.each do |k,v|
-        send "#{k}=", v
-      end
-    end
-
-    def include(*args)
-      options = (Hash === args.last) ? args.pop : {}
-      args = args.flatten
-      options[:path] ||= "/"
-      check_add_path_internal options
-      if options[:as]
-        raise "Only use :as with one include file at a time" if args.length > 1
-        dest_file = File.join(options[:path], options[:as])
-        include_internal(dest_file, args.pop, options)
-      else
-        args.each do |f|
-          dest_file = File.join(options[:path], File.basename(f.to_s))
-          include_internal(dest_file, f, options)
-        end
-      end
+    def initialize(*args, &block) #:nodoc:
+      super
+      self.gzip = name =~ /\.[t?]gz$/
+      self.mode = '0755'
     end
 
   private
 
-    def check_add_path_internal(opts)
-      unless @included.has_key?(opts[:path])
-        include_internal(opts[:path], :mkdir_in_tar, opts)
+    def create_from(file_map)
+      if gzip
+        StringIO.new.tap do |io|
+          create_tar io, file_map
+          io.seek 0
+          Zlib::GzipWriter.open(name) { |gzip| gzip.write io.read }
+        end
+      else
+        File.open(name, 'wb') { |file| create_tar file, file_map }
       end
     end
 
-    def include_internal(dst, src, opts)
-      raise %Q("#{dst}" was already included in the archive with source path "#{@included[dst][:source_path]}".) if @included[dst]
-      @included[dst] = opts.merge({:source_path => src})
-      enhance([src]) unless :mkdir_in_tar == src
-    end
+    def create_tar(out, file_map)
+      Archive::Tar::Minitar::Writer.open(out) do |tar|
+        options = { :mode=>mode || '0755', :mtime=>Time.now }
 
-    def create_tar_internal(out)
-      begin
-        Archive::Tar::Minitar::Writer.open(out) do |tar|
-          @included.keys.sort.each do |dst|
-            opts = @included[dst]
-            src = opts[:source_path]
-            if :mkdir_in_tar == src
-              $stdout << "adding directory #{dst}.\n" if verbose
-              tar.mkdir(dst, {:mode=>"0755", :mtime=>Time.now}.merge(opts.reject{|k,v| not [:mode, :uid, :gid, :mtime].include?(k)}))
-            else
-              $stdout << "adding #{dst} from #{src}\n" if verbose
-              is = File.new(src, "rb")
-              opts[:size] = is.stat.size
-              opts[:mode] ||= is.stat.mode
-              opts[:mtime] ||= is.stat.mtime
-              opts[:uid] ||= 80
-              opts[:gid] ||= 80
-              tar.add_file_simple(dst, opts.reject{|k,v| not [:size, :mode, :uid, :gid, :mtime].include?(k)}) do |os|
+        file_map.each do |path, content|
+          if content.respond_to?(:call)
+            tar.add_file(path, options) { |os, opts| content.call os }
+          elsif content.nil? || File.directory?(content.to_s)
+          else
+            File.open content.to_s, 'rb' do |is|
+              tar.add_file path, options.merge(:mode=>is.stat.mode, :mtime=>is.stat.mtime, :uid=>is.stat.uid, :gid=>is.stat.gid) do |os, opts|
                 while data = is.read(4096)
                   os.write(data)
-                  $stdout << "." if verbose
                 end
               end
-              $stdout << "\n" if verbose
             end
           end
         end
-      ensure out.close
       end
     end
-  end
-
-  class TarballTask < TarTask
 
-    def initialize(*args)
-      super
-    end
+  end
 
-    def include(*args)
-      options = (Hash === args.last) ? args.pop : {}
-      args = args.flatten
-      options[:path] ||= "/"
-      options[:path] = File.join(name.pathmap("%n"), options[:path])
-      super args, options
-    end
+end
 
-  end
 
+# :call-seq:
+#    tar(file) => TarTask
+#
+# The TarTask creates a new Tar file. You can include any number of files and
+# and directories, use exclusion patterns, and include files into specific
+# directories.
+#
+# To create a GZipped Tar, either set the gzip option to true, or use the .tgz or .gz suffix.
+#
+# For example:
+#   tar("test.tgz").tap do |tgz|
+#     tgz.include "srcs"
+#     tgz.include "README", "LICENSE"
+#   end
+def tar(file)
+  TarTask.define_task(file)
 end

data/lib/tasks/zip.rb

@@ -17,22 +17,25 @@ module Buildr
       def initialize(root, path)
         @root = root
         @path = path.blank? ? path : "#{path}/"
-        @files = FileList[]
+        @includes = FileList[]
+        @excludes = []
         # Expand source files added to this path.
-        expand_src = proc { @files.map{ |file| file.to_s }.uniq }
+        expand_src = proc { @includes.map{ |file| file.to_s }.uniq }
         @sources = [ expand_src ]
         # Add files and directories added to this path.
         @actions = [] << proc do |file_map|
           expand_src.call.each do |path|
-            if File.directory?(path)
-              in_directory(path, @files) do |file, rel_path|
-                dest = "#{@path}#{rel_path}"
-                puts "Adding #{dest}" if Rake.application.options.trace
-                file_map[dest] = file
+            unless excluded?(path)
+              if File.directory?(path)
+                in_directory path do |file, rel_path|
+                  dest = "#{@path}#{rel_path}"
+                  puts "Adding #{dest}" if Rake.application.options.trace
+                  file_map[dest] = file
+                end
+              else
+                puts "Adding #{@path}#{File.basename(path)}" if Rake.application.options.trace
+                file_map["#{@path}#{File.basename(path)}"] = path
               end
-            else
-              puts "Adding #{@path}#{File.basename(path)}" if Rake.application.options.trace
-              file_map["#{@path}#{File.basename(path)}"] = path
             end
           end
         end
@@ -49,7 +52,7 @@ module Buildr
         files = args.flatten
 
         if options.nil? || options.empty?
-          @files.include *files.map { |file| file.to_s }
+          @includes.include *files.flatten
         elsif options[:path]
           sans_path = options.reject { |k,v| k == :path }
           path(options[:path]).include *files + [sans_path]
@@ -74,7 +77,9 @@ module Buildr
       # :call-seq:
       #   exclude(*files) => self
       def exclude(*files)
-        @files.exclude *files
+        files = files.flatten.map(&:to_s) 
+        @excludes |= files
+        @excludes |= files.reject { |f| f =~ /\*$/ }.map { |f| "#{f}/*" }
         self
       end
 
@@ -127,28 +132,33 @@ module Buildr
         @sources << proc { source }
         @actions << proc do |file_map|
           file = source.to_s
-          if File.directory?(file)
-            in_directory(file) do |file, rel_path|
-              path = rel_path.split("/")[1..-1]
-              path.unshift as unless as == "."
-              dest = "#{@path}#{path.join('/')}"
-              puts "Adding #{dest}" if Rake.application.options.trace
-              file_map[dest] = file
+          unless excluded?(file)
+            if File.directory?(file)
+              in_directory file do |file, rel_path|
+                path = rel_path.split("/")[1..-1]
+                path.unshift as unless as == "."
+                dest = "#{@path}#{path.join('/')}"
+                puts "Adding #{dest}" if Rake.application.options.trace
+                file_map[dest] = file
+              end
+            else
+              puts "Adding #{@path}#{as}" if Rake.application.options.trace
+              file_map["#{@path}#{as}"] = file
             end
-          else
-            puts "Adding #{@path}#{as}" if Rake.application.options.trace
-            file_map["#{@path}#{as}"] = file
           end
         end
       end
 
-      def in_directory(dir, excludes = nil)
+      def in_directory(dir)
         prefix = Regexp.new("^" + Regexp.escape(File.dirname(dir) + File::SEPARATOR))
-        FileList["#{dir}/**/*"].
-          reject { |file| File.directory?(file) || (excludes && excludes.exclude?(file)) }.
+        FileList.recursive(dir).reject { |file| excluded?(file) }.
           each { |file| yield file, file.sub(prefix, "") }
       end
 
+      def excluded?(file)
+        @excludes.any? { |exclude| File.fnmatch(exclude, file) }
+      end
+
     end
 
 
@@ -355,7 +365,7 @@ module Buildr
       # coming from, since some tasks touch the directory, e.g. when the
       # content of target/classes is included into a WAR.
       most_recent = @paths.collect { |name, path| path.sources }.flatten.
-        each { |src| File.directory?(src) ? FileList["#{src}/**/*"] | [src] : src }.flatten.
+        each { |src| File.directory?(src) ? FileList.recursive(src) | [src] : src }.flatten.
         select { |file| File.exist?(file) }.collect { |file| File.stat(file).mtime }.max
       File.stat(name).mtime < (most_recent || Rake::EARLY) || super
     end
@@ -376,8 +386,6 @@ module Buildr
 
   end
 
-
-
   # The ZipTask creates a new Zip file. You can include any number of files and and directories,
   # use exclusion patterns, and include files into specific directories.
   #
@@ -395,16 +403,21 @@ module Buildr
     def create_from(file_map)
       Zip::ZipFile.open(name, Zip::ZipFile::CREATE) do |zip|
         zip.restore_permissions = true
+        mkpath = lambda do |dir|
+          unless dir == "." || zip.find_entry(dir)
+            mkpath.call File.dirname(dir)
+            zip.mkdir dir
+          end
+        end
+
         file_map.each do |path, content|
-          if content
-            File.dirname(path).tap { |dir| zip.mkdir dir unless zip.find_entry(dir) }
-            if content.respond_to?(:call)
-              zip.get_output_stream(path) { |output| content.call(output) }
-            else
-              zip.add path, content.to_s
-            end
+          mkpath.call File.dirname(path)
+          if content.respond_to?(:call)
+            zip.get_output_stream(path) { |output| content.call(output) }
+          elsif content.nil? || File.directory?(content.to_s)
+            mkpath.call path
           else
-            zip.mkdir path unless zip.find_entry(path)
+            zip.add path, content.to_s
           end
         end
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
-date: 2007-08-13 00:00:00 -07:00
+  version: 1.2.6
+date: 2007-09-26 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib
@@ -47,6 +47,7 @@ files:
 - lib/buildr
 - lib/buildr/jetty.rb
 - lib/buildr/hibernate.rb
+- lib/buildr/scala.rb
 - lib/buildr/xmlbeans.rb
 - lib/buildr/javacc.rb
 - lib/buildr/cobertura.rb
@@ -153,7 +154,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rjb
@@ -180,7 +181,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: 1.0.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple