runger_release_assistant 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683ba9baeb33557cc9cbae2d1edc4655ad63cec9593ecd01377fa873e0c93e02
-  data.tar.gz: 68230ece4069fa2abc218cc898f8ef338c6665929ec36450f2ae45865f5a605a
+  metadata.gz: 64d0029dfd4664143185e70ebb80b838eb629e189e75fb51329b630a28235b9b
+  data.tar.gz: 7205aa49c63be1b60af0e9290a40509ae81e94bff0068538f0ce7f8124153cd3
 SHA512:
-  metadata.gz: cf8976e578a6ab9062360d1cd0ffd34c47a7224cdbfbe893af63ea2d7e2ccca177e7331ea723af0a630de9dde47f612aa3e54521d38e8046020994008be545bd
-  data.tar.gz: b5badb53127796d8457bd441fd99b6ab6730d446e0d6194005759198e08ac10bfed3d2504b12845954fc213ad84625ee4979da6ee62b17e4c8c0a6425723530a
+  metadata.gz: b79cc46effa29a537c0f3b03f06173ee14e9f23b92413fd82d2189ccea24c3e280749643c6d82db5e7d993c7af5d4ea0f2271fa59e4cf0d8572a24f5d1631b41
+  data.tar.gz: 79256d4cca7ee5f90e2fc5b3941231bcb9d4f3429c7a630c1389b7706a94e50e39426884fa6a6500cf121acd31a0cf7ef5a085d3471f690026dcc44d41e0acef

data/.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.7.0 (2024-06-15)
+- Look for and use any of several common primary branch names (`main`, `master`, or `trunk`)
+
 ## v0.6.0 (2024-02-02)
 - Source Ruby version from `.ruby-version` file
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    runger_release_assistant (0.6.0)
+    runger_release_assistant (0.7.0)
       activesupport (>= 6, < 8)
       memo_wise (>= 1.7, < 2)
       rainbow (>= 3.0, < 4)
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
+    activesupport (7.1.3.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -22,51 +22,52 @@ GEM
       tzinfo (~> 2.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.8)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
-    drb (2.2.0)
-      ruby2_keywords
-    i18n (1.14.1)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     memo_wise (1.8.0)
     method_source (1.0.0)
-    minitest (5.21.1)
+    minitest (5.23.0)
     mutex_m (0.2.0)
     parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
+    prism (0.29.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    racc (1.7.3)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.60.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.0)
+    rubocop (1.64.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -74,27 +75,31 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-performance (1.20.2)
+    rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.26.1)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    runger_style (0.6.0)
+    runger_style (2.4.0)
+      prism (>= 0.24.0)
       rubocop (>= 1.38.0, < 2)
     slop (4.10.1)
+    strscan (3.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -115,7 +120,7 @@ DEPENDENCIES
   runger_style
 
 RUBY VERSION
-   ruby 3.3.0p0
+   ruby 3.3.3p89
 
 BUNDLED WITH
-   2.5.5
+   2.5.11

data/bin/_guard-core

@@ -17,8 +17,8 @@ if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300).include?('This file was generated by Bundler')
     load(bundle_binstub)
   else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+    abort('Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.')
   end
 end
 

data/bin/guard

@@ -17,8 +17,8 @@ if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300).include?('This file was generated by Bundler')
     load(bundle_binstub)
   else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+    abort('Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.')
   end
 end
 

data/bin/rspec

@@ -17,8 +17,8 @@ if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300).include?('This file was generated by Bundler')
     load(bundle_binstub)
   else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+    abort('Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.')
   end
 end
 

data/bin/rubocop

@@ -17,8 +17,8 @@ if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300).include?('This file was generated by Bundler')
     load(bundle_binstub)
   else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+    abort('Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.')
   end
 end
 

data/lib/runger_release_assistant/version.rb

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

data/lib/runger_release_assistant.rb

@@ -19,6 +19,16 @@ Dir["#{File.dirname(__FILE__)}/runger_release_assistant/**/*.rb"].each { |file|
 class RungerReleaseAssistant
   prepend MemoWise
 
+  class UnknownPrimaryBranch < StandardError
+    DEFAULT_MESSAGE = <<~MESSAGE.squish
+      Failed to automatically determine primary branch. Specify it via the `primary_branch` option.
+    MESSAGE
+
+    def initialize(message = DEFAULT_MESSAGE)
+      super
+    end
+  end
+
   DEFAULT_OPTIONS = { git: true, rubygems: false }.freeze
 
   class << self
@@ -114,12 +124,19 @@ class RungerReleaseAssistant
   end
 
   def switch_to_main
-    execute_command("git checkout #{main_branch}")
+    execute_command("git checkout #{primary_branch}")
+  end
+
+  memo_wise \
+  def primary_branch
+    @options[:primary_branch] ||
+    common_primary_branch_name ||
+    (raise(UnknownPrimaryBranch))
   end
 
   memo_wise \
-  def main_branch
-    @options[:primary_branch] || 'master'
+  def common_primary_branch_name
+    `git branch`.scan(/ (main|master|trunk)$/).dig(0, 0)
   end
 
   def update_changelog_for_release
@@ -193,8 +210,8 @@ class RungerReleaseAssistant
   end
 
   def restore_and_abort(exit_code:)
-    if current_branch == main_branch
-      execute_command("git reset --hard origin/#{main_branch}")
+    if current_branch == primary_branch
+      execute_command("git reset --hard origin/#{primary_branch}")
     end
 
     if execute_command("git rev-parse v#{next_version}", raise_error: false)

data/runger_release_assistant.gemspec

@@ -39,5 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency('rainbow', '>= 3.0', '< 4')
   spec.add_dependency('slop', '~> 4.8')
 
-  spec.required_ruby_version = Gem::Requirement.new(">= #{File.read('.ruby-version').rstrip}")
+  spec.required_ruby_version = ">= #{File.read('.ruby-version').rstrip}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runger_release_assistant
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - David Runger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-03 00:00:00.000000000 Z
+date: 2024-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -134,14 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A gem / CLI tool to automate the release process of other gems