buildr 1.1.3 → 1.2.0

data/lib/tasks/zip.rb

@@ -29,15 +29,15 @@ module Buildr
         expand_src = proc { (@files || []).map(&:to_s).uniq }
         @sources = [ expand_src ]
         @actions = [] << proc do |zip|
-          expand_src.call.each do |file|
-            if File.directory?(file)
-              in_directory(file, @files) do |file, rel_path|
+          expand_src.call.each do |path|
+            if File.directory?(path)
+              in_directory(path, @files) do |file, rel_path|
                 puts "Adding #{@path}#{rel_path}" if Rake.application.options.trace
                 zip.add("#{@path}#{rel_path}", file) { true }
               end
             else
-              puts "Adding #{@path}#{File.basename(file)}" if Rake.application.options.trace
-              zip.add("#{@path}#{File.basename(file)}", file) { true }
+              puts "Adding #{@path}#{File.basename(path)}" if Rake.application.options.trace
+              zip.add("#{@path}#{File.basename(path)}", path) { true }
             end
           end
         end
@@ -58,6 +58,10 @@ module Buildr
           raise "You can only use the :as option in combination with the :path option" unless options.keys.size == 1
           raise "You can only use one file with the :as option" unless files.size == 1
           include_as(files.first.to_s, options[:as])
+        elsif options[:from]
+          raise "You can only use the :from option in combination with the :path option" unless options.keys.size == 1
+          raise "You canont use the :from option with file names" unless files.empty?
+          [options[:from]].flatten.each { |path| include_as(path.to_s, ".") }
         elsif options[:merge]
           raise "You can only use the :merge option in combination with the :path option" unless options.keys.size == 1
           files.each { |file| merge file }
@@ -109,6 +113,10 @@ module Buildr
         @sources.map(&:call).flatten
       end
 
+      def to_s()
+        @path || ""
+      end
+
     protected
 
       def include_as(source, as)
@@ -210,7 +218,7 @@ module Buildr
     # This method accepts three options. You can use :path to include files under
     # a specific path, for example:
     #   zip(..).include("foo", :path=>"bar")
-    # includes the file bar as foo/bar. See also #path.
+    # includes the file bar as bar/foo. See also #path.
     #
     # You can use :as to include a file under a different name, for example:
     #   zip(..).include("foo", :as=>"bar")
@@ -295,24 +303,23 @@ module Buildr
     #   package(:jar).with(:manifest=>"MANIFEST_MF")
     def with(options)
       options.each do |key, value|
-        self[key] = value
+        begin
+          send "#{key}=", value
+        rescue NameError
+          if respond_to?(:[]=) # Backward compatible with Buildr 1.1.
+            warn_deprecated "The []= method is deprecated, please use attribute accessors instead."
+            self[key] = value
+          else
+            raise ArgumentError, "This task does not support the option #{key}."
+          end
+        end
       end
       self
     end
 
-    # :call-seq:
-    #   [name] = value
-    #
-    # Used by with method to set specific options. For example:
-    #   package(:jar).with(:manifest=>"MANIFEST_MF")
-    # Or:
-    #   package(:jar)[:manifest] = "MANIFEST_MF"
-    def []=(key, value)
-      raise ArgumentError, "#{self.class} does not support the option #{key}"
-    end
-
-    def prerequisites() #:nodoc:
-      super + @paths.collect { |name, path| path.sources }.flatten.each { |src| file(src) }
+    def invoke_prerequisites() #:nodoc:
+      prerequisites.concat @paths.collect { |name, path| path.sources }.flatten
+      super
     end
     
     def needed?() #:nodoc:
@@ -341,6 +348,10 @@ module Buildr
       @paths.each { |name, obj| obj.actions.each { |action| action[zip] } }
     end
 
+    def []=(key, value) #:nodoc:
+      raise ArgumentError, "This task does not support the option #{key}."
+    end
+
   end
 
   # :call-seq:
@@ -396,7 +407,7 @@ module Buildr
       # If no paths specified, then no include/exclude patterns
       # specified. Nothing will happen unless we include all files.
       if @paths.empty?
-        @paths[nil] = FromPath.new(nil)
+        @paths[nil] = FromPath.new(self, nil)
         @paths[nil].include "*"
       end
 
@@ -468,7 +479,17 @@ module Buildr
     #  unzip(Dir.pwd=>"test.jar").include("etc/LICENSE")
     # which unzips etc/LICENSE into ./etc/LICENSE.
     def from_path(name)
-      @paths[name] ||= FromPath.new(name)
+      @paths[name] ||= FromPath.new(self, name)
+    end
+    alias :path :from_path
+
+    # :call-seq:
+    #   root() => Unzip
+    #
+    # Returns the root path, essentially the Unzip object itself. In case you are wondering
+    # down paths and want to go back.
+    def root()
+      self
     end
 
     # Returns the path to the target directory.
@@ -478,7 +499,8 @@ module Buildr
 
     class FromPath #:nodoc:
 
-      def initialize(path)
+      def initialize(unzip, path)
+        @unzip = unzip
         if path
           @path = path[-1] == ?/ ? path : path + "/"
         else
@@ -513,6 +535,16 @@ module Buildr
         end
       end
 
+      # Documented in Unzip.
+      def root()
+        @unzip
+      end
+
+      # The target directory to extract to.
+      def target()
+        @unzip.target
+      end
+
     end
 
   end
@@ -544,3 +576,20 @@ module Buildr
   end
 
 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
+    end
+
+    def each(&block)
+      entries.each(&block)
+    end
+
+  end
+end 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
-date: 2007-06-12 00:00:00 -07:00
+  version: 1.2.0
+date: 2007-07-06 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib
@@ -33,8 +33,11 @@ files:
 - lib/tasks/concat.rb
 - lib/tasks/zip.rb
 - lib/core
+- lib/core/generate.rb
 - lib/core/transports.rb
 - lib/core/build.rb
+- lib/core/checks.rb
+- lib/core/help.rb
 - lib/core/project.rb
 - lib/core/rake_ext.rb
 - lib/core/common.rb
@@ -59,11 +62,13 @@ files:
 - lib/java/java.rb
 - lib/java/ant.rb
 - lib/java/artifact.rb
+- lib/java/idea.ipr.template
 - lib/java/packaging.rb
 - lib/java/compile.rb
 - CHANGELOG
 - README
 - LICENSE
+- Rakefile
 test_files: []
 
 rdoc_options: 
@@ -77,8 +82,8 @@ extra_rdoc_files:
 - README
 - CHANGELOG
 - LICENSE
-executables: []
-
+executables: 
+- buildr
 extensions: []
 
 requirements: []
@@ -89,7 +94,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.7.3
     version: 
@@ -109,7 +114,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.1
+        version: 2.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -118,7 +123,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 1.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-sftp
@@ -145,7 +150,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.7
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: rjb
@@ -154,7 +159,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: Antwrap
@@ -163,5 +168,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.2
+        version: 0.6.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
     version: