[Git][noosfero/noosfero][master] 2 commits: Bumping version 1.2

[Antonio Terceiro]

Antonio Terceiro pushed to branch master at Noosfero / noosfero


Commits:
05c19a06 by Antonio Terceiro at 2015-08-07T13:39:20Z
Bumping version 1.2

- - - - -
d538d964 by Antonio Terceiro at 2015-08-07T14:10:51Z
better release tasks

- - - - -


3 changed files:

- debian/changelog
- lib/noosfero/version.rb
- lib/tasks/release.rake


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+noosfero (1.2) wheezy; urgency=low
+
+  * Noosfero 1.2
+
+ -- Antonio Terceiro <terceiro at colivre.coop.br>  Fri, 07 Aug 2015 13:39:14 -0300
+
 noosfero (1.2~rc2) wheezy; urgency=low
 
   * Noosfero 1.2 RC2


=====================================
lib/noosfero/version.rb
=====================================
--- a/lib/noosfero/version.rb
+++ b/lib/noosfero/version.rb
@@ -1,6 +1,6 @@
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.2~rc2'
+  VERSION = '1.2'
 end
 
 root = File.expand_path(File.dirname(__FILE__) + '/../..')


=====================================
lib/tasks/release.rake
=====================================
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -121,6 +121,10 @@ EOF
   desc "uploads the packages to the repository"
   task :upload_packages, :target do |t, args|
     target = args[:target] || 'stable'
+    source = Dir['pkg/noosfero-*.tar.gz'].first
+    sh "gpg --detach-sign #{source}"
+    sh "sha256sum #{source} > #{source}.sha256sum"
+    sh "scp #{source}* download.noosfero.org:repos/source/"
     sh "dput --unchecked noosfero-#{target} #{Dir['pkg/*.changes'].first}"
   end
 
@@ -189,6 +193,14 @@ EOF
     abort if missing
   end
 
+  task :tag do
+    sh "git tag -s -m 'Noosfero #{$version}' #{$version.gsub('~','-')}"
+  end
+
+  task :pushtag do
+    sh "git push origin #{$version.gsub('~','-')}"
+  end
+
   desc 'prepares a release tarball'
   task :release, :target do |t, args|
     target = args[:target]
@@ -220,15 +232,14 @@ EOF
     Rake::Task['noosfero:debian_packages'].invoke
 
     if confirm("Create tag for version #{$version}")
-      sh "git tag #{$version.gsub('~','-')}"
-
+      Rake::Task['noosfero:tag'].invoke
       if confirm('Push new version tag')
-        repository = ask('Repository name', 'origin')
         puts "==> Uploading tags..."
-        sh "git push #{repository} #{$version.gsub('~','-')}"
+        Rake::Task['noosfero:pushtag'].invoke
       end
     end
 
+    Rake::Task['noosfero:upload'].invoke
     if confirm('Upload the packages')
       puts "==> Uploading debian packages..."
       Rake::Task['noosfero:upload_packages'].invoke(target)
@@ -239,6 +250,9 @@ EOF
     rm_f "tmp/pending-release"
   end
 
+  desc "finishes the release"
+  task 'release:finish' => ['noosfero:upload_packages', 'noosfero:tag', 'noosfero:pushtag']
+
   desc 'Build Debian packages'
   task :debian_packages => :package do
     target = "pkg/noosfero-#{$version}"



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/50fe7222fbc1255a9459795794f245ceeaef6848...d538d9648a1cd166d3646821679074396162616a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150807/133b95b9/attachment.html>