release_tagger 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8447b80dabdc7b29c854be1bd9f7385e19156ca9
-  data.tar.gz: aebae5d62eed1ca7ae8f4cb75f7a39b4c283bb2a
+  metadata.gz: 3b097254542e2fc3d1a364a7862242f6b0c090dd
+  data.tar.gz: f2aded664428fda3dee0e887c8b29ccfee07f590
 SHA512:
-  metadata.gz: f2aff2951cd9e160bb99c81955afc620d8bdde7fc38105b5bc7885d919dee201861e629455dc494146121cc5c5d735f8632a16110a2558417355f619a85da20a
-  data.tar.gz: b301b8d3298a15aa805536d0a7faf8da63beba444ce2f68c2635cbc6351e55c680de783a3e6d7c70e10bb15133fce9513587c0c1dd26b6575ef5545dfb710996
+  metadata.gz: 9dcb31c9eab4e9df7241ce1bb546f520c2da0eaac9689d213638d3c22d72eb7c9371da0d8d0b5cf8adeafc03959cb7b38c65beccff76bd0885720c7e1366e843
+  data.tar.gz: b41b19afd2395f9f15086c1cdf08929324530115a7b75cab8a83e649703d48ed5a1bf5f952fb9f84094e91adfde687a1aeb6eb397dbd4acfa8847b016831d1e5

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/release_tagger.rb

@@ -149,8 +149,17 @@ module ReleaseTagger
         exit 1
       end
 
-      log "Adding release tag"
       commits = changelog
+
+      log "Creating release commit"
+      commit_output = %x{git commit --allow-empty -m "#{release_message(new_version)}\n\n#{commits}" 2>&1}
+      unless $?.success?
+        err "Error committing release"
+        err commit_output
+        exit 1
+      end
+
+      log "Adding release tag"
       tag_output = %x{git tag -a #{new_version}#{release_tag} -m "#{release_message(new_version)}\n\n#{commits}" 2>&1}
       unless $?.success?
         err "Error adding version tag #{new_version}#{release_tag}:"
@@ -158,10 +167,10 @@ module ReleaseTagger
         exit 1
       end
 
-      log "Pushing tags to origin"
+      log "Pushing release to origin"
       # Separate `push` and `push --tags` here, because only relatively recent
       # versions of git push both refs and tags with the single command.
-      push_output = %x{git push --tags 2>&1}
+      push_output = %x{git push && git push --tags 2>&1}
       unless $?.success?
         err "Error pushing release tag to origin:"
         err push_output

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: release_tagger
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Simon Coffey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler