buildr 0.14.0 → 0.15.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.15 (2/28/2007)
+* Fixed: tasks fail unless deployment server specified.
+* Changed: deploy method executes deployment, instead of returning a task.
+
 0.14 (2/28/2007)
 * Added: check task that looks for obvious errors in the Rakefile.
 * Added: deploy task for managing deployment.

data/lib/buildr.rb

@@ -7,7 +7,7 @@ gem "rubyzip"
 gem "highline"
 
 module Buildr
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__))

data/lib/core/artifact.rb

@@ -352,9 +352,9 @@ module Buildr
     args.flatten.map { |id| artifact :group=>hash[:under], :version=>hash[:version], :id=>id }
   end 
 
-  # Creates and return a task that will deploy all the specified
-  # artifacts and files. Specify the deployment server by passing it
-  # as the last argument (must be a hash).
+  # Deploys all the specified artifacts/files. Specify the deployment
+  # server by passing a hash as the last argument, or have it use
+  # repositories.deploy_to.
   #
   # For example:
   #   deploy(*process.packages, :url=>"sftp://example.com/var/www/maven")
@@ -368,24 +368,22 @@ module Buildr
     end
     url = options[:url]
     options = options.reject { |k,v| k === :url }
-    fail "Don't know where to release, specify a URL or use repositories.deploy_to = url|hash" if url.blank?
-
-    # Arguments are artifacts and types so we depend on them.
-    task(url=>args).enhance do |task|
-      Transports.perform url, options do |session|
-        args.each do |artifact|
-          if artifact.respond_to?(:to_spec)
-            # Upload artifact relative to base URL, need to create path before uploading.
-            puts "Deploying #{artifact.to_spec}" if verbose
-            spec = artifact.to_spec_hash
-            path = spec[:group].gsub(".", "/") + "/#{spec[:id]}/#{spec[:version]}/"
-            session.mkpath path
-            session.upload artifact.to_s, path + Artifact.hash_to_file_name(spec)
-          else
-            # Upload artifact to URL.
-            puts "Deploying #{artifact}" if verbose
-            session.upload artifact, File.basename(artifact)
-          end
+    fail "Don't know where to deploy, perhaps you forgot to set repositories.deploy_to" if url.blank?
+
+    args.each { |arg| arg.invoke if arg.respond_to?(:invoke) }
+    Transports.perform url, options do |session|
+      args.each do |artifact|
+        if artifact.respond_to?(:to_spec)
+          # Upload artifact relative to base URL, need to create path before uploading.
+          puts "Deploying #{artifact.to_spec}" if verbose
+          spec = artifact.to_spec_hash
+          path = spec[:group].gsub(".", "/") + "/#{spec[:id]}/#{spec[:version]}/"
+          session.mkpath path
+          session.upload artifact.to_s, path + Artifact.hash_to_file_name(spec)
+        else
+          # Upload artifact to URL.
+          puts "Deploying #{artifact}" if verbose
+          session.upload artifact, File.basename(artifact)
         end
       end
     end

data/lib/core/build.rb

@@ -66,7 +66,6 @@ module Buildr
     end
 
     def svn(*args)
-      #args << { :verbose=>Rake.application.options.trace }
       stdin, stdout, stderr = Open3.popen3("svn", *args)
       stdin.close
       error = stderr.read

data/lib/java/packaging.rb

@@ -138,7 +138,7 @@ module Buildr
         end
       end
 
-      task "deploy"=>deploy(package, package.pom)
+      task("deploy") { deploy(package, package.pom) }
 
       packages << package
       Artifact.register package

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 0.14.0
+  version: 0.15.0
 date: 2007-02-28 00:00:00 -08:00
 summary: A build system that doesn't suck
 require_paths: