gem-release 2.0.0.dev.2 → 2.0.0.dev.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eae2d6d553dc7f227a2d77d312478f9b350fc70
-  data.tar.gz: a9eb400332f183359a9607452f1988870a971765
+  metadata.gz: 3379c9a8fe1a960836949e5167f96f83d10c71c7
+  data.tar.gz: a59c0b440b3d1ffd6cc862f2d696b267b478268d
 SHA512:
-  metadata.gz: 7f044bdc3f1e96aeb2e106efffbeb8f30e304f5d7d87ee26255c9e2d3a18c263ce219e2c6046c8bb3e155ecd708f50f56b209cd844e62ec3bed84a43e5c8d14e
-  data.tar.gz: a9411129a69515026f8a9fc51b0a64b216f1224f729ce61ff9345ea4c9075d84f0044cfa1a8cf1fd488c629138ea750659337ed9920496ce860710dc92fb6499
+  metadata.gz: 3c31dd8dadfea502f17759e37228e920e773d7a7584d84cbc2c58ea5752ea9fd6bfd9ee2499866756feea1a6297d203c13384dee10d7a6b74aaa7a44a5309f82
+  data.tar.gz: 6e23a458c04035355e4e62c78992e125f17f39a9d1a5d24f26326cdb906ab1477263619b8f6fd88927b27490bba13d205af9384466bdc644f24116141f5dbba9

data/TODO.txt

@@ -3,14 +3,42 @@
 - Add defaults to options help output [5]
 - Add specs for all error conditions [6]
 - Add a changelog [7]
+- Check for TODO tags [17]
 
 - Make sure we don't double tag the same repo when several args are given [9]
 
+- Port "Adding ability to GPG sign commits and tags" [10]
+  https://github.com/svenfuchs/gem-release/pull/44
+
+# Done
+
+x Port "Support version files of gems with *rb suffix" done:2017-05-02 [13]
+  https://github.com/svenfuchs/gem-release/pull/53
+  Ported
+
+x Port "Add --message for BumpCommand", allow to use a config var for this done:2017-05-02 [11]
+  https://github.com/svenfuchs/gem-release/pull/61
+  Ported
+
+x Port "Maintenance tasks" done:2017-05-02 [12]
+  https://github.com/svenfuchs/gem-release/pull/57
+  Ported
+
+x Check "bump any version file" done:2017-05-02 [14]
+  https://github.com/svenfuchs/gem-release/pull/45
+  Ported
+
+x Consider "gem bootstrap --private for private gems" done:2017-05-01 [15]
+  https://github.com/svenfuchs/gem-release/issues/51
+  Already covered via custom templates
+
+x See if we can remove unused common options from `help` done:2017-05-01 [16]
+  https://github.com/svenfuchs/gem-release/issues/55
+  Can't figure out how, without removing options globally for everyone/all other commands
+
 x Release and tag should fail if there are uncommitted changes done:2017-05-01 [8]
   https://github.com/svenfuchs/gem-release/issues/34
 
-# Double check
-
 x Misleading success message done:2017-05-01 [4]
   https://github.com/svenfuchs/gem-release/issues/60
     Pushing foo-0.0.5.gem

data/lib/gem/release/cmds/bump.rb

@@ -43,20 +43,32 @@ module Gem
 
         DESCR = {
           version: 'Target version: next [major|minor|patch|pre|release] or a given version number [x.x.x]',
-          commit:  'Perform a commit after incrementing gem version',
+          commit:  'Create a commit after incrementing gem version',
+          message: 'Commit message template',
           push:    'Push the new commit to the git remote repository',
           remote:  'Git remote to push to (defaults to origin)',
+          sign:    'GPG sign the commit message',
           tag:     'Shortcut for running the `gem tag` command',
           recurse: 'Recurse into directories that contain gemspec files',
-          release: 'Shortcut for the `gem release` command'
+          release: 'Shortcut for the `gem release` command',
+          file:    'Full path to the version file'
         }
 
         DEFAULTS = {
-          commit: true,
-          push:   false,
-          remote: 'origin'
+          commit:  true,
+          message: 'Bump to %{to} [skip ci]',
+          push:    false,
+          remote:  'origin'
         }
 
+        opt '-v', '--version VERSION', DESCR[:version] do |value|
+          opts[:version] = value
+        end
+
+        opt '-m', '--message', DESCR[:message] do |value|
+          opts[:message] = value
+        end
+
         opt '-c', '--[no-]commit', DESCR[:commit] do |value|
           opts[:commit] = value
         end
@@ -69,8 +81,8 @@ module Gem
           opts[:remote] = value
         end
 
-        opt '-v', '--version VERSION', DESCR[:version] do |value|
-          opts[:version] = value
+        opt '-s', '--sign', DESCR[:sign] do |value|
+          opts[:sign] = value
         end
 
         opt '-t', '--tag', DESCR[:tag] do |value|
@@ -85,6 +97,10 @@ module Gem
           opts[:recurse] = value
         end
 
