runger_release_assistant 4.2.1 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5cf7362dd12d923b88713f84240ed0d110a0aebcaa02fb64f093894ba7f468
-  data.tar.gz: c0986cb869c96542d2fb9cc4e40f8f95da9d4759c871ff2bbd7819b3cd5597c8
+  metadata.gz: 36d17692f73d92c5a6b3984689b59032f1ed495660c2a1d6471514bb749121ce
+  data.tar.gz: 1a46989fa26d35079a316269220e86d02a1ea4c28dfd94c9ad8b38dafb99c59f
 SHA512:
-  metadata.gz: 7fe5c293094adc5ddeb32e45e853bca02936620698a187be3247bbfd677c0224ba1741bd82ca2292a196ba7423f26b8fb16c7eecb91d89678dcb25a80950ea42
-  data.tar.gz: f1ebfe8c4fd71a3fe084c2aa0d1e613fd2fbe935bb52c465abb5df6b333f9f22f7064d1a5677c261d518b616f0b2ce3e0ef8542b0f95a9d68e90ba6fa2e6c562
+  metadata.gz: 8a8cfaf98881f7f9aacc27c88e1068390b83fcede377c17207dd296ca6021009c86a6df1eac2b61858b58078b3fb246222cef7d85c23df7595e47070700a92b2
+  data.tar.gz: 0e8b4ef1c0fe03a3747b127e3d7adbf40140bff458ab686435afc1bbea30b0b4e886ccd163015989e65790c9d59d245d79e4ab17ecd57cf58add4727ecdb06a2

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## Unreleased
 [no unreleased changes yet]
 
+## v4.3.1 (2025-03-20)
+[no unreleased changes yet]
+
+## v4.3.0 (2025-03-20)
+- Only use the RubyGems bundler release rake sub-tasks needed to push to RubyGems.
+
 ## v4.2.1 (2025-03-20)
 ### Docs
 - [README] Update table of contents.

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    runger_release_assistant (4.2.1)
+    runger_release_assistant (4.3.1)
       activesupport (>= 6)
       memo_wise (>= 1.7)
       rainbow (>= 3.0)
@@ -102,8 +102,8 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.39.0)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.41.0)
+      parser (>= 3.3.7.2)
     rubocop-performance (1.24.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1, < 2.0)
@@ -185,12 +185,12 @@ CHECKSUMS
   rspec-mocks (3.13.2) sha256=2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef
   rspec-support (3.13.2) sha256=cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec
   rubocop (1.74.0) sha256=06138a35d7d11c963d5abc0148b355e3999007cb0225a619940db0e75521379b
-  rubocop-ast (1.39.0) sha256=b6ba0f677ceced033b81c69405ac8931f4963116c572b8da5e15a03619a8236c
+  rubocop-ast (1.41.0) sha256=0eeff9ad3743f42823e3c687cbc15f8c552ff63c9f8e3d35fbafe746977c7c0d
   rubocop-performance (1.24.0) sha256=e5bd39ff3e368395b9af886927cc37f5892f43db4bd6c8526594352d5b4440b5
   rubocop-rspec (3.5.0) sha256=710c942fe1af884ba8eea75cbb8bdbb051929a2208880a6fc2e2dce1eed5304c
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   runger_byebug (11.4.0) sha256=569e22ba2215f57e7f69e145fcb63be401e29fcd312f7936d813e12d0c7bbee6
-  runger_release_assistant (4.2.1)
+  runger_release_assistant (4.3.1)
   runger_style (5.7.0) sha256=200790f3998e0b924df17efc9d440ddec99508bae983ba2a63f42b80624762f0
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
   slop (4.10.1) sha256=844322b5ffcf17ed4815fdb173b04a20dd82b4fd93e3744c88c8fafea696d9c7

data/README.md

