runger_release_assistant 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72ac278c16da0d5e98cda5bccea174aaf11ae0f90cbf81523c395d1b86c2de85
-  data.tar.gz: e252541ae877d556c8eb374755d994d65003fdb9e4c6b60daaa6e5b290385d43
+  metadata.gz: 36d17692f73d92c5a6b3984689b59032f1ed495660c2a1d6471514bb749121ce
+  data.tar.gz: 1a46989fa26d35079a316269220e86d02a1ea4c28dfd94c9ad8b38dafb99c59f
 SHA512:
-  metadata.gz: 0a0350178ce80ae6602fccf3b44f24d5ddf8187f828dbfa31613750fcdaec9b5329bcc32f77b1082c2ab18dfc0d7dc6955cc347f2879211297f2fff87b9caf66
-  data.tar.gz: 07ce3e2bd9e5f51b1effe409e913e4fbf9ad6c1dad995309d53a5ecc41d3de053332b081ca089f3b607fa834361c59e4ee2da7e61ee8bbc8c56bb3a336af92df
+  metadata.gz: 8a8cfaf98881f7f9aacc27c88e1068390b83fcede377c17207dd296ca6021009c86a6df1eac2b61858b58078b3fb246222cef7d85c23df7595e47070700a92b2
+  data.tar.gz: 0e8b4ef1c0fe03a3747b127e3d7adbf40140bff458ab686435afc1bbea30b0b4e886ccd163015989e65790c9d59d245d79e4ab17ecd57cf58add4727ecdb06a2

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## 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.
 

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    runger_release_assistant (4.3.0)
+    runger_release_assistant (4.3.1)
       activesupport (>= 6)
       memo_wise (>= 1.7)
       rainbow (>= 3.0)
@@ -190,7 +190,7 @@ CHECKSUMS
   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.3.0)
+  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/lib/runger_release_assistant/version.rb

@@ -2,6 +2,6 @@
 
 # rubocop:disable Style/StaticClass
 class RungerReleaseAssistant
-  VERSION = '4.3.0'
+  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
 
@@ -274,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
 
@@ -325,7 +342,7 @@ class RungerReleaseAssistant
 
   memo_wise \
   def changelog_path
-    file_path('CHANGELOG.md')
+    CHANGELOG_FILE_NAME
   end
 
   memo_wise \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runger_release_assistant
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - David Runger