heroku_release 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+# 0.2.2 (Sep 27 2011)
+
+* Bugfix: the optional writing of the version file and updating of the changelog now happens before the tag is created. This makes sense of course since when you check out the tag you expect the changelog and version files to reflect the tag. Also, before this change, the release commit would commit the list you get when you do heroku_release:pending.
+
 # 0.2.0 (Sep 23 2011)
 
 * When doing a release, now instead of polluting the git log with two commits (for changelog and version file) we now do a single commit. We also make sure that commit has an informative comment containing the tag comment.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku_release (0.2.1)
+    heroku_release (0.2.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/heroku_release/version.rb

@@ -1,3 +1,3 @@
 module HerokuRelease
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/heroku_release.rb

@@ -36,16 +36,22 @@ module HerokuRelease
       release_name = get_release_name
       quoted_tag_comment = single_quote(tag_comment)
 
+      if config.version_file_path || config.changelog_path
+        if config.version_file_path
+          output "Updating version file at #{config.version_file_path}"
+          update_version_file(release_name)
+        end
+        if config.changelog_path
+          output "Updating #{config.changelog_path}"
+          update_changelog
+        end
+        commit(release_name, quoted_tag_comment)
+      end
+
       output "Tagging release as '#{release_name}'"
       execute "git tag -a #{release_name} -m '#{quoted_tag_comment}'"
       execute "git push --tags origin"
       execute "git push --tags #{config.heroku_remote}"
-
-      if config.version_file_path || config.changelog_path
-        update_version_file(release_name) if config.version_file_path
-        update_changelog if config.changelog_path
-        commit(release_name, quoted_tag_comment)
-      end
     end
 
     def log
@@ -75,7 +81,7 @@ module HerokuRelease
       if previous
         output "Rolling back to '#{previous}' ..."
         execute "git push -f #{config.heroku_remote} #{previous}:master"
-        output "Deleting rollbacked release '#{current}' ..."
+        output "Removing rolled back release tag '#{current}' ..."
         remove_tag(current)
         output 'Rollback completed'
       else
@@ -131,13 +137,11 @@ module HerokuRelease
     end
 
     def update_version_file(release_name)
-      output "Committing version file for release #{release_name}"
       File.open(config.version_file_path, "w") { |f| f.print release_name }
       execute "git add #{config.version_file_path}"
     end
 
     def update_changelog
-      output "Committing #{config.changelog_path}"
       write_changelog
       execute "git add #{config.changelog_path}"
     end

metadata

@@ -2,7 +2,7 @@
 name: heroku_release
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Peter Marklund
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2011-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2463496464753435046
+      hash: -2783281116986717283
       segments: 
       - 0
       version: "0"
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2463496464753435046
+      hash: -2783281116986717283
       segments: 
       - 0
       version: "0"