From 343daf309b88ac861032faaabe9f209b6c97118d Mon Sep 17 00:00:00 2001 From: Andrew Marshall & Sean Moon Date: Thu, 4 Aug 2011 17:29:37 -0400 Subject: Make rails gem build directory consistent with actionpack, etc. --- tasks/release.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tasks') diff --git a/tasks/release.rb b/tasks/release.rb index 01950b227d..2422efa786 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -4,11 +4,11 @@ root = File.expand_path('../../', __FILE__) version = File.read("#{root}/RAILS_VERSION").strip tag = "v#{version}" -directory "dist" +directory "pkg" (FRAMEWORKS + ['rails']).each do |framework| namespace framework do - gem = "dist/#{framework}-#{version}.gem" + gem = "pkg/#{framework}-#{version}.gem" gemspec = "#{framework}.gemspec" task :clean do @@ -41,10 +41,10 @@ directory "dist" File.open(file, 'w') { |f| f.write ruby } end - task gem => %w(update_version_rb dist) do + task gem => %w(update_version_rb pkg) do cmd = "" cmd << "cd #{framework} && " unless framework == "rails" - cmd << "gem build #{gemspec} && mv #{framework}-#{version}.gem #{root}/dist/" + cmd << "gem build #{gemspec} && mv #{framework}-#{version}.gem #{root}/pkg/" sh cmd end @@ -104,14 +104,14 @@ namespace :all do end task :commit do - File.open('dist/commit_message.txt', 'w') do |f| + File.open('pkg/commit_message.txt', 'w') do |f| f.puts "# Preparing for #{version} release\n" f.puts f.puts "# UNCOMMENT THE LINE ABOVE TO APPROVE THIS COMMIT" end - sh "git add . && git commit --verbose --template=dist/commit_message.txt" - rm_f "dist/commit_message.txt" + sh "git add . && git commit --verbose --template=pkg/commit_message.txt" + rm_f "pkg/commit_message.txt" end task :tag do -- cgit v1.2.3 From b53f77ec99ee179d66cca5efa9b68a659b161841 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Tue, 8 Nov 2011 12:56:51 +0530 Subject: CHANGELOG to CHANGELOG.md --- 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 2422efa786..780543aa78 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -66,7 +66,7 @@ namespace :changelog do FRAMEWORKS.each do |fw| require 'date' replace = '\1(' + Date.today.strftime('%B %d, %Y') + ')' - fname = File.join fw, 'CHANGELOG' + fname = File.join fw, 'CHANGELOG.md' contents = File.read(fname).sub(/^([^(]*)\(unreleased\)/, replace) File.open(fname, 'wb') { |f| f.write contents } @@ -76,7 +76,7 @@ namespace :changelog do task :release_summary do FRAMEWORKS.each do |fw| puts "## #{fw}" - fname = File.join fw, 'CHANGELOG' + fname = File.join fw, 'CHANGELOG.md' contents = File.readlines fname contents.shift changes = [] -- cgit v1.2.3 From b3175f6cb945f81f1dc3bf50a5fbe4a9207722df Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Tue, 8 Nov 2011 14:28:28 +0530 Subject: Warnings removed. --- tasks/release.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tasks') diff --git a/tasks/release.rb b/tasks/release.rb index 780543aa78..33aaee5a4b 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -26,16 +26,16 @@ directory "pkg" major, minor, tiny, pre = version.split('.') pre = pre ? pre.inspect : "nil" - ruby.gsub! /^(\s*)MAJOR = .*?$/, "\\1MAJOR = #{major}" + ruby.gsub!(/^(\s*)MAJOR = .*?$/, "\\1MAJOR = #{major}") raise "Could not insert MAJOR in #{file}" unless $1 - ruby.gsub! /^(\s*)MINOR = .*?$/, "\\1MINOR = #{minor}" + ruby.gsub!(/^(\s*)MINOR = .*?$/, "\\1MINOR = #{minor}") raise "Could not insert MINOR in #{file}" unless $1 - ruby.gsub! /^(\s*)TINY = .*?$/, "\\1TINY = #{tiny}" + ruby.gsub!(/^(\s*)TINY = .*?$/, "\\1TINY = #{tiny}") raise "Could not insert TINY in #{file}" unless $1 - ruby.gsub! /^(\s*)PRE = .*?$/, "\\1PRE = #{pre}" + ruby.gsub!(/^(\s*)PRE = .*?$/, "\\1PRE = #{pre}") raise "Could not insert PRE in #{file}" unless $1 File.open(file, 'w') { |f| f.write ruby } -- cgit v1.2.3 From 156784fef1f66dddcdfb753839f2d37bbee41655 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Mon, 14 Nov 2011 16:51:02 +0000 Subject: rake release should push the tag --- tasks/release.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'tasks') diff --git a/tasks/release.rb b/tasks/release.rb index 33aaee5a4b..191c014f9f 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -116,6 +116,7 @@ namespace :all do task :tag do sh "git tag #{tag}" + sh "git push --tags" end task :release => %w(ensure_clean_state build commit tag push) -- cgit v1.2.3