covered-git 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28acdeaccd2f00e8258fe0a743787ee2b28479d395f3a02585a24da66b91b575
-  data.tar.gz: 2fc71474ea5d945916ff579b3d7fc2ab18a858901f9aa1a47623bf599e330286
+  metadata.gz: fdb5f80dbd4b64b56932daf646d8af2216079127a37c025adb4f7526d98b39d1
+  data.tar.gz: 4da126aa69204de96704e2b4a1512a0d483aed8b76ac84f66743277ee754db4b
 SHA512:
-  metadata.gz: 929f9678db24cf42b77208681ed01b137751509a0c9eb8426b2337dec0d4bbb0f5a7104d0b80626e70af789a7de7bad331e9a502f3eba050b9d87965d3da1c75
-  data.tar.gz: 18ec8ba1a59b805f8917007889343ec9e8a9212f051ce3b4ee4ab7050ba35084a1b1fa854f237cc546d85ab5faa1cd2860f37c57fb92f96e65a6eac6e3ca8308
+  metadata.gz: fe9d988f16a5bc4ae4a977abcefac2c1febae5c7472bc19d39d32b2e49d2864426535d4a1912be425c382479debb435b60255230c593706ed6c49d8a45504936
+  data.tar.gz: 94f56bf7eee01eccb5890f1946e5339aeba04fa10a14c677a3e34507d2e2afa91ec5bbbbc43a2ae5004400919307cebe36e95822f05902b3300ae9bd114a9415

data/bake/covered/git.rb

@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 
 require 'covered/policy'
+require 'covered/git/branch_changes'
 
 def initialize(...)
 	super
 	
 	require 'set'
 	require 'rugged'
-	@repository = nil
 end
 
 # bake load_coverage_from_simplecov git:coverage
+# @parameter root [String] the root directory of the git repository.
 # @parameter branch [String] the branch to compare against.
 # @parameter input [Covered::Policy] the input policy to use.
-def statistics(branch: self.default_branch, input:)
+def statistics(root: context.root, branch: nil, input:)
 	input ||= context.lookup("covered:policy:current").call
-	modifications = lines_modified(branch)
+	changes = Covered::Git::BranchChanges.new(root)
+	modifications = changes.lines_modified(branch)
 	
 	# Calculate statistics:
 	statistics = Covered::Statistics.new
@@ -28,35 +30,4 @@ def statistics(branch: self.default_branch, input:)
 	end
 	
 	return statistics
-end
-
-private
-
-def repository(root = context.root)
-	@repository ||= Rugged::Repository.discover(root)
-end
-
-def default_branch
-	"main"
-end
-
-# Compute the lines modified for a given branch, returning a hash of paths to a set of line numbers.
-# @returns [Hash(String, Set(Integer))]
-def lines_modified(branch)
-	result = Hash.new{|k,v| k[v] = Set.new}
-	
-	diff = repository.diff_workdir(branch)
-	
-	diff.each_patch do |patch|
-		path = patch.delta.new_file[:path]
-		
-		patch.each_hunk do |hunk|
-			hunk.each_line do |line|
-				result[path] << line.new_lineno if line.addition?
-			end
-		end
-	end
-
-	result.default = nil
-	return result.freeze
-end
+end

data/lib/covered/git/branch_changes.rb

@@ -0,0 +1,40 @@
+
+module Covered
+	module Git
+		class BranchChanges
+			def initialize(root)
+				@root = root
+			end
+			
+			def repository
+				@repository ||= Rugged::Repository.discover(@root)
+			end
+			
+			def default_branch
+				"main"
+			end
+			
+			# Compute the lines modified for a given branch, returning a hash of paths to a set of line numbers.
+			# @returns [Hash(String, Set(Integer))]
+			def lines_modified(branch = nil)
+				branch ||= default_branch
+				result = Hash.new{|k,v| k[v] = Set.new}
+				
+				diff = repository.diff(repository.rev_parse(branch), repository.last_commit)
+				
+				diff.each_patch do |patch|
+					path = patch.delta.new_file[:path]
+					
+					patch.each_hunk do |hunk|
+						hunk.each_line do |line|
+							result[path] << line.new_lineno if line.addition?
+						end
+					end
+				end
+			
+				result.default = nil
+				return result.freeze
+			end
+		end
+	end
+end

data/lib/covered/git/version.rb

@@ -5,6 +5,6 @@
 
 module Covered
 	module Git
-		VERSION = "0.1.2"
+		VERSION = "0.2.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered-git
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-07-21 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - bake/covered/git.rb
 - lib/covered/git.rb
+- lib/covered/git/branch_changes.rb
 - lib/covered/git/version.rb
 - license.md
 - readme.md
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Provides coverage computation for git pull requests.