+        opt '--file', DESCR[:file] do |value|
+          opts[:file] = value
+        end
+
         MSGS = {
           bump:          'Bumping %s from version %s to %s',
           version:       'Changing version in %s from %s to %s',
@@ -98,7 +114,7 @@ module Gem
 
         CMDS = {
           git_add:    'git add %s',
-          git_commit: 'git commit -m "Bump to %s"',
+          git_commit: 'git commit -m %p %s',
           git_push:   'git push %s'
         }
 
@@ -131,7 +147,7 @@ module Gem
 
           def commit
             cmd :git_add, version.path
-            cmd :git_commit, version.to
+            cmd :git_commit, message, opts[:sign] ? '-S' : ''
           end
 
           def push
@@ -150,8 +166,12 @@ module Gem
             @version = nil
           end
 
+          def message
+            opts[:message] % version.to_h
+          end
+
           def version
-            @version ||= Files::Version.new(gem.name, opts[:version])
+            @version ||= Files::Version.new(gem.name, opts[:version], only(opts, :file))
           end
 
           def push?

data/lib/gem/release/cmds/tag.rb

@@ -31,6 +31,7 @@ module Gem
         DESCR = {
           push:    'Push tag to the remote git repository',
           remote:  'Git remote to push to (defaults to origin)',
+          sign:    'GPG sign the tag',
         }
 
         opt '-p', '--[no]-push', DESCR[:push] do
@@ -50,7 +51,7 @@ module Gem
         }
 
         CMDS = {
-          git_tag:   'git tag -am "tag %s" %s',
+          git_tag:   'git tag -am "tag %s" %s %s',
           git_push:  'git push --tags %s'
         }
 
@@ -71,7 +72,7 @@ module Gem
           end
 
           def tag
-            cmd :git_tag, tag_name, tag_name
+            cmd :git_tag, tag_name, tag_name, opts[:sign] ? '--sign' : ''
           end
 
           def push

data/lib/gem/release/config/files.rb

@@ -27,7 +27,7 @@ module Gem
 
           def paths
             paths = PATHS.map { |path| File.expand_path(path) }
-            paths.select { |path| File.exists?(path) }
+            paths.select { |path| File.exist?(path) }
           end
       end
     end

data/lib/gem/release/context/gemspec.rb

@@ -22,7 +22,7 @@ module Gem
         end
 
         def exists?
-          filename && File.exists?(filename)
+          filename && File.exist?(filename)
         end
 
         private

data/lib/gem/release/data.rb

@@ -10,7 +10,7 @@ module Gem
       def data
         {
           gem_name:     gem_name,
-          gem_path:     gem_name.gsub('-', '/'),
+          gem_path:     gem_path,
           module_names: module_names,
           author:       user_name,
           email:        user_email,
@@ -32,6 +32,10 @@ module Gem
           gem.name || raise('No gem_name given.')
         end
 
+        def gem_path
+          gem_name.gsub('-', '/').sub(/_rb$/, '')
+        end
+
         def user_name
           system.git_user_name || '[your name]'
         end

data/lib/gem/release/files/templates/group.rb

@@ -32,7 +32,7 @@ module Gem
             def paths
               @paths ||= groups.map do |group|
                 paths = paths_for(group).map { |path| File.expand_path(*path) }
-                paths.detect { |path| File.exists?(path) }
+                paths.detect { |path| File.exist?(path) }
               end.compact
             end
 

data/lib/gem/release/files/version.rb

@@ -3,7 +3,7 @@ require 'gem/release/version/number'
 module Gem
   module Release
     module Files
-      class Version < Struct.new(:name, :version)
+      class Version < Struct.new(:name, :version, :opts)
         VERSION      = /(VERSION\s*=\s*(?:"|'))((?:(?!"|').)*)("|')/
         RELEASE      = /^(\d+)\.(\d+)\.(\d+)(.*)$/
         PRE_RELEASE  = /^(\d+)\.(\d+)\.(\d+)\.?(.*)(\d+)$/
@@ -19,7 +19,7 @@ module Gem
         end
 
         def path
-          @path ||= paths.detect { |path| File.exists?(path) }
+          @path ||= opts[:file] || paths.detect { |path| File.exist?(path) }
         end
 
         def from
@@ -30,6 +30,10 @@ module Gem
           @to ||= number.bump
         end
 
+        def to_h
+          { from: from, to: to }
+        end
+
         private
 
           def paths
@@ -62,6 +66,10 @@ module Gem
           def path_to(path)
             "lib/#{path}/version.rb"
           end
+
+          def name
+            @name ||= super.sub(/_rb$/, '')
+          end
       end
     end
   end

data/lib/gem/release/helper.rb

@@ -17,6 +17,7 @@ module Gem
           info cmd, *args
           cmd = self.class::CMDS[cmd] % args
         end
+        cmd = cmd.strip
         notice "$ #{cmd}"
         result = pretend? ? true : system.run(cmd)
         abort "The command `#{cmd}` was unsuccessful." unless result
@@ -31,7 +32,7 @@ module Gem
       %w(announce notice info warn error).each do |level|
         define_method(level) do |msg, *args|
           msg = self.class::MSGS[msg] % args if msg.is_a?(Symbol)
-          context.send(level, msg) unless quiet?
+          context.send(level, msg.strip) unless quiet?
         end
       end
 

data/lib/gem/release/support/gem_command.rb

@@ -58,6 +58,13 @@ module Gem
         abort
       end
 
+      def show_help
+        p "KEKSE"
+        exit
+        parser.program_name = usage
+        say parser
+      end
+
       def cmd
         self.class.cmd
       end

data/lib/gem/release/version.rb

@@ -1,5 +1,5 @@
 module Gem
   module Release
-    VERSION = '2.0.0.dev.2'
+    VERSION = '2.0.0.dev.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-release
 version: !ruby/object:Gem::Version
-  version: 2.0.0.dev.2
+  version: 2.0.0.dev.3
 platform: ruby
 authors:
 - Sven Fuchs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies: []
 description: Release your ruby gems with ease. (What a bold statement for such a tiny
   plugin ...)