difftastic 0.1.0-arm64-linux → 0.1.2-arm64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28414283502aad90df3b67522bf992b25c68faa46c1e69ec7bf08a5fcb7a074
-  data.tar.gz: b3ccabb47da3f3b23f3c6061cd6301e1000019967443411e90d16c7046226138
+  metadata.gz: 3f8cbb936322c76af988d7bf714f2d8f31c51bad304ca669365e5aff37b8982c
+  data.tar.gz: 886a81849018435199ec93c5b35d7e703cdd47bac8836eab74736441b74ad858
 SHA512:
-  metadata.gz: 51d329e3f0b104a114837195c6e8044d0907d7c5b36392082f58765c7c7dce7e058bbbc20a6b9c2e541fb31c33e761dc05c734aa5714116a17d6d0f1c137df1d
-  data.tar.gz: eae6a10b19b2e073de48b7b26bd87b8cac8174bbd2960e45bc8a4be200ee3332aa5cd49e8897208b01982face70b3b1ab6be653b9a510c96e84c34ea8221a09b
+  metadata.gz: dac982dbb4b2fc13ad6c6e2c857735c9e9983c5eb187a16466bc855ff248b176b64afd1ff9b2187adec15f0005521193122afce7f47ea7a1970f37752bd676bf
+  data.tar.gz: ecb237465ed4aa8581c39ed41c264f9afbfa284417ebbafd4b58735481dbe2191f5b061c44f76b74f8b0fe545f15dc43fc0414e47e1e92217e70338c50b563bb

data/lib/difftastic/ansi.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Difftastic::ANSI
+	RED = "\e[91;1m"
+	GREEN = "\e[92;1m"
+	RESET = "\e[0m"
+
+	def self.green(string = "")
+		"#{GREEN}#{string}"
+	end
+
+	def self.red(string = "")
+		"#{RED}#{string}"
+	end
+
+	def self.reset(string = "")
+		"#{RESET}#{string}"
+	end
+
+	def self.strip_formatting(string)
+		string.to_s.gsub(/\e\[[0-9;]*m/, "")
+	end
+end

data/lib/difftastic/differ.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Difftastic::Differ
-	def initialize(background: nil, color: nil, syntax_highlight: nil, context: nil, tab_width: nil, parse_error_limit: nil, underline_highlights: true)
+	def initialize(background: nil, color: nil, syntax_highlight: nil, context: nil, tab_width: nil, parse_error_limit: nil, underline_highlights: true, left_label: nil, right_label: nil)
 		@show_paths = false
 		@background = background => :dark | :light | nil
 		@color = color => :always | :never | :auto | nil
@@ -10,6 +10,8 @@ class Difftastic::Differ
 		@tab_width = tab_width => Integer | nil
 		@parse_error_limit = parse_error_limit => Integer | nil
 		@underline_highlights = underline_highlights => true | false
+		@left_label = left_label => String | nil
+		@right_label = right_label => String | nil
 	end
 
 	def diff_objects(old, new)
@@ -297,17 +299,54 @@ class Difftastic::Differ
 			result = result.byteslice(new_line_index, result.bytesize - new_line_index)
 		end
 
-		if @underline_highlights
-			result.gsub!(/\e\[([0-9;]*)m/) {
-				codes = $1
-				if codes =~ /9[12]/ # Matches 91 or 92
-					"\e[#{codes};4m"
-				else
-					"\e[#{codes}m"
-				end
-			}
+		if @left_label || @right_label
+			# Get the first content line to calculate offset
+			offset_line = @show_paths ? 1 : 0
+			first_line = result.split("\n")[offset_line]
+
+			# Calculate padding needed between labels
+			offset = right_label_offset(first_line)
+
+			left_part = if @left_label
+				Difftastic::ANSI.red(@left_label.to_s.ljust(offset))
+			else
+				" " * offset
+			end
+
+			right_part = if @right_label
+				Difftastic::ANSI.green(@right_label.to_s)
+			else
+				""
+			end
+
+			# Insert formatted labels at the top
+			result = "\n#{left_part}#{right_part}#{Difftastic::ANSI.reset}\n#{result}"
 		end
 
+		# Removed due to inconsistencies in the original output. Need to improve the pattern matching.
+		# if @underline_highlights
+		# 	result.gsub!(/\e\[([0-9;]*)m/) {
+		# 		codes = $1
+		# 		if codes =~ /9[12];1|1;9[12]/ # Matches 91;1, 92;1, 1;91, or 1;92
+		# 			"\e[#{codes};4m"
+		# 		else
+		# 			"\e[#{codes}m"
+		# 		end
+		# 	}
+		# end
+
 		result
 	end
+
+	private
+
+	def right_label_offset(line)
+		stripped_line = ::Difftastic::ANSI.strip_formatting(line)
+		_lhs, rhs = stripped_line.split(/\s{#{@tab_width},}/, 2)
+
+		offset = (stripped_line.index("#{' ' * @tab_width}#{rhs}") || 0) + @tab_width
+		minimum_offset = 29
+
+		[minimum_offset, offset].max
+	end
 end

data/lib/difftastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Difftastic
-	VERSION = "0.1.0"
+	VERSION = "0.1.2"
 end

data/lib/difftastic.rb

@@ -4,6 +4,7 @@ require "difftastic/version"
 require "tempfile"
 
 module Difftastic
+	autoload :ANSI, "difftastic/ansi"
 	autoload :Differ, "difftastic/differ"
 	autoload :Upstream, "difftastic/upstream"
 
@@ -39,7 +40,7 @@ module Difftastic
 				MESSAGE
 			end
 
-			exe_file = Dir.glob(File.expand_path(File.join(exe_path, "*", "difft"))).find do |f|
+			exe_file = Dir.glob(File.expand_path(File.join(exe_path, "**", "difft"))).find do |f|
 				Gem::Platform.match_gem?(Gem::Platform.new(File.basename(File.dirname(f))), GEM_NAME)
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: difftastic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: arm64-linux
 authors:
 - Joel Drapper
@@ -22,6 +22,7 @@ files:
 - exe/arm64-linux/difft
 - exe/difft
 - lib/difftastic.rb
+- lib/difftastic/ansi.rb
 - lib/difftastic/differ.rb
 - lib/difftastic/upstream.rb
 - lib/difftastic/version.rb