From ce0df82057ac31df0e620cf4a303d3428aa93020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 25 Mar 2014 15:35:06 -0300
Subject: Fix the update_versions release task

---
 tasks/release.rb | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'tasks')

diff --git a/tasks/release.rb b/tasks/release.rb
index a55cb68a47..849117884c 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -15,38 +15,37 @@ directory "pkg"
       rm_f gem
     end
 
-    task :update_version_rb do
+    task :update_versions do
       glob = root.dup
-      glob << "/#{framework}/lib/*" unless framework == "rails"
-      glob << "/version.rb"
+      if framework == "rails"
+        glob << "/version.rb"
+      else
+        glob << "/#{framework}/lib/*"
+        glob << "/gem_version.rb"
+      end
 
       file = Dir[glob].first
       ruby = File.read(file)
 
-      if framework == "rails" || framework == "railties"
-        major, minor, tiny, pre = version.split('.')
-        pre = pre ? pre.inspect : "nil"
+      major, minor, tiny, pre = version.split('.')
+      pre = pre ? pre.inspect : "nil"
 
-        ruby.gsub!(/^(\s*)MAJOR(\s*)= .*?$/, "\\1MAJOR = #{major}")
-        raise "Could not insert MAJOR in #{file}" unless $1
+      ruby.gsub!(/^(\s*)MAJOR(\s*)= .*?$/, "\\1MAJOR = #{major}")
+      raise "Could not insert MAJOR in #{file}" unless $1
 
-        ruby.gsub!(/^(\s*)MINOR(\s*)= .*?$/, "\\1MINOR = #{minor}")
-        raise "Could not insert MINOR in #{file}" unless $1
+      ruby.gsub!(/^(\s*)MINOR(\s*)= .*?$/, "\\1MINOR = #{minor}")
+      raise "Could not insert MINOR in #{file}" unless $1
 
-        ruby.gsub!(/^(\s*)TINY(\s*)= .*?$/, "\\1TINY  = #{tiny}")
-        raise "Could not insert TINY in #{file}" unless $1
+      ruby.gsub!(/^(\s*)TINY(\s*)= .*?$/, "\\1TINY  = #{tiny}")
+      raise "Could not insert TINY in #{file}" unless $1
 
-        ruby.gsub!(/^(\s*)PRE(\s*)= .*?$/, "\\1PRE   = #{pre}")
-        raise "Could not insert PRE in #{file}" unless $1
-      else
-        ruby.gsub!(/^(\s*)Gem::Version\.new .*?$/, "\\1Gem::Version.new \"#{version}\"")
-        raise "Could not insert Gem::Version in #{file}" unless $1
-      end
+      ruby.gsub!(/^(\s*)PRE(\s*)= .*?$/, "\\1PRE   = #{pre}")
+      raise "Could not insert PRE in #{file}" unless $1
 
       File.open(file, 'w') { |f| f.write ruby }
     end
 
-    task gem => %w(update_version_rb pkg) do
+    task gem => %w(update_versions pkg) do
       cmd = ""
       cmd << "cd #{framework} && " unless framework == "rails"
       cmd << "gem build #{gemspec} && mv #{framework}-#{version}.gem #{root}/pkg/"
@@ -93,9 +92,10 @@ namespace :changelog do
 end
 
 namespace :all do
-  task :build   => FRAMEWORKS.map { |f| "#{f}:build"   } + ['rails:build']
-  task :install => FRAMEWORKS.map { |f| "#{f}:install" } + ['rails:install']
-  task :push    => FRAMEWORKS.map { |f| "#{f}:push"    } + ['rails:push']
+  task :build           => FRAMEWORKS.map { |f| "#{f}:build"           } + ['rails:build']
+  task :update_versions => FRAMEWORKS.map { |f| "#{f}:update_versions" } + ['rails:update_versions']
+  task :install         => FRAMEWORKS.map { |f| "#{f}:install"         } + ['rails:install']
+  task :push            => FRAMEWORKS.map { |f| "#{f}:push"            } + ['rails:push']
 
   task :ensure_clean_state do
     unless `git status -s | grep -v RAILS_VERSION`.strip.empty?
-- 
cgit v1.2.3


From 21a674a028a9c02b8bba81db0bfe426843ee30a9 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 31 Mar 2014 14:45:34 -0400
Subject: Fix release task

Add a parentheses.
related: b4c96490eeb1fbb944e116c7703dd528b37fc08a
---
 tasks/release.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tasks')

diff --git a/tasks/release.rb b/tasks/release.rb
index 849117884c..767feaf236 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -67,7 +67,7 @@ end
 
 namespace :changelog do
   task :release_date do
-    FRAMEWORKS + ['guides'].each do |fw|
+    (FRAMEWORKS + ['guides']).each do |fw|
       require 'date'
       replace = '\1(' + Date.today.strftime('%B %d, %Y') + ')'
       fname = File.join fw, 'CHANGELOG.md'
@@ -78,7 +78,7 @@ namespace :changelog do
   end
 
   task :release_summary do
-    FRAMEWORKS + ['guides'].each do |fw|
+    (FRAMEWORKS + ['guides']).each do |fw|
       puts "## #{fw}"
       fname    = File.join fw, 'CHANGELOG.md'
       contents = File.readlines fname
-- 
cgit v1.2.3