bake-modernize 0.17.5 → 0.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6bf8c1f1f973846d16af55aa30a9b62960b2db001d80e7a19506161a9992203
-  data.tar.gz: 047c44563a79018b3163b9dabf1498d23b9f538c3f18a403177b580fb3156157
+  metadata.gz: 476b1dc7aba7fb3b9e3753cf63a46ac4b40a7f514d21aac1a1e5941fbbe6b044
+  data.tar.gz: 2e8c30ab6839975ad456ea8d990a65a904fcea266c0aeea2f82851db49d9df33
 SHA512:
-  metadata.gz: fbea3be9c9830f12f1590704cfddd527bdc7a7876b0cd00b9b6e008c6c17e9a6282dfe2c975ced005292925b57c08e433f374a9de3ba7b49bf9de91d713cef15
-  data.tar.gz: 18b73153b2156878413a7dd34b232e12cb4477b2cedf070c4d11bf2ed10a758d7036bfe9c39f436956e24329a2e1a01d48bf3cf4523cf4370ef44806d9c1b8aa
+  metadata.gz: 23f1b336cf45fbb3e5607bc4c133545d7e7b057e85f408758221bbcb1dc0019df318e1862fcb20cef2a4bc7d9ec609bc00e7630b7e0b218025f9c29e61f3853d
+  data.tar.gz: bf9d06fea25608b41dbd95564e8747084c998efabde130fab3c9b427791ad8e2e8569175cb83eaf587fed9f2bedc3d8c769c0b9617e31dfe3cb945c3dcca81c9

data/bake/modernize/gemspec.rb

@@ -14,7 +14,6 @@ def gemspec
 end
 
 # The latest end-of-life Ruby version.
-LATEST_END_OF_LIFE_RUBY = ::Gem::Version.new("2.7")
 MINIMUM_RUBY_VERSION = ::Gem::Requirement.new(">= 3.0")
 
 # Rewrite the specified gemspec.
@@ -26,7 +25,7 @@ def update(path: default_gemspec_path, output: $stdout)
 	version_path = version_path(root)
 	
 	constant = File.read(version_path)
-		.scan(/module\s+(.*?)$/)
+		.scan(/(class|module)\s+(.*?)$/)
 		.flatten
 		.join("::")
 	
@@ -88,20 +87,11 @@ def update(path: default_gemspec_path, output: $stdout)
 		output.puts "\tspec.extensions = #{extensions.inspect}"
 	end
 	
-	if required_ruby_version = spec.required_ruby_version
-		unless required_ruby_version.none?
-			if required_ruby_version.satisfied_by?(LATEST_END_OF_LIFE_RUBY)
-				Console.logger.warn(self, "Required Ruby version #{required_ruby_version} is end-of-life!")
-			end
-			
-			output.puts "\t"
-			output.puts "\tspec.required_ruby_version = #{required_ruby_version.to_s.inspect}"
-		end
-	else
-		output.puts "\t"
-		output.puts "\tspec.required_ruby_version = #{MINIMUM_RUBY_VERSION.to_s.dump}"
-	end
+	# Update the required Ruby version:
+	output.puts "\t"
+	output.puts "\tspec.required_ruby_version = #{MINIMUM_RUBY_VERSION.to_s.dump}"
 	
+	# Update the required Rubygems version:
 	if spec.runtime_dependencies.any?
 		output.puts "\t"
 		spec.runtime_dependencies.sort.each do |dependency|
@@ -109,6 +99,7 @@ def update(path: default_gemspec_path, output: $stdout)
 		end
 	end
 	
+	# Try to move development dependencies to `gems.rb`:
 	if spec.development_dependencies.any?
 		unless move_development_dependencies(spec.development_dependencies)
 			output.puts "\t"

data/lib/bake/modernize/license.rb

@@ -122,10 +122,14 @@ module Bake
 			end
 
 			class Authorship
-				Modification = Struct.new(:author, :time, :path) do
+				Modification = Struct.new(:author, :time, :path, :id) do
 					def full_name
 						author[:name]
 					end
+					
+					def key
+						self.id || "#{self.author[:email]}:#{self.time.iso8601}"
+					end
 				end
 				
 				Copyright = Struct.new(:dates, :author) do
@@ -140,14 +144,17 @@ module Bake
 				end
 				
 				def initialize
-					@paths = {}
+					@paths = Hash.new{|h,k| h[k] = []}
+					@commits = Hash.new{|h,k| h[k] = []}
 				end
 				
 				attr :paths
 				
-				def add(path, author, time)
-					@paths[path] ||= []
-					@paths[path] << Modification.new(author, time, path)
+				def add(path, author, time, id = nil)
+					modification = Modification.new(author, time, path, id)
+					
+					@commits[modification.key] << modification
+					@paths[path] << modification
 				end
 				
 				def extract(root = Dir.pwd)
@@ -168,9 +175,9 @@ module Bake
 				def sorted_authors
 					authors = Hash.new{|h,k| h[k] = 0}
 					
-					@paths.each do |path, modifications|
-						modifications.each do |modification|
-							authors[modification.full_name] += 1
+					@commits.each do |key, modifications|
+						modifications.map(&:full_name).uniq.each do |full_name|
+							authors[full_name] += 1
 						end
 					end
 					
@@ -230,7 +237,7 @@ module Bake
 								end
 							end
 							
-							@paths[new_path] << Modification.new(author, commit.time, new_path)
+							add(new_path, author, commit.time, commit.oid)
 						end
 					end
 				end

data/lib/bake/modernize/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.17.5"
+		VERSION = "0.17.7"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.17.5
+  version: 0.17.7
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http