buildr 1.2.4 → 1.2.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.2.5 (8/13/2007)
+* Fixed: Buildr not finding buildfile in parent directory, or switching to parent directory.
+* Fixed: checks.rb:103: warning: multiple values for a block parameter (2 for 1)
+* Fixed: ZIPs include empty META-INF directory.
+
 1.2.4 (8/3/2007)
 * Added: Forking option for JUnit test framework: :once to fork for each project, :each to fork for each test case, and false to not fork. (Tammo van Lessen)
 * Added: Path traversal in Zip, so zip.path("foo/bar").path("..") returns zip.path("foo").

data/lib/buildr.rb

@@ -24,9 +24,10 @@ require "builder"
 
 
 module Buildr
-  VERSION = "1.2.4".freeze # unless const_defined?(:VERSION)
+  VERSION = "1.2.5".freeze # unless const_defined?(:VERSION)
 end
 
+
 # Now it's safe to load Buildr, after we set up the Rake Application.
 require "core/application"
 require "core/project"
@@ -55,6 +56,3 @@ class Object #:nodoc:
 end
 # Project has visibility to everything in the Buildr namespace. (See above for constants)
 class Project ; include Buildr ; end
-
-# Load .rake files form tasks directory, and buildr.rb files.
-Buildr.load_tasks_and_local_files

data/lib/core/application.rb

@@ -3,7 +3,10 @@ module Buildr
   # When running from +rake+, we already have an Application setup and must plug into it,
   # since the top-level tasks come from there. When running from +buildr+, we get to load
   # Rake and set everything up, and we use our own Application full of cool Buildr features.
-  unless defined?(Rake)
+  if defined?(Rake)
+    Rake.application.top_level_tasks.unshift task("buildr:initialize")
+  else
+
     require "rake"
 
     class Application < Rake::Application #:nodoc:
@@ -41,6 +44,7 @@ module Buildr
         opts = GetoptLong.new(*command_line_options)
         opts.each { |opt, value| do_option(opt, value) }
         collect_tasks
+        top_level_tasks.unshift "buildr:initialize"
       end
 
       def run()
@@ -65,7 +69,6 @@ module Buildr
         when "--freeze" 
           find_buildfile
           puts "Freezing the Buildfile so it always uses Buildr version #{Buildr::VERSION}"
-          gem = 
           original = File.read(rakefile)
           if original =~ /gem\s*(["'])buildr\1/
             modified = original.sub(/gem\s*(["'])buildr\1\s*,\s*(["']).*\2/, %{gem "buildr", "#{Buildr::VERSION}"})
@@ -88,20 +91,19 @@ module Buildr
       end
 
       def find_buildfile()
-        unless have_rakefile
-          here = Dir.pwd
-          Dir.chdir("..") do
-            if Dir.pwd == here || options.nosearch
-              error = "No Buildfile found (looking for: #{@rakefiles.join(', ')})"
-              if STDIN.isatty
-                chdir(original_dir) { task("generate").invoke }
-                exit 1
-              else
-                raise error
-              end
+        here = Dir.pwd
+        while ! have_rakefile
+          Dir.chdir("..")
+          if Dir.pwd == here || options.nosearch
+            error = "No Buildfile found (looking for: #{@rakefiles.join(', ')})"
+            if STDIN.isatty
+              chdir(original_dir) { task("generate").invoke }
+              exit 1
+            else
+              raise error
             end
-            find_buildfile
           end
+          here = Dir.pwd
         end
       end
 
@@ -143,7 +145,6 @@ module Buildr
     end
 
     Rake.application = Buildr::Application.new
-
   end
 
 
@@ -176,5 +177,10 @@ module Buildr
       [Rake.application.rakefile].compact + @build_files
     end
 
+    task "buildr:initialize" do
+      Buildr.load_tasks_and_local_files
+    end
+
   end
+
 end

data/lib/core/checks.rb

@@ -100,7 +100,7 @@ module Buildr
         klass = Class.new
         klass.instance_eval do
           context.class.instance_methods(false).each do |method|
-            define_method(method) { |args| context.send(method, args) }
+            define_method(method) { |*args| context.send(method, *args) }
           end
           define_method(:it) { subject }
           define_method(:description) { description }

data/lib/core/project.rb

@@ -628,7 +628,8 @@ module Buildr
 
   # Forces all the projects to be evaluated before executing any other task.
   # If we don't do that, we don't get to have tasks available when running Rake.
-  task("buildr:projects") { projects }
-  Rake.application.top_level_tasks.unshift "buildr:projects"
+  task "buildr:initialize" do
+    projects
+  end
 
 end

data/lib/java/packaging.rb

@@ -38,10 +38,9 @@ module Buildr
           @manifest = false
           @meta_inf = []
 
-          meta_inf_path = path("META-INF")
           prepare do
             @prerequisites << manifest if String === manifest || Rake::Task === manifest
-            [meta_inf].flatten.map { |file| file.to_s }.uniq.each { |file| meta_inf_path.include file }
+            [meta_inf].flatten.map { |file| file.to_s }.uniq.each { |file| path("META-INF").include file }
           end
 
           enhance do
@@ -52,24 +51,7 @@ module Buildr
                 lines = String === manifest || Rake::Task === manifest ? manifest_lines_from(File.read(manifest.to_s)) :
                   manifest_lines_from(manifest)
                 @manifest_tmp.write((MANIFEST_HEADER + lines).join("\n"))
-=begin
-                @manifest_tmp.write MANIFEST_HEADER
-                case manifest
-                when Hash
-                  @manifest_tmp.write(manifest.map { |pair| pair.map{ |s| s.to_s }.join(": ") }.sort.join("\n") << "\n")
-                when Array
-                  @manifest_tmp.write(manifest.reject { |section| section.empty? }.map { |section|
-                      section.map { |pair| pair.join(": ") }.sort.join("\n").concat("\n")
-                    }.join("\n") << "\n")
-                when Proc, Method
-                  @manifest_tmp.write manifest.call
-                when String, Rake::Task
-                  @manifest_tmp.write File.read(manifest.to_s)
-                else
-                  fail "Invalid manifest, expecting Hash, Array, file name/task or proc/method."
-                end
-=end
-                meta_inf_path.include @manifest_tmp.path, :as=>"MANIFEST.MF"
+                path("META-INF").include @manifest_tmp.path, :as=>"MANIFEST.MF"
               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.4
-date: 2007-08-03 00:00:00 -07:00
+  version: 1.2.5
+date: 2007-08-13 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib