From a5f1436cd95e9a52f70277c2966d598843ce58b7 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Mon, 9 Mar 2015 12:24:49 -0300
Subject: [PATCH] Add release-related tasks to alternative Rakefile

---
 Rakefile.release              | 18 ++++++++++++++++++
 Rakefile.translations         | 11 -----------
 debian/rules                  |  2 +-
 lib/tasks/error_messages.rake |  5 +++--
 lib/tasks/package.rake        |  1 -
 lib/tasks/release.rake        |  7 +++----
 6 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 Rakefile.release
 delete mode 100644 Rakefile.translations

diff --git a/Rakefile.release b/Rakefile.release
new file mode 100644
index 0000000..a449fcc
--- /dev/null
+++ b/Rakefile.release
@@ -0,0 +1,18 @@
+# This Rakefile is intentionally independent from Rails to it can be used to
+# handle release-related tasks without having to load the entire Rails
+# environment (which is slow, requires a database connection and several other
+# inconveniences).
+
+$: << 'lib'
+require 'noosfero'
+require 'noosfero/version'
+
+load 'lib/tasks/gettext.rake'
+load 'lib/tasks/doc.rake'
+load 'lib/tasks/error_messages.rake'
+load 'lib/tasks/translation.rake'
+
+load 'lib/tasks/package.rake'
+load 'lib/tasks/release.rake'
+
+task :default => 'noosfero:translations:compile'
diff --git a/Rakefile.translations b/Rakefile.translations
deleted file mode 100644
index e6d9d24..0000000
--- a/Rakefile.translations
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Rakefile is intentionally independent from Rails to it can be used to
-# handle translations without having to load the entire Rails environment
-# (which is slow, requires a database connection and several other
-# inconveniences).
-
-$: << 'lib'
-load 'lib/tasks/gettext.rake'
-load 'lib/tasks/doc.rake'
-load 'lib/tasks/translation.rake'
-
-task :default => 'noosfero:translations:compile'
diff --git a/debian/rules b/debian/rules
index d745b16..4b26c0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,4 +33,4 @@ override_dh_clean:
 
 override_dh_auto_build:
 	dh_auto_build
-	rake noosfero:translations:compile > /dev/null
+	rake -f Rakefile.release > /dev/null
diff --git a/lib/tasks/error_messages.rake b/lib/tasks/error_messages.rake
index abde1b7..d2afebb 100644
--- a/lib/tasks/error_messages.rake
+++ b/lib/tasks/error_messages.rake
@@ -1,4 +1,5 @@
-templates = Dir.glob(Rails.root.join('public', '*.html.erb'))
+root = Pathname(File.dirname(__FILE__)).join('../../').expand_path
+templates = Dir.glob(root.join('public', '*.html.erb'))
 targets = []
 templates.each do |template|
   target = template.gsub(/.erb$/, '')
@@ -16,6 +17,6 @@ end
 namespace :noosfero do
   namespace 'error-pages' do
     desc 'Translates Noosfero error pages'
-    task :translate => [:environment] + targets
+    task :translate => targets
   end
 end
diff --git a/lib/tasks/package.rake b/lib/tasks/package.rake
index 366a3ee..142a036 100644
--- a/lib/tasks/package.rake
+++ b/lib/tasks/package.rake
@@ -1,4 +1,3 @@
-
 desc "Generate source tarball"
 task :package => 'package:clobber' do
   require_dependency 'noosfero'
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index f5eccf0..acbd24a 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -1,6 +1,5 @@
 # encoding: UTF-8
 
-require 'noosfero/version'
 $version = Noosfero::VERSION
 
 namespace :noosfero do
@@ -132,13 +131,13 @@ EOF
 
     if target =~ /-test$/
       if new_version =~ /~rc\d+/
-        new_version.sub!(/\~rc([0-9]+)/) { "~rc#{$1.to_i + 1}" }
+        new_version.sub!(/\~rc([0-9]+).*/) { "~rc#{$1.to_i + 1}" }
       else
         new_version += '~rc1'
       end
     else
-      if new_version =~ /~rc\d+/
-        new_version.sub!(/~rc[0-9]+/, '')
+      if new_version =~ /~rc\d+.*/
+        new_version.sub!(/~rc[0-9]+.*/, '')
       else
         components = new_version.split('.').map(&:to_i)
         if components.size < 3
--
libgit2 0.21.2