heroku_release 0.1.1 → 0.1.2

data/Gemfile.lock

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

data/lib/heroku_release.rb

@@ -2,7 +2,8 @@ require 'ostruct'
 
 module HerokuRelease
   @@config = OpenStruct.new(
-    :heroku_remote => "heroku"
+    :heroku_remote => "heroku",
+    :prompt_for_comments => true
   )
 
   def self.config
@@ -34,9 +35,8 @@ module HerokuRelease
     def tag
       release_name = get_release_name
       commit_version_file(release_name) if config.version_file_path
-      comment = ENV['COMMENT'] || 'Tagged release'
-      output "Tagging release as '#{release_name}' with comment '#{comment}'"
-      execute "git tag -a #{release_name} -m '#{comment}'"
+      output "Tagging release as '#{release_name}'"
+      execute "git tag -a #{release_name} -m '#{tag_comment}'"
       execute "git push --tags origin"
       execute "git push --tags #{config.heroku_remote}"
       commit_changelog if config.changelog_path
@@ -82,10 +82,20 @@ module HerokuRelease
 
     private
 
+    def tag_comment
+      return ENV['COMMENT'] if ENV['COMMENT']      
+      if config.prompt_for_comments
+        print "Required - please enter a release comment: "
+        $stdin.gets.strip
+      else
+        'Tagged release'
+      end
+    end
+
     def output(message)
       puts message
     end
-    
+
     def execute(command)
       output `#{command}`.strip
     end
@@ -143,7 +153,7 @@ module HerokuRelease
     def git_tags_with_comments
       `git tag -n`
     end
-    
+
     def config
       HerokuRelease.config
     end

data/lib/heroku_release/version.rb

@@ -1,3 +1,3 @@
 module HerokuRelease
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/heroku_release_spec.rb

@@ -13,6 +13,10 @@ describe HerokuRelease do
     it "defaults heroku_remote to heroku" do
       config.heroku_remote.should == "heroku"
     end
+
+    it "defaults prompting for comments to true" do
+      config.prompt_for_comments.should == true
+    end
     
     it "can set heroku_remote" do
       config.heroku_remote = "production"

data/spec/task_spec.rb

@@ -5,6 +5,7 @@ describe HerokuRelease::Task do
   before(:each) do
     @task = HerokuRelease::Task.new
     @config = HerokuRelease.config
+    @config.prompt_for_comments = false
     @config_before = HerokuRelease.config.dup
   end
 
@@ -42,6 +43,27 @@ describe HerokuRelease::Task do
 
       @task.tag
     end
+
+    it "prompts for a comment message if enforced" do
+      previous_value = HerokuRelease.config.prompt_for_comments
+      old_stdin = $stdin
+      $stdin = mock('stdin', :gets => "my custom stdin comment")
+
+      begin
+        HerokuRelease.config.prompt_for_comments = true
+        ENV['COMMENT'] = nil
+
+        @task.expects(:get_release_name).returns("release-prompt-123")
+        @task.expects(:commit_version_file).never
+
+        expect_tag_created("release-prompt-123", "my custom stdin comment")
+
+        @task.tag
+      ensure
+        HerokuRelease.config.prompt_for_comments = previous_value
+        $stdin = old_stdin
+      end
+    end
     
     it "commits version file if version_file_path is set" do
       ENV['COMMENT'] = nil

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Peter Marklund
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +01:00
+date: 2010-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -701205583
+      hash: -437090257
       segments: 
       - 0
       version: "0"
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -701205583
+      hash: -437090257
       segments: 
       - 0
       version: "0"