bake-modernize 0.17.2 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3adf18f4bf40c41642f4a556147a3a5e17ffa0be5ddf7c500c560467f39f9ac4
-  data.tar.gz: 0de5d13a9a64c097282558d4874f5e8e8b5c4d6a89a2abe7aae3686ae45bb24f
+  metadata.gz: 65d6b9a42133ae86ab48a97a908f5539b0223f1bf7fec948f5f3cd20d178e043
+  data.tar.gz: 7390a861caca26af8389d00da3409722eb08632f4a2e7f0db4c6938ba12e2c42
 SHA512:
-  metadata.gz: 558fab3ed955228a67a0a64fe513696fa5993db232546724638958d83f1493a70d5ebebd704ec49a2157c8c18ef88421ef9ee7af98ca728038c0d8cf111a4dd9
-  data.tar.gz: 32fb0451b53300d6d82cf52a9f1d91fbc8807ca0b62ea36140c0fb4a3cb9f7321b8ba4756a8576eef12ef7023dfeb2eda8916ed4f485ceec5a51c341cab97cd4
+  metadata.gz: 44a727be6bc7dd4e3a4edd7b6d4b022139314fecd9b8305cdc2e573f5eee726cedb81873cb25362900038c851a6e8bf483f218ae043479069110a61cd5cd81fc
+  data.tar.gz: 7dc3a78ad44ce97113ca1e63558e059c14c168a9b6ef6563f899b5ad14695a661aabd57f6457df5f404b37002d2b8a22f38cb0a8b0f41d0635498061f92ad83c

data/bake/modernize/gemspec.rb

@@ -110,9 +110,11 @@ def update(path: default_gemspec_path, output: $stdout)
 	end
 	
 	if spec.development_dependencies.any?
-		output.puts "\t"
-		spec.development_dependencies.sort.each do |dependency|
-			output.puts "\tspec.add_development_dependency #{format_dependency(dependency)}"
+		unless move_development_dependencies(spec.development_dependencies)
+			output.puts "\t"
+			spec.development_dependencies.sort.each do |dependency|
+				output.puts "\tspec.add_development_dependency #{format_dependency(dependency)}"
+			end
 		end
 	end
 	
@@ -236,3 +238,26 @@ def sorted_authors(spec)
 	
 	return authors.sort_by{|k,v| [-v, k]}.map(&:first)
 end
+
+IGNORE_GEMS = %w[
+	bundler
+].freeze
+
+def move_development_dependencies(dependencies)
+	gemfile_path = File.expand_path("gems.rb")
+	
+	if File.exist?(gemfile_path)
+		File.open(gemfile_path, "a") do |file|
+			file.puts
+			file.puts "# Moved Development Dependencies"
+			
+			dependencies.each do |dependency|
+				next if IGNORE_GEMS.include?(dependency.name)
+				
+				file.puts "gem #{format_dependency(dependency)}"
+			end
+		end
+		
+		true
+	end
+end

data/lib/bake/modernize/license.rb

@@ -9,6 +9,39 @@ require 'yaml'
 module Bake
 	module Modernize
 		module License
+			GIT_BLAME_IGNORE_REVS = ".git-blame-ignore-revs"
+			
+			class SkipList
+				def self.for(root)
+					full_path = File.join(root, GIT_BLAME_IGNORE_REVS)
+					
+					if File.exist?(full_path)
+						skip_list = self.new
+						skip_list.extract(full_path)
+						return skip_list
+					end
+				end
+				
+				def initialize(revisions = [])
+					@revisions = Set.new(revisions)
+				end
+				
+				def extract(path)
+					File.open(path, 'r') do |file|
+						file.each_line do |line|
+							# Skip empty lines and comments
+							next if line =~ /^\s*(#|$)/
+							# Parse line
+							@revisions << line.strip
+						end
+					end
+				end
+				
+				def ignore?(commit)
+					@revisions.include?(commit.oid)
+				end
+			end
+			
 			class Mailmap
 				def self.for(root)
 					full_path = File.join(root, '.mailmap')
@@ -119,6 +152,7 @@ module Bake
 				
 				def extract(root = Dir.pwd)
 					mailmap = Mailmap.for(root)
+					skip_list = SkipList.for(root)
 					
 					if contributors = Contributors.for(root)
 						contributors.each do |path, author, time|
@@ -126,7 +160,7 @@ module Bake
 						end
 					end
 					
-					walk(Rugged::Repository.discover(root), mailmap: mailmap)
+					walk(Rugged::Repository.discover(root), mailmap: mailmap, skip_list: skip_list)
 					
 					return self
 				end
@@ -151,8 +185,10 @@ module Bake
 				
 				DEFAULT_SORT = Rugged::SORT_DATE | Rugged::SORT_TOPO | Rugged::SORT_REVERSE
 				
-				def walk(repository, mailmap: nil, show: "HEAD")
+				def walk(repository, mailmap: nil, skip_list: nil, show: "HEAD")
 					Rugged::Walker.walk(repository, show: show, sort: DEFAULT_SORT) do |commit|
+						next if skip_list&.ignore?(commit)
+						
 						diff = commit.diff
 						
 						# We relax the threshold for copy and rename detection because we want to detect files that have been moved and modified more generously.

data/lib/bake/modernize/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.17.2"
+		VERSION = "0.17.4"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.4
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -110,20 +110,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 executables: []