heroku_release 0.1.4 → 0.2.0

data/.gitignore

@@ -1,4 +1,5 @@
 pkg/*
 *.gem
 .bundle
-doc/*
+doc/*
+.rvmrc

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+# 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,30 +1,30 @@
 PATH
   remote: .
   specs:
-    heroku_release (0.1.4)
+    heroku_release (0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    mocha (0.9.9)
-      rake
-    rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    diff-lcs (1.1.3)
+    metaclass (0.0.1)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   heroku_release!
-  mocha (~> 0.9.9)
-  rspec (~> 2.0.0)
+  mocha (>= 0.9.9)
+  rake (>= 0.9.2)
+  rspec (>= 2.0.0)

data/README.rdoc

@@ -36,6 +36,10 @@ To examine git commits since the last release you can do:
 
  rake heroku_release:pending
 
+== License
+
+This library is released under the MIT license.
+
 == TODO
 
 It seems Heroku {is working on}[http://github.com/adamwiggins/heroku-releases] incorporating rollback functionality into the heroku command. Something to look into...

data/heroku_release.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec", "~> 2.0.0"
-  s.add_development_dependency "mocha", "~> 0.9.9"
+  s.add_development_dependency "rake", ">= 0.9.2"
+  s.add_development_dependency "rspec", ">= 2.0.0"
+  s.add_development_dependency "mocha", ">= 0.9.9"
 end

data/lib/heroku_release/version.rb

@@ -1,3 +1,3 @@
 module HerokuRelease
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/heroku_release.rb

@@ -34,12 +34,18 @@ module HerokuRelease
 
     def tag
       release_name = get_release_name
-      commit_version_file(release_name) if config.version_file_path
+      quoted_tag_comment = single_quote(tag_comment)
+
       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}"
-      commit_changelog if config.changelog_path
+
+      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
@@ -86,8 +92,8 @@ module HerokuRelease
       execute "git push origin :refs/tags/#{tag_name}"
     end
 
-    def quoted_tag_comment
-      tag_comment.gsub("'") { %q{'\''} } # quote single quotes
+    def single_quote(string)
+      string.gsub("'") { %q{'\''} } # quote single quotes
     end
 
     def tag_comment
@@ -124,20 +130,21 @@ module HerokuRelease
       end    
     end
 
-    def commit_version_file(release_name)
+    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}"
-      execute "git commit -m 'Updated version file to #{release_name}'"
-      execute "git push origin master"
     end
 
-    def commit_changelog
+    def update_changelog
       output "Committing #{config.changelog_path}"
       write_changelog
       execute "git add #{config.changelog_path}"
-      execute "git commit -m 'Updated #{config.changelog_path}'"
-      execute "git push origin master"
+    end
+    
+    def commit(release_name, quoted_tag_comment)
+      execute "git commit -m 'release #{release_name}: #{quoted_tag_comment}'"
+      execute "git push origin master"      
     end
     
     def write_changelog

data/spec/task_spec.rb

@@ -38,7 +38,7 @@ describe HerokuRelease::Task do
     it "create git tag with release name and comment and pushes it to origin and to heroku" do
       ENV['COMMENT'] = "don't forget to comment"
       @task.expects(:get_release_name).returns("release-123")
-      @task.expects(:commit_version_file).never
+      @task.expects(:update_version_file).never
       expect_tag_created("release-123", ENV['COMMENT'])
 
       @task.tag
@@ -54,7 +54,7 @@ describe HerokuRelease::Task do
         ENV['COMMENT'] = nil
 
         @task.expects(:get_release_name).returns("release-prompt-123")
-        @task.expects(:commit_version_file).never
+        @task.expects(:update_version_file).never
 
         expect_tag_created("release-prompt-123", "my custom stdin comment")
 
@@ -69,7 +69,8 @@ describe HerokuRelease::Task do
       ENV['COMMENT'] = nil
       @config.version_file_path = "public/version"
       @task.expects(:get_release_name).returns("release-123")
-      @task.expects(:commit_version_file).with("release-123")
+      @task.expects(:update_version_file).with("release-123")
+      @task.expects(:commit).with(is_a(String), is_a(String))
       expect_tag_created("release-123")
 
       @task.tag
@@ -78,8 +79,9 @@ describe HerokuRelease::Task do
     it "commits changelog if changelog_path is set" do
       @config.changelog_path = "spec/CHANGELOG"
       @task.expects(:get_release_name).returns("release-123")
-      @task.expects(:commit_version_file).never
-      @task.expects(:commit_changelog)
+      @task.expects(:update_version_file).never
+      @task.expects(:update_changelog)
+      @task.expects(:commit)
       expect_tag_created("release-123")
       
       @task.tag
@@ -192,7 +194,7 @@ Initial release
     end
   end
   
-  describe "commit_version_file(release_name)" do
+  describe "update_version_file(release_name)" do
     before(:each) do
       @path = "spec/version"      
     end
@@ -202,13 +204,10 @@ Initial release
     end
     
     it "writes release_name to version_file_path and commits that file" do
-      git = sequence('git')
-      @task.expects(:execute).with("git add #{@path}").in_sequence(git)
-      @task.expects(:execute).with("git commit -m 'Updated version file to release-123'").in_sequence(git)
-      @task.expects(:execute).with("git push origin master").in_sequence(git)
+      @task.expects(:execute).with("git add #{@path}")
 
       HerokuRelease.config.version_file_path = @path
-      @task.send(:commit_version_file, "release-123")
+      @task.send(:update_version_file, "release-123")
 
       File.read(@path).should == "release-123"
     end
@@ -240,7 +239,7 @@ release-20100926-173016
     end
   end
   
-  describe "commit_changelog" do
+  describe "update_changelog" do
     after(:each) do
       FileUtils.rm_f(@config.changelog_path)
     end
@@ -248,14 +247,20 @@ release-20100926-173016
     it "writes changelog to changelog_path and commits it" do
       @config.changelog_path = "spec/CHANGELOG"
       @task.expects(:changelog).returns("the changelog")
-      git = sequence('git')
-      @task.expects(:execute).with("git add #{@config.changelog_path}").in_sequence(git)
-      @task.expects(:execute).with("git commit -m 'Updated #{@config.changelog_path}'").in_sequence(git)
-      @task.expects(:execute).with("git push origin master").in_sequence(git)
+      @task.expects(:execute).with("git add #{@config.changelog_path}")
       
-      @task.send(:commit_changelog)
+      @task.send(:update_changelog)
       
       File.read(@config.changelog_path).should == (@task.send(:changelog_warning) + "the changelog")
     end
   end
+  
+  describe "commit" do
+    it "does a commit followed by a push to origin" do
+      git = sequence('git')
+      @task.expects(:execute).with(regexp_matches(/git commit/)).in_sequence(git)
+      @task.expects(:execute).with(regexp_matches(/git push/)).in_sequence(git)      
+      @task.send(:commit, "test-release-name", "test tag comment")
+    end
+  end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_release
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Peter Marklund
@@ -14,39 +10,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +01:00
-default_executable: 
+date: 2011-09-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rspec
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.9
+  type: :development
+  prerelease: false
+  version_requirements: *id003
 description: 
 email: 
 - peter@marklunds.com
@@ -58,6 +56,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -70,7 +69,6 @@ files:
 - spec/heroku_release_spec.rb
 - spec/spec_helper.rb
 - spec/task_spec.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/heroku_release
 licenses: []
 
@@ -84,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1071170481
+      hash: -2581110640240744748
       segments: 
       - 0
       version: "0"
@@ -93,14 +91,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1071170481
+      hash: -2581110640240744748
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: heroku_release
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Simple RubyGem for tagging and deploying versioned releases of an application to Heroku with the ability to do rollbacks.