gem-release 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4cb6bbd05b81d7fe48d8b68ae917e31e77f8516992c04f43e28895b0d0f85fe
-  data.tar.gz: df3dad2633a3d8eb13b4df343883b9c22e996b567d735f51baa0c7742960998e
+  metadata.gz: '0593ca80b14173c835988c30981e6895fe97875f195a27628017cdeb7080e58b'
+  data.tar.gz: 12ba75b8b8aa43dce56a9d86308cee50dcbaf19f9391f8cf09e786097b384919
 SHA512:
-  metadata.gz: a287a028d04969631577eb055b389ec731bbf73bd711211485c0bcfba8991bbf4067b887fca8a94c9ecfe267f3140988c91b21e51eebe6d0400f0a05a2796d0d
-  data.tar.gz: '093f1658507e1c88aae8d163fc1c167272c32c09ef7fdb739cfe0ee3384d35ea88406927ce48ee235184dd265bd4f4cf55f76df325ee71a2edf491ab0f43d953'
+  metadata.gz: d1c6b398458c3fbedf4f868d952985b3635221ae3ccf57b6cebf1488e158b26d167c136d217e1c0850ab28e56668fd3d9fefa55c7cd915b090a70965b31b553c
+  data.tar.gz: c8b0984e4a39a662a3f08a11b6699a2041236e82d6505529373d6173f8eb5c6b7ea7577a0a116906eeed2b9b6a033b719129ec83a76a4878ce55a3b7426a22bc

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## v2.0.2 - 2019-06-17
+## v2.0.3 - 2019-07-04
+
+### Fixed
+
+- Fix `gem-release` Heredoc for Ruby 2.2  
+  (PR: https://github.com/svenfuchs/gem-release/pull/82)
+- Partially Fix "gem bump tags the wrong version"  
+  (PR: https://github.com/svenfuchs/gem-release/pull/83)
+
+## v2.0.2 - 2019-06-27
 
 ### Fixed
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gem-release (2.0.1)
+    gem-release (2.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -37,7 +37,7 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)

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

@@ -8,7 +8,7 @@ module Gem
       class Bootstrap < Base
         summary 'Scaffolds a new gem from template files.'
 
-        description <<~str
+        description <<-str.split("\n").map(&:lstrip).join("\n")
           #{summary} Optionally initialize a git repository, set a git remote, and push
           to the remote repository.
 

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

@@ -7,7 +7,7 @@ module Gem
       class Bump < Base
         summary 'Bumps one, several, or all gems in this directory.'
 
-        description <<~str
+        description <<-str.split("\n").map(&:lstrip).join("\n")
           Bumps the version number defined in lib/[gem_name]/version.rb to to a given,
           specific version number, or to the next major, minor, patch, or pre-release
           level.
@@ -136,16 +136,18 @@ module Gem
         }.freeze
 
         def run
+          new_version = nil
           in_gem_dirs do
             validate
             checkout if opts[:branch]
             bump
+            new_version = version.to
             commit if opts[:commit]
             push   if opts[:commit] && opts[:push]
             reset
           end
-          tag     if opts[:tag]
-          release if opts[:release]
+          tag(new_version)     if opts[:tag]
+          release(new_version) if opts[:release]
         end
 
         private
@@ -176,12 +178,12 @@ module Gem
             cmd :git_push, remote
           end
 
-          def tag
-            Tag.new(context, args, opts).run
+          def tag(new_version)
+            Tag.new(context, args, opts.merge(version: new_version)).run
           end
 
-          def release
-            Release.new(context, args, except(opts, :tag)).run
+          def release(new_version)
+            Release.new(context, args, except(opts, :tag).merge(version: new_version)).run
           end
 
           def branch

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

@@ -8,7 +8,7 @@ module Gem
       class Gemspec < Base
         summary 'Generates a gemspec.'
 
-        description <<~str
+        description <<-str.split("\n").map(&:lstrip).join("\n")
           #{summary}
 
           If no argument is given the current directory name is used as the gem name. If

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

@@ -8,7 +8,7 @@ module Gem
       class Release < Base
         summary 'Releases one or all gems in this directory.'
 
-        description <<~str
+        description <<-str.split("\n").map(&:lstrip).join("\n")
           Builds one or many gems from the given gemspec(s), pushes them to rubygems.org
           (or another, compatible host), and removes the left over gem file.
 
@@ -83,7 +83,7 @@ module Gem
           end
 
           def release
-            announce :release, gem.name, gem.version
+            announce :release, gem.name, target_version
             build
             push
           ensure
@@ -111,6 +111,10 @@ module Gem
           def cleanup
             cmd :cleanup, gem.filename
           end
+
+          def target_version
+            opts[:version] || gem.version
+          end
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Gem
       class Tag < Base
         summary "Tags the HEAD commit with the gem's current version."
 
-        description <<~str
+        description <<-str.split("\n").map(&:lstrip).join("\n")
           Creates an annotated tag for the current HEAD commit, using the gem's
           current version.
 
@@ -63,7 +63,7 @@ module Gem
 
         def run
           in_gem_dirs do
-            announce :tag, gem.name, gem.version
+            announce :tag, gem.name, target_version
             validate
             tag_and_push
           end
@@ -95,7 +95,7 @@ module Gem
           end
 
           def tag_name
-            "v#{gem.version}"
+            "v#{target_version}"
           end
 
           def push?
@@ -105,6 +105,10 @@ module Gem
           def remote
             opts[:remote]
           end
+
+          def target_version
+            opts[:version] || gem.version
+          end
       end
     end
   end

data/lib/gem/release/version.rb

@@ -1,5 +1,5 @@
 module Gem
   module Release
-    VERSION = '2.0.2'
+    VERSION = '2.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-release
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Sven Fuchs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies: []
 description: Release your ruby gems with ease. (What a bold statement for such a tiny
   plugin ...)