bake-modernize 0.62.0 → 0.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b8c84fb38c24a7df3e697bde00f9e28d5725ff4435c36bc1943c3f3d9639e57
-  data.tar.gz: b1b37a9bb7567882ef2bf29ea5341e2f655a71753bfdb8ae83ef8932b492fc4a
+  metadata.gz: e1aadc6454ab0888d86a24dd830c3923d6aad289ad86feb368f24c7bfb53e211
+  data.tar.gz: 7c80f3d12f4d215a56b2eefad74a0157a97a4d1add74ea14cea17ed70413df33
 SHA512:
-  metadata.gz: bcf556c3cc4c36c933fb83cec422ab2d11571ba92d548574f076caad8a6bc7738f501490edea101fb9420ea66d1ad6e76da47d0b1bc14424d115a443195d394b
-  data.tar.gz: 141b31cac4965846e143316b60065c32ad8a282d4e82c9d63287ebbf4be83f488ae90fcea489fb3e4a59c7c5d9eb01a2b0a3a569ff939e9c16ae2c59e3da9fb1
+  metadata.gz: 6f99b9120cb5cb55ea2d6dbb7f652b364a86d7c32cfe55e21b66f50fe8180e7779e330496d3c61bd909c5e794c8e938a87c550d21205ced641b5043a5c5a92fd
+  data.tar.gz: 0a2aa4783d673e20fbb7c778e385cbfe6c2c49e3c768deeaa01451eea65b75bc85148d68df3e080a194feba9e7fdc6159bbefe17cbf404f6e48ff5727eca9644

data/bake/modernize/gemspec.rb

@@ -24,6 +24,7 @@ def update(path: default_gemspec_path, output: $stdout)
 	spec = ::Gem::Specification.load(path)
 	
 	root = File.dirname(path)
+	signing = Bake::Modernize::Signing.new(spec)
 	version_path = version_path(root, spec.name)
 	
 	constant = File.read(File.join(root, version_path))
@@ -56,7 +57,7 @@ def update(path: default_gemspec_path, output: $stdout)
 	if File.exist?(certificate_path)
 		output.puts "\t"
 		output.puts "\tspec.cert_chain  = [\"release.cert\"]"
-		output.puts "\tspec.signing_key = File.expand_path(\"~/.gem/release.pem\")"
+		output.puts "\tspec.signing_key = #{signing.private_key_expression}"
 	end
 	
 	if spec.homepage and !spec.homepage.empty?

data/bake/modernize/license.rb

@@ -66,50 +66,7 @@ private
 
 def update_source_file_authors(authorship, path, modifications)
 	copyrights = authorship.copyrights_for_modifications(modifications)
-	
-	input = File.readlines(path)
-	output = []
-	
-	if input.first =~ /^\#!/
-		output.push input.shift
-	end
-	
-	# Drop any old copyright statements.
-	while input.first =~ /Copyright/i
-		input.shift
-	end
-	
-	if input.first =~ /^\#.*?\:/
-		output.push input.shift
-		if input.first.chomp.empty?
-			input.shift
-		end
-		output << "\n"
-	end
-	
-	# Remove any existing license:
-	while input.first =~ /^#.*$/
-		input.shift
-	end
-	
-	# Remove any empty lines:
-	while input.first&.chomp&.empty?
-		input.shift
-	end
-	
-	output << "# Released under the MIT License.\n"
-	
-	copyrights.each do |copyright|
-		output << "# #{copyright.statement}\n"
-	end
-	
-	output << "\n"
-	
-	output.concat(input)
-	
-	File.open(path, "w") do |file|
-		file.puts(output)
-	end
+	Bake::Modernize::License::SourceFile.update(path, copyrights: copyrights.map(&:statement))
 end
 
 def remove_license(readme_path)

data/bake/modernize/signing.rb

@@ -10,10 +10,10 @@ def signing(root: Dir.pwd)
 end
 
 def update(root:)
-	release_certificate_path = File.expand_path("~/.gem/release.cert")
+	signing = Bake::Modernize::Signing.load(root)
 	certificate_path = File.expand_path("release.cert", root)
 	
-	if File.exist?(release_certificate_path)
-		FileUtils.cp(release_certificate_path, certificate_path)
+	if signing.certificate_path
+		FileUtils.cp(signing.certificate_path, certificate_path)
 	end
 end

data/context/index.yaml

@@ -7,6 +7,7 @@ metadata:
   changelog_uri: https://github.com/ioquatix/bake-modernize/blob/main/releases.md
   documentation_uri: https://ioquatix.github.io/bake-modernize/
   funding_uri: https://github.com/sponsors/ioquatix/
+  signing_owner: socketry
   source_code_uri: https://github.com/ioquatix/bake-modernize.git
 files:
 - path: getting-started.md

data/lib/bake/modernize/license.rb

@@ -12,6 +12,55 @@ module Bake
 		module License
 			GIT_BLAME_IGNORE_REVS = ".git-blame-ignore-revs"
 			
