git-bump 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5a25a12af0749f43938f0f73f72058606826ccb
-  data.tar.gz: 3e33b5cc7c489af869f1f9948658fd8678252cc3
+  metadata.gz: ce5e88c9cc833c7b655ee2e4d58c5e22f6b325e0
+  data.tar.gz: 19c2063ab2836d98a9c74b15c9560c590fd3e944
 SHA512:
-  metadata.gz: 5d6c775156eb71ab824bd7a2185359cfaf4d84555a921fa7d1e21b1182b5a281bea751e465925d3690573a854bf45222de30ca6f22db1e7018cdeb5d9343e906
-  data.tar.gz: 0e1968dd66dfab8357336e102977e3d3f697d4915f3bb38d207098b0c684e9135d254ad6054cbd42b1d6156540c2b648c599ba53f1c6c0a44b07d293c8868b47
+  metadata.gz: c81a9bec98422b00d4a9910858e6855ceabf80d8bd1547f306f3ae944e2c816f4d13b6389281fd44aca5e57c7fc780783c65b1217c9862f7b62fa47574d5c9cf
+  data.tar.gz: 91d194b0d78809e025febcd4d25253f93826bb87ed4c141bc043a34f8c67536312a737a657122d459a4cf39fdad4725b9b9b90b9424a12546fc916d8a2821039

data/lib/git_bump.rb

@@ -26,6 +26,24 @@ git bump can find it:
       @tag, @sha1, @name, @version = tag, sha1, name, Version.new(version)
     end
 
+    def tag_type
+      @tag_type ||= %x{git cat-file -t #{tag}}.chomp
+    end
+
+    def tag_message
+      if tag_type == 'tag'
+        @tag_message ||= %x{git cat-file tag #{tag}}.split("\n\n", 2).last
+      end
+    end
+
+    def tag_signed?
+      tag_message.to_s.include?("\n-----BEGIN PGP")
+    end
+
+    def tag_body?
+      tag_message.to_s.sub(/\n-----BEGIN PGP.*/m, '').include?("\n\n")
+    end
+
     def body
       @body ||= %x{git log -1 --pretty=format:%b #{sha1}}
     end
@@ -140,14 +158,19 @@ git bump can find it:
     end
 
     def tag!(name)
-      subject = %x{git log -1 --pretty=format:%s}.chomp
-      system!('git', 'tag', '-f', '-s', name, '-m', subject)
-      puts <<-EOS
+      annote = if latest && !latest.tag_signed? then '-a' else '-s' end
+      format = if releases.size < 2 || latest.tag_body? then '%B' else '%s' end
+      body = %x{git log -1 --pretty=format:#{format}}
+      if system('git', 'tag', '-f', annote, name, '-m', body)
+        puts <<-EOS
 Successfully created #{name}.  If you made a mistake, use `git bump redo` to
 try again.  Once you are satisfied with the result, run
 
         git push origin master #{name}
-      EOS
+        EOS
+      else
+        abort "Tag failed.  Create it by hand or use git reset --soft HEAD^ to try again."
+      end
     end
 
     def system!(*args)
@@ -203,7 +226,7 @@ try again.  Once you are satisfied with the result, run
     unless %x{git diff}.empty?
       abort "Discard or stage your changes."
     end
-    unless latest.sha1 == %x{git rev-parse HEAD}.chomp
+    unless latest && latest.sha1 == %x{git rev-parse HEAD}.chomp
       abort "Can only amend the top-most commit."
     end
     system!('git', 'commit', '--amend', '--verbose', '--reset-author')

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: git-bump
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Git based release management
@@ -72,17 +72,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Create Git release commits and tags with changelogs