difftastic 0.1.0-x86_64-linux → 0.1.2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2c3e55cac019f1c83594773c618419e0e8969c99b74acbd9e22152d61dcc1d2
-  data.tar.gz: f880a81b33d2a7b6d820b0db39170d5b45f14744bfcb6456687998d4c9e5be30
+  metadata.gz: 72a6648c587eac4f0eaeb20367fd4f6927341b8cc568863d7a1209421485109d
+  data.tar.gz: f59efc4281698cd1d3d62c0e70e09302278b6cbc193ddc2f325691a7b72a56fc
 SHA512:
-  metadata.gz: e75bd7b43d51166ca6f5ae13dd56c51f61ffb7e12c4b39f9ee30cb62fa59f1b8cf2e992e9441efb0e0a7b9d814d69fe88b32d1510b81e72211fc765d3944b46b
-  data.tar.gz: 91f39e4083bbc5357dcd4b48180d41294d6fdac2d57c20cf6f789f54fa2cfb55792a4423e5672bf60c765e1d6ddf3850dbe9d96a430b1706b1bcdaee0eb78fbf
+  metadata.gz: e225dcf362c7cafd3d7793246e8644fb01189a6e507dd0701909cd4cf2e15b183580106d2621f777186efb2c9a345b60ba52c1d3d163f2d2c4f167db72dea44d
+  data.tar.gz: b57e5438f8c421c793634c1ae541f5d8eb6b79cdedc08ac38045cef6a4c7758b34e4e025e53fd2d5a31f667fabb0195ecfa4d3097237d4fe360d619583a49f25

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: x86_64-linux
 authors:
 - Joel Drapper
@@ -22,6 +22,7 @@ files:
 - exe/difft
 - exe/x86_64-linux/difft
 - lib/difftastic.rb
+- lib/difftastic/ansi.rb
 - lib/difftastic/differ.rb
 - lib/difftastic/upstream.rb
 - lib/difftastic/version.rb