Merge pull request #117 from grosser/grosser/cop3

lock down and fix rubocop

Gemfile

@@ -4,4 +4,8 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'byebug', platform: :mri
+gem 'bundler'
+gem 'debug', platform: :mri
+gem 'rake'
+gem 'rspec'
+gem 'rubocop', '~> 1.50.0' # avoid accidental bumps since tha breaks PRs

bump.gemspec

@@ -11,9 +11,4 @@ Gem::Specification.new "bump" do |s|
   s.files = `git ls-files lib README.md`.split("\n")
   s.license = "MIT"
   s.executables = ["bump"]
-
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
 end

lib/bump.rb

@@ -210,9 +210,9 @@ def bump_changelog(file, current)
 
       def commit_message(version, options)
         tag = "#{options[:tag_prefix]}#{version}"
-        return tag unless options[:commit_message]
+        return tag unless (message = options[:commit_message])
 
-        options[:commit_message].dup.gsub!('%<tag>', tag) || "#{tag} #{commit_msg}"
+        message.dup.gsub!('%<tag>', tag) || "#{tag} #{message}"
       end
 
       def commit(version, options)