buildr 1.2.1 → 1.2.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.2.2 (7/18/2007)
+* Added: resources.using and filter.using now accepts a format as the first argument, default being :maven, but you can also use :ant, :ruby or pass a regular expression (http://groups.google.com/group/buildr-talk/browse_thread/thread/5216d5ae8bfff29b).
+* Fixed: Sleek upload with changelog for each release courtesy of Anatol Pomozov.
+* Fixed: Zip.path.contains fails on paths with more than one directory (http://groups.google.com/group/buildr-talk/browse_thread/thread/5d305bbeeb814d1).
+* Fixed: Speed of sorting entries when creating new Zip file (http://groups.google.com/group/buildr-talk/browse_thread/thread/8b4d1b0e983f32f).
+* Fixed: Uploading using SFTP creates directory for uploaded file (http://groups.google.com/group/buildr-talk/browse_thread/thread/80021d35cecfecdc).
+
 1.2.1 (7/12/2007)
 * Added: Proxy exclusion, use environment variable NO_PROXY, or options.proxy.exclude = <url> || [<url>] (http://groups.google.com/group/buildr-talk/t/9f1e988e0dbeea9f).
 * Added: You can now copy resources from multiple source directories, using resources.from (http://groups.google.com/group/buildr-talk/browse_thread/thread/4f2867a6dbbc19d4).
@@ -9,6 +16,7 @@
 * Fixed: buildr command does not recognize project tasks (foo:compile) or default task (http://groups.google.com/group/buildr-talk/t/660061a0bc81989a).
 * Fixed: Upload fails on SFTP permissions.
 * Fixed: Hibernate.schema_export not passing Ant task when yielding.
+* Fixed: IntelliJ Idea project files generation for projects more than two degrees deep.
 
 1.2.0 (6/6/2007)
 * Added: Artifact.list returns specs for all registered artifacts (those created with artifact or package).

data/lib/buildr.rb

@@ -23,7 +23,7 @@ require "builder"
 
 
 module Buildr
-  VERSION = "1.2.1".freeze
+  VERSION = "1.2.2".freeze
 end
 
 

data/lib/core/checks.rb

@@ -317,7 +317,7 @@ module Buildr
         unless @cached_entries
           if @path
             base = Regexp.new("^" + Regexp.escape(@path || ""))
-            @cached_entries = root.path("").check.map { |name| name.to_s.sub!(base, "") }.reject(&:nil?)
+            @cached_entries = root.path(nil).check.select { |entry| entry.name =~ base }.map { |entry| entry.name.sub(base, "") }
           else
             @cached_entries = Zip::ZipFile.open(root.name) { |zip| zip.entries }
           end

data/lib/core/common.rb

@@ -250,7 +250,7 @@ module Buildr
         # Since temporary file exists, force a download.
         class << task ; def needed?() ; true ; end ; end
         task.sources << args
-        task.enhance { args.download temp, :proxy=>Buildr.options.proxy }
+        task.enhance { args.download temp }
       end
     else
       # Download to a file created by the task.
@@ -258,7 +258,7 @@ module Buildr
       uri = URI.parse(args.values.first.to_s)
       file_create(args.keys.first).tap do |task|
         task.sources << uri
-        task.enhance { uri.download task.name, :proxy=>Buildr.options.proxy }
+        task.enhance { uri.download task.name }
       end
     end
 
@@ -362,21 +362,46 @@ module Buildr
     # The mapping. See #using.
     attr_accessor :mapping
 
+    # The mapper to use. See #using.
+    attr_accessor :mapper
+
     # :call-seq:
     #   using(mapping) => self
     #   using() { |file_name, contents| ... } => self
     #
     # Specifies the mapping to use and returns self.
     #
-    # The mapping can be a proc or a method called with the file name and content, returning
-    # the modified content. Or the mapping can be a Hash for mapping each ${key} into a value.
-    # Without any mapping, all files are copied as is.
+    # The most typical mapping uses a Hash, and the default mapping uses the Maven style, so
+    # <code>${key}</code> are mapped to the values. You can change that by passing a different
+    # format as the first argument. Currently supports:
+    # * :ant -- Map <code>@key@</code>.
+    # * :maven -- Map <code>${key}</code> (default).
+    # * :ruby -- Map <code>#{key}</code>.
+    # * Regexp -- Maps the matched data (e.g. <code>/=(.*?)=/</code>
     #
     # For example:
     #   filter.using "version"=>"1.2"
-    # will replace all occurrences of "${version}" with "1.2".
-    def using(mapping = nil, &block)
-      self.mapping = mapping || block
+    # Is the same as:
+    #   filter.using :maven, "version"=>"1.2"
+    #
+    # You can also pass a proc or method. It will be called with the file name and content,
+    # to return the mapped content.
+    #
+    # Without any mapping, all files are copied as is.
+    def using(*args, &block)
+      case args.first
+      when Hash # Maven hash mapping
+        using :maven, *args
+      when Symbol # Mapping from a method
+        raise ArgumentError, "Expected mapper type followed by mapping hash" unless args.size == 2 && Hash === args[1]
+        @mapper, @mapping = *args
+      when Regexp # Mapping using a regular expression
+        raise ArgumentError, "Expected regular expression followed by mapping hash" unless args.size == 2 && Hash === args[1]
+        @mapper, @mapping = *args
+      else
+        raise ArgumentError, "Expected proc, method or a block" if args.size > 1 || (args.first && block)
+        @mapping = args.first || block
+      end
       self
     end
 
@@ -414,8 +439,13 @@ module Buildr
             mapped = mapping.call(path, File.open(source, "rb") { |file| file.read })
             File.open(dest, "wb") { |file| file.write mapped }
           when Hash # Map ${key} to value
-            mapped = File.open(source, "rb") { |file| file.read }.
-              gsub(/\$\{[^}]*\}/) { |str| mapping[str[2..-2]] || str }
+            content = File.open(source, "rb") { |file| file.read }
+            if Symbol === @mapper
+              mapped = send("#{@mapper}_mapper", content) { |key| mapping[key] }
+            else
+              mapped = regexp_mapper(content) { |key| mapping[key] }
+            end
+              #gsub(/\$\{[^}]*\}/) { |str| mapping[str[2..-2]] || str }
             File.open(dest, "wb") { |file| file.write mapped }
           when nil # No mapping.
             cp source, dest
@@ -431,8 +461,26 @@ module Buildr
     # Returns the target directory. 
     def to_s()
       @target.to_s
-    end    
-    
+    end
+
+  private
+
+    def maven_mapper(content)
+      content.gsub(/\$\{.*?\}/) { |str| yield(str[2..-2]) || str }
+    end
+
+    def ant_mapper(content)
+      content.gsub(/@.*?@/) { |str| yield(str[1..-2]) || str }
+    end
+
+    def ruby_mapper(content)
+      content.gsub(/#\{.*?\}/) { |str| yield(str[2..-2]) || str }
+    end
+
+    def regexp_mapper(content)
+      content.gsub(@mapper) { |str| yield(str.scan(@mapper).join) || str }
+    end
+
   end
 
   # :call-seq:

data/lib/core/project.rb

@@ -304,10 +304,6 @@ module Buildr
         @parent = task(split[0...-1].join(":"))
         raise "No parent project #{split[0...-1].join(":")}" unless @parent && Project === parent
       end
-      # We only need this because each task (and a project is a task) already has
-      # a @base_dir variable (and base_dir method), and we want it lazily evaluated.
-      # See all the logic that happens when we call base_dir.
-      @base_dir = nil
     end
 
     # :call-seq:
@@ -325,10 +321,10 @@ module Buildr
     #   /home/foo/bar       <-- sub-project "foo:bar"
     def base_dir()
       if @base_dir.nil?
-        if @parent
+        if parent
           # For sub-project, a good default is a directory in the parent's base_dir,
           # using the same name as the project.
-          @base_dir = File.join(@parent.base_dir, name.split(":").last)
+          @base_dir = File.join(parent.base_dir, name.split(":").last)
         else
           # For top-level project, a good default is the directory where we found the Buildfile.
           @base_dir = Dir.pwd

data/lib/core/transports.rb

@@ -206,8 +206,8 @@ module URI
         raise NotFoundError, "No source file/directory to upload." unless File.exist?(source)
         if File.directory?(source)
           Dir.glob("#{source}/**/*").reject { |file| File.directory?(file) }.each do |file|
-            path = self.path + file.sub(source, "")
-            (self + path).upload file, {:digests=>[]}.merge(options)
+            uri = self + (File.join(self.path, file.sub(source, "")))
+            uri.upload file, {:digests=>[]}.merge(options)
           end
         else
           File.open(source, "rb") { |input| upload input, options }
@@ -397,7 +397,7 @@ module URI
         # To create a path, we need to create all its parent. We use realpath to determine if
         # the path already exists, otherwise mkdir fails.
         puts "Creating path #{@base_path}" if Rake.application.options.trace
-        path.split("/").inject("") do |base, part|
+        File.dirname(path).split("/").inject("") do |base, part|
           combined = base + part
           sftp.realpath combined rescue sftp.mkdir combined, {}
           "#{combined}/"

data/lib/tasks/zip.rb

@@ -579,17 +579,14 @@ end
 
 
 module Zip #:nodoc:
-  class ZipEntrySet #:nodoc:
 
-    # Make sure entries are returned in sorted order so the ZIP
-    # index is human readable instead of random hashtable order.
-    def entries()
-      @entrySet.values.sort
+  class ZipCentralDirectory #: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)
     end
-
-    def each(&block)
-      entries.each(&block)
-    end
-
   end
+
 end 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2007-07-12 00:00:00 -07:00
+  version: 1.2.2
+date: 2007-07-18 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib