heroku_release 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+# 0.2.3 (Sep 27 2011)
+
+* Bugfix: The changelog file was missing the current release, it needs to include the tag that has not been added yet. The heroku_release:log was correct though. I considered removing the CHANGELOG file altogether to simplify things but I'm keeping it around since I like it (unfortunately the code is getting smelly now - refactoring needed).
+
 # 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.

data/Gemfile.lock

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

data/lib/heroku_release/version.rb

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

data/lib/heroku_release.rb

@@ -43,7 +43,7 @@ module HerokuRelease
         end
         if config.changelog_path
           output "Updating #{config.changelog_path}"
-          update_changelog
+          update_changelog(release_name, tag_comment)
         end
         commit(release_name, quoted_tag_comment)
       end
@@ -141,8 +141,8 @@ module HerokuRelease
       execute "git add #{config.version_file_path}"
     end
 
-    def update_changelog
-      write_changelog
+    def update_changelog(release_name, tag_comment)
+      write_changelog(release_name, tag_comment)
       execute "git add #{config.changelog_path}"
     end
     
@@ -151,20 +151,25 @@ module HerokuRelease
       execute "git push origin master"      
     end
     
-    def write_changelog
-      File.open(config.changelog_path, "w") { |f| f.print(changelog_warning + changelog) }      
+    def write_changelog(release_name, tag_comment)
+      changelog_entries_with_next = [[release_name, tag_comment]] + changelog_entries
+      File.open(config.changelog_path, "w") { |f| f.print(changelog_warning + changelog(changelog_entries_with_next)) }
     end
 
     def changelog_warning
       "# NOTE: this file is autogenerated by the heroku_release gem - do not hand edit\n\n"
     end
 
-    def changelog
-      git_tags_with_comments.scan(/^\s*(release-\d+-\d+)\s*(.+)$/).reverse.map do |release, comment|
+    def changelog(entries = changelog_entries)
+      entries.map do |release, comment|
         "- #{release}\n\n#{comment}\n\n"
       end.join
     end
 
+    def changelog_entries
+      git_tags_with_comments.scan(/^\s*(release-\d+-\d+)\s*(.+)$/).reverse
+    end
+
     def get_release_name
       "release-#{Time.now.utc.strftime("%Y%m%d-%H%M%S")}"
     end

data/spec/task_spec.rb

@@ -249,11 +249,26 @@ release-20100926-173016
       @task.expects(:changelog).returns("the changelog")
       @task.expects(:execute).with("git add #{@config.changelog_path}")
       
-      @task.send(:update_changelog)
+      @task.send(:update_changelog, "release-next", "Next release")
       
       File.read(@config.changelog_path).should == (@task.send(:changelog_warning) + "the changelog")
     end
   end
+
+  describe "changelog_entries" do
+    before(:each) do
+      @git_tags_with_comments = <<-END
+        release-20110923-132407 First release
+        release-20110927-082753 Second release
+        release-20110927-083744 Third release
+      END
+    end
+    
+    it "should return an array with release tags and comments in reverse chronological order" do
+      @task.expects(:git_tags_with_comments).returns(@git_tags_with_comments)
+      @task.send(:changelog_entries).should == [["release-20110927-083744", "Third release"], ["release-20110927-082753", "Second release"], ["release-20110923-132407", "First release"]]
+    end
+  end
   
   describe "commit" do
     it "does a commit followed by a push to origin" do

metadata

@@ -2,7 +2,7 @@
 name: heroku_release
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Peter Marklund
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2783281116986717283
+      hash: -1580450884279506336
       segments: 
       - 0
       version: "0"
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2783281116986717283
+      hash: -1580450884279506336
       segments: 
       - 0
       version: "0"