@@ -141,17 +141,9 @@ By default, Git tags are created like `v1.0.0`. If you would like to prefix the
 tag_prefix: gem/
 ```
 
-You must also provide this to bundler by putting something like the following in your `Rakefile`:
-
-```rb
-require 'bundler/gem_tasks'
-require 'runger_release_assistant'
-Bundler::GemHelper.tag_prefix = RungerReleaseAssistant.new.tag_prefix
-```
-
 This example would generate tags in the form `gem/v1.0.0`.
 
-Note that all version numbers in git tags will be prefixed with at least a `v`. The `tag_prefix` option is to specify an additional prefix, in addition to the `v`.
+Note that all version numbers in git tags will be prefixed with at least a `v`. The `tag_prefix` option is to specify another prefix, in addition to the `v`.
 
 ## Development
 

data/lib/runger_release_assistant/version.rb

@@ -2,6 +2,6 @@
 
 # rubocop:disable Style/StaticClass
 class RungerReleaseAssistant
-  VERSION = '4.2.1'
+  VERSION = '4.3.1'
 end
 # rubocop:enable Style/StaticClass

data/lib/runger_release_assistant.rb

@@ -43,6 +43,7 @@ class RungerReleaseAssistant
     end
   end
 
+  CHANGELOG_FILE_NAME = 'CHANGELOG.md'
   DEFAULT_OPTIONS = { rubygems: false }.freeze
 
   class << self
@@ -76,10 +77,12 @@ class RungerReleaseAssistant
   end
 
   def run_release
-    ensure_on_main_branch
+    verify_on_main_branch
+    verify_repository_cleanliness
+    verify_changelog_present
+
     print_release_info
     confirm_release_looks_good
-    verify_repository_cleanliness
 
     update_changelog_for_release
     update_version_file(next_version)
@@ -104,12 +107,18 @@ class RungerReleaseAssistant
 
   private
 
-  def ensure_on_main_branch
+  def verify_on_main_branch
     if current_branch != primary_branch
       fail('You must be on the primary branch to release!')
     end
   end
 
+  def verify_changelog_present
+    if !File.exist?(changelog_path)
+      fail("You must have a changelog at #{changelog_path} .")
+    end
+  end
+
   def print_release_info
     logger.info("You are running the release process with options #{@options.to_h}.")
 
@@ -145,8 +154,16 @@ class RungerReleaseAssistant
   end
 
   def verify_repository_cleanliness
-    fail 'There are unstaged changes!' if !system('git diff --exit-code')
-    fail 'There are staged changes!' if !system('git diff-index --quiet --cached HEAD')
+    if git_is_clean?
+      @git_was_clean_initially = true
+    else
+      fail 'There are uncommitted changes!'
+    end
+  end
+
+  memo_wise \
+  def git_is_clean?
+    !system('test -n "$(git status --porcelain)"')
   end
 
   def current_branch
@@ -194,7 +211,7 @@ class RungerReleaseAssistant
   end
 
   def commit_changes(message:)
-    execute_command("git add CHANGELOG.md Gemfile.lock #{version_file_path}")
+    execute_command("git add #{CHANGELOG_FILE_NAME} Gemfile.lock #{version_file_path}")
     execute_command("git commit -m '#{message}'")
   end
 
@@ -221,8 +238,11 @@ class RungerReleaseAssistant
 
   def push_to_rubygems
     logger.debug('Pushing to RubyGems and git')
-    # Always show system output because 2FA should be enabled, which requires user to see the prompt
-    execute_command('bundle exec rake release', show_system_output: true)
+    # Show system output because 2FA should be enabled, which requires the user to see the prompt.
+    execute_command(
+      'bundle exec rake build release:guard_clean release:rubygem_push',
+      show_system_output: true,
+    )
   end
 
   def push_to_git
@@ -271,7 +291,7 @@ class RungerReleaseAssistant
   end
 
   def restore_and_abort(exit_code:)
-    if current_branch == primary_branch
+    if (current_branch == primary_branch) && @git_was_clean_initially
       execute_command("git reset --hard origin/#{primary_branch}")
     end
 
@@ -322,7 +342,7 @@ class RungerReleaseAssistant
 
   memo_wise \
   def changelog_path
-    file_path('CHANGELOG.md')
+    CHANGELOG_FILE_NAME
   end
 
   memo_wise \

data/runger_release_assistant.gemspec

@@ -40,6 +40,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency('rake', '>= 13.2.1')
   spec.add_dependency('slop', '~> 4.8')
 
-  required_ruby_version = File.read('.ruby-version').rstrip.sub(/\A(\d+\.\d+)\.\d+\z/, '\1.0')
+  # HACK: Using public_send rather than read works around a Dependabot bug.
+  # rubocop:disable Style/SendWithLiteralMethodName
+  required_ruby_version =
+    File.public_send(:read, '.ruby-version').
+      rstrip.sub(/\A(\d+\.\d+)\.\d+\z/, '\1.0')
+  # rubocop:enable Style/SendWithLiteralMethodName
   spec.required_ruby_version = ">= #{required_ruby_version}"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: runger_release_assistant
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.1
 platform: ruby
 authors:
 - David Runger
 bindir: exe
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport