svn commit: r1058938 - in /ode/branches/ode-1.3.5.x: Rakefile tasks/gpg.rake

[va...@apache.org]

Author: vanto
Date: Fri Jan 14 10:59:35 2011
New Revision: 1058938

URL: http://svn.apache.org/viewvc?rev=1058938&view=rev
Log:
gpg task improved.

Modified:
    ode/branches/ode-1.3.5.x/Rakefile
    ode/branches/ode-1.3.5.x/tasks/gpg.rake

Modified: ode/branches/ode-1.3.5.x/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/ode-1.3.5.x/Rakefile?rev=1058938&r1=1058937&r2=1058938&view=diff
==============================================================================
--- ode/branches/ode-1.3.5.x/Rakefile (original)
+++ ode/branches/ode-1.3.5.x/Rakefile Fri Jan 14 10:59:35 2011
@@ -600,7 +600,7 @@ define "ode" do
   package_with_javadoc unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
 
   # sign artifacts
-  GPG.sign_before_upload(self)
+  gpg_sign_before_upload
 
 end
 
@@ -694,5 +694,5 @@ define "apache-ode" do
     using(:javadoc, :windowtitle=>"Apache ODE #{project.version}").target, :as=>"#{id}-docs-#{version}") unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
     
   # sign packages
-  GPG.sign_before_upload(self)
+  gpg_sign_before_upload
 end

Modified: ode/branches/ode-1.3.5.x/tasks/gpg.rake
URL: http://svn.apache.org/viewvc/ode/branches/ode-1.3.5.x/tasks/gpg.rake?rev=1058938&r1=1058937&r2=1058938&view=diff
==============================================================================
--- ode/branches/ode-1.3.5.x/tasks/gpg.rake (original)
+++ ode/branches/ode-1.3.5.x/tasks/gpg.rake Fri Jan 14 10:59:35 2011
@@ -15,36 +15,45 @@
 #    limitations under the License.
 #
 
-module GPG
-  extend self
+module Buildr
+  module GPG
+    extend self
 
-  def sign_task(pkg)
-    file(pkg.to_s + '.asc') do
-      puts "GPG signing #{pkg.to_spec}"
-      cmd = 'gpg',
-             '--local-user', ENV['GPG_USER'],
-             '--armor',
-             '--output', pkg.to_s + '.asc'
-      cmd += ['--passphrase', ENV['GPG_PASS']] if ENV['GPG_PASS']
-      cmd += ['--detach-sig', pkg]
-      #cmd << { :verbose => true }
-      #sh *cmd
-      system *cmd
+    def sign_task(pkg)
+      file(pkg.to_s + '.asc') do
+        puts "GPG signing #{pkg.to_spec}"
+        cmd = 'gpg',
+               '--local-user', ENV['GPG_USER'],
+               '--armor',
+               '--output', pkg.to_s + '.asc'
+        cmd += ['--passphrase', ENV['GPG_PASS']] if ENV['GPG_PASS']
+        cmd += ['--detach-sig', pkg]
+        #cmd << { :verbose => true }
+        #sh *cmd
+        system *cmd
+      end
     end
-  end
 
-  def sign_and_upload(pkg)
-    artifact = Buildr.artifact(pkg.to_spec_hash.merge(:type => "#{pkg.type}.asc"))
-    artifact.from sign_task(pkg)
-    task(:upload).enhance [artifact.upload_task]
-  end
+    def sign_and_upload(pkg)
+      task(:upload).enhance do
+        artifact = Buildr.artifact(pkg.to_spec_hash.merge(:type => "#{pkg.type}.asc"))
+        artifact.from sign_task(pkg)
+        artifact.invoke
+        artifact.upload
+      end
+    end
 
-  def sign_before_upload(root)
-    root.enhance do 
-      [root, root.projects].flatten.each { |prj|
-        prj.packages.each { |pkg| sign_and_upload(pkg) }
-        prj.packages.map {|pkg| pkg.pom }.uniq.each { |pom| sign_and_upload(pom) }
-      }
+    def gpg_sign_before_upload
+      self.enhance do 
+        [self, self.projects].flatten.each { |prj|
+          prj.packages.each { |pkg| sign_and_upload(pkg) }
+          prj.packages.map {|pkg| pkg.pom }.uniq.each { |pom| sign_and_upload(pom) }
+        }
+      end
     end
   end
 end
+
+class Buildr::Project
+  include Buildr::GPG
+end