heroku_release 0.1.3 → 0.1.4

data/Gemfile.lock

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

data/lib/heroku_release.rb

@@ -36,7 +36,7 @@ module HerokuRelease
       release_name = get_release_name
       commit_version_file(release_name) if config.version_file_path
       output "Tagging release as '#{release_name}'"
-      execute "git tag -a #{release_name} -m '#{tag_comment}'"
+      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
@@ -86,6 +86,10 @@ module HerokuRelease
       execute "git push origin :refs/tags/#{tag_name}"
     end
 
+    def quoted_tag_comment
+      tag_comment.gsub("'") { %q{'\''} } # quote single quotes
+    end
+
     def tag_comment
       return ENV['COMMENT'] if ENV['COMMENT']      
       if config.prompt_for_comments
@@ -130,11 +134,15 @@ module HerokuRelease
 
     def commit_changelog
       output "Committing #{config.changelog_path}"
-      File.open(config.changelog_path, "w") { |f| f.print(changelog_warning + changelog) }
+      write_changelog
       execute "git add #{config.changelog_path}"
       execute "git commit -m 'Updated #{config.changelog_path}'"
       execute "git push origin master"
     end
+    
+    def write_changelog
+      File.open(config.changelog_path, "w") { |f| f.print(changelog_warning + changelog) }      
+    end
 
     def changelog_warning
       "# NOTE: this file is autogenerated by the heroku_release gem - do not hand edit\n\n"

data/lib/heroku_release/version.rb

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

data/spec/task_spec.rb

@@ -36,10 +36,10 @@ describe HerokuRelease::Task do
 
   describe "tag" do
     it "create git tag with release name and comment and pushes it to origin and to heroku" do
-      ENV['COMMENT'] = "the comment"
+      ENV['COMMENT'] = "don't forget to comment"
       @task.expects(:get_release_name).returns("release-123")
       @task.expects(:commit_version_file).never
-      expect_tag_created("release-123", "the comment")
+      expect_tag_created("release-123", ENV['COMMENT'])
 
       @task.tag
     end
@@ -87,7 +87,8 @@ describe HerokuRelease::Task do
     
     def expect_tag_created(release_name, comment = "Tagged release")
       git = sequence('git')
-      @task.expects(:execute).with("git tag -a #{release_name} -m '#{comment}'").in_sequence(git)
+      quoted_comment = comment.gsub("'") { %q{'\''} }
+      @task.expects(:execute).with("git tag -a #{release_name} -m '#{quoted_comment}'").in_sequence(git)
       @task.expects(:execute).with("git push --tags origin").in_sequence(git)
       @task.expects(:execute).with("git push --tags #{@config.heroku_remote}").in_sequence(git)      
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Peter Marklund
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2011-01-07 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: -209753439
+      hash: 1071170481
       segments: 
       - 0
       version: "0"
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -209753439
+      hash: 1071170481
       segments: 
       - 0
       version: "0"