difftastic 0.1.1-x86_64-darwin → 0.1.2-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dd0d586c354e4466e67c79752c7ffb2ea3597d6a4c2fc027450b36482680810
-  data.tar.gz: 4c4c37d98742e5cc436915f89582d8bd7f26f8b6eef86638c1a0b75f78803506
+  metadata.gz: 9a2b6b2f81cd13b44a4c81f0ffdd9cacd44ba01b26726136ee0a034008afd4dd
+  data.tar.gz: 9ef30b217238d9fefd20ed439154286035a2a16899fd87896ef2ef8080dd0eec
 SHA512:
-  metadata.gz: 1c0f9c817005d9bc363caee3347258dd2d216bf0d7d2b4968388f5060fbb1a2906ea3ebeb35cd13b26aebc42ccfbd712f1dd8777fa6a25878920d1c084dce2c6
-  data.tar.gz: 74abe777ec89bc0dea9cf2364e8f86eae7ccbb635565c26268f14d1f79c040902a6ded4c78fd6a7cc277472a22646c6dfab8d7f2d3612777aa1a6d8f3163e6ba
+  metadata.gz: 3910991e16a96f3a6d48b572491266fd0cbadce94b1d414c45432a1ef828ecfdb491874b35a3e05ba53c4972f23badaed62a903fb2d4ee7f3c59f076d1d6e860
+  data.tar.gz: dd462c0d3375aef7f19aecf394fd254f8e86c78882a46443b95be1d6d8b1dd4468af81aa6a1cd16c8bbc8e5468af6777452fc046d9af0d2ab625e92edd869c17

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,6 +299,30 @@ class Difftastic::Differ
 			result = result.byteslice(new_line_index, result.bytesize - new_line_index)
 		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/) {
@@ -311,4 +337,16 @@ class Difftastic::Differ
 
 		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.1"
+	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.1
+  version: 0.1.2
 platform: x86_64-darwin
 authors:
 - Joel Drapper
@@ -22,6 +22,7 @@ files:
 - exe/difft
 - exe/x86_64-darwin/difft
 - lib/difftastic.rb
+- lib/difftastic/ansi.rb
 - lib/difftastic/differ.rb
 - lib/difftastic/upstream.rb
 - lib/difftastic/version.rb