Author: vanto
Date: Fri Jan 14 18:56:06 2011
New Revision: 1059108
URL: http://svn.apache.org/viewvc?rev=1059108&view=rev
Log:
gpg task improved.
Modified:
ode/trunk/Rakefile
ode/trunk/tasks/gpg.rake
Modified: ode/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=1059108&r1=1059107&r2=1059108&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Fri Jan 14 18:56:06 2011
@@ -605,7 +605,7 @@ define "ode" do
package_with_sources
package_with_javadoc unless ENV["JAVADOC"] =~ /^(no|off|false|skip)$/i
- GPG.sign_before_upload(self)
+ gpg_sign_before_upload
task :pmd do
pmd_classpath =
transitive('pmd:pmd:jar:4.2.5').each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
@@ -715,6 +715,6 @@ 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/trunk/tasks/gpg.rake
URL:
http://svn.apache.org/viewvc/ode/trunk/tasks/gpg.rake?rev=1059108&r1=1059107&r2=1059108&view=diff
==============================================================================
--- ode/trunk/tasks/gpg.rake (original)
+++ ode/trunk/tasks/gpg.rake Fri Jan 14 18:56:06 2011
@@ -15,37 +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