+			# Updates Ruby source headers without removing documentation comments.
+			class SourceFile
+				MAGIC_COMMENT = /\A#\s*(?:-\*-\s*)?(?:coding|encoding|frozen_string_literal|warn_indent|shareable_constant_value)\s*[:=]/i
+				LICENSE_COMMENT = /\A#\s*(?:Released under\b|Copyright\b|SPDX-License-Identifier:)/i
+				
+				# Replace the license and copyright header for a Ruby source file.
+				# @parameter path [String] The source file path.
+				# @parameter copyrights [Array(String)] The copyright statements to write.
+				def self.update(path, copyrights:)
+					input = File.readlines(path)
+					prefix = []
+					
+					prefix << input.shift if input.first&.start_with?("#!")
+					while input.first&.match?(MAGIC_COMMENT)
+						prefix << input.shift
+					end
+					
+					# Keep the complete leading comment block, removing only known license metadata.
+					documentation = []
+					while line = input.first
+						break unless line.match?(/\A\s*#/) || line.strip.empty?
+						
+						input.shift
+						next if line.match?(LICENSE_COMMENT)
+						
+						documentation << line
+					end
+					
+					while documentation.first&.strip&.empty?
+						documentation.shift
+					end
+					while documentation.last&.strip&.empty?
+						documentation.pop
+					end
+					
+					output = prefix.dup
+					output << "\n" if output.any?
+					output << "# Released under the MIT License.\n"
+					copyrights.each do |copyright|
+						output << "# #{copyright}\n"
+					end
+					output << "\n"
+					output.concat(documentation)
+					output.concat(input)
+					
+					File.write(path, output.join)
+				end
+			end
+			
 			# Represents revisions to skip when analyzing authorship.
 			class SkipList
 				# Load the skip list from a directory.

data/lib/bake/modernize/signing.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2026, by Samuel Williams.
+
+module Bake
+	module Modernize
+		# Resolve the RubyGems signing certificate and private key for a project.
+		class Signing
+			GEM_CREDENTIALS_PATH = File.expand_path("~/.gem")
+			GITHUB_OWNER = %r{\Ahttps?://github\.com/([\w.-]+)/}
+			
+			# Load signing configuration from a project's gemspec.
+			# @parameter root [String] The project root.
+			# @returns [Signing] The signing configuration.
+			def self.load(root)
+				gemspec_path = Dir["*.gemspec", base: root].first
+				gemspec = Gem::Specification.load(File.join(root, gemspec_path)) if gemspec_path
+				
+				return new(gemspec)
+			end
+			
+			# @parameter gemspec [Gem::Specification | Nil] The project gemspec.
+			def initialize(gemspec)
+				@gemspec = gemspec
+			end
+			
+			# The preferred certificate, if available.
+			# @returns [String | Nil] The certificate path.
+			def certificate_path
+				paths = []
+				
+				if owner = signing_owner
+					paths << File.join(GEM_CREDENTIALS_PATH, "#{owner}-release.cert")
+				end
+				
+				paths << File.join(GEM_CREDENTIALS_PATH, "release.cert")
+				return paths.find{|path| File.file?(path)}
+			end
+			
+			# The private key path, preserving an existing gemspec setting.
+			# @returns [String] The private key path.
+			def private_key_path
+				return @gemspec.signing_key if @gemspec&.signing_key
+				
+				if certificate_path = self.certificate_path
+					return certificate_path.sub(/\.cert\z/, ".pem")
+				end
+				
+				return File.join(GEM_CREDENTIALS_PATH, "release.pem")
+			end
+			
+			# Format a private key path for use in a gemspec.
+			# @returns [String] A Ruby expression.
+			def private_key_expression
+				prefix = GEM_CREDENTIALS_PATH + File::SEPARATOR
+				path = self.private_key_path
+				
+				if path.start_with?(prefix)
+					relative_path = path.delete_prefix(prefix)
+					path = "~/.gem/#{relative_path}"
+					return "File.expand_path(#{path.inspect})"
+				end
+				
+				return path.inspect
+			end
+			
+			private
+			
+			def signing_owner
+				return unless @gemspec
+				
+				owner = @gemspec.metadata["signing_owner"]
+				return owner if owner&.match?(/\A[\w.-]+\z/)
+				
+				urls = [@gemspec.metadata["source_code_uri"], @gemspec.homepage].compact
+				urls.each do |url|
+					if match = GITHUB_OWNER.match(url)
+						return match[1]
+					end
+				end
+			end
+		end
+	end
+end

data/lib/bake/modernize/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.62.0"
+		VERSION = "0.64.0"
 	end
 end

data/lib/bake/modernize.rb

@@ -5,6 +5,7 @@
 
 require_relative "modernize/git"
 require_relative "modernize/license"
+require_relative "modernize/signing"
 require_relative "modernize/version"
 
 require "build/files/glob"

data/readme.md

@@ -14,6 +14,10 @@ Please see the [project documentation](https://ioquatix.github.io/bake-modernize
 
 Please see the [project releases](https://ioquatix.github.io/bake-modernize/releases/index) for all releases.
 
+### v0.64.0
+
+  - Prefer the configured signing owner or GitHub owner when selecting RubyGems signing certificates and private keys.
+
 ### v0.62.0
 
   - Refresh `license.md` and Ruby copyright headers with `modernize:license` after version increments in generated release hooks.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.64.0
+
+  - Prefer the configured signing owner or GitHub owner when selecting RubyGems signing certificates and private keys.
+
 ## v0.62.0
 
   - Refresh `license.md` and Ruby copyright headers with `modernize:license` after version increments in generated release hooks.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.64.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -158,6 +158,7 @@ files:
 - lib/bake/modernize.rb
 - lib/bake/modernize/git.rb
 - lib/bake/modernize/license.rb
+- lib/bake/modernize/signing.rb
 - lib/bake/modernize/version.rb
 - license.md
 - readme.md
@@ -186,6 +187,7 @@ metadata:
   changelog_uri: https://github.com/ioquatix/bake-modernize/blob/main/releases.md
   documentation_uri: https://ioquatix.github.io/bake-modernize/
   funding_uri: https://github.com/sponsors/ioquatix/
+  signing_owner: socketry
   source_code_uri: https://github.com/ioquatix/bake-modernize.git
 rdoc_options: []
 require_paths: