difftastic 0.1.1-x86_64-linux → 0.2.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1524170bbdf1c4ef2f2d153868b05d1092a2c8cccdd52c46a2fc4d73a7991263
-  data.tar.gz: a328ea695db524b684d048c5e9c4082436cbb0b220b4fdceea58324f399fd074
+  metadata.gz: ebac0bf6dd45fe7c5202c0c02c319587f5d2a0c711b9b845c1e909e6ce7c4537
+  data.tar.gz: b638761ceda03c5f892ed618524898fc533debc532e1a43691c7453c12461679
 SHA512:
-  metadata.gz: 9d786b9393b64805eeea014874285538ff03cdec94d241982a21eea4cf2251c60128dee675409cff4860dbd40a252f343a33500550f680aec4813f4aededfa5f
-  data.tar.gz: e665b1049f4912881fa8f9bb2d8c2ba67729286fa39f191bc5879bc1a3616e43ea6100f3d476d0340ce03e6035be7f35b803f630985b9f60c1c76e79af5bd950
+  metadata.gz: 5b7902cd02bb98b50a3d8da2209c9c4bca76962d215dbd92598a3037d8081c5411d61f02c3e289922a0b2cb3b835b93be2a157321ea99587abe658c7d240fb15
+  data.tar.gz: 37d92b3ed9fff7456f92cc663b837dfa3babe8465593df65289a261b75b877fd3a7eb97a5d85a251eb771e1789a983d3a5036ac9ad8f06101803d74eebadf300

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.2.0"
 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
@@ -70,57 +71,73 @@ module Difftastic
 		exe_file
 	end
 
-	def self.pretty(object, buffer: +"", indent: 0)
+	def self.pretty(object, indent: 0, indent_width: 2, max_width: 80, indentation_bytes: "\t")
 		case object
 		when Hash
-			buffer << "{\n"
+			buffer = +"{\n"
 			indent += 1
 			object.each do |key, value|
 				buffer << ("	" * indent)
-				pretty(key, buffer:, indent:)
+				buffer << pretty(key, indent:)
 				buffer << " => "
-				pretty(value, buffer:, indent:)
+				buffer << pretty(value, indent:)
 				buffer << ",\n"
 			end
 			indent -= 1
 			buffer << ("	" * indent)
 			buffer << "}"
 		when Array
-			buffer << "[\n"
-			indent += 1
-			object.each do |value|
-				buffer << ("	" * indent)
-				pretty(value, buffer:, indent:)
-				buffer << ",\n"
+			new_lines = false
+			length = 0
+			items = object.map do |item|
+				pretty_item = pretty(item, indent: indent + 1)
+				new_lines = true if pretty_item.include?("\n")
+				length += pretty_item.bytesize
+				pretty_item
+			end
+
+			if new_lines || length > max_width - (indent * indent_width)
+				"[\n#{indentation_bytes * (indent + 1)}#{items.join(",\n#{indentation_bytes * (indent + 1)}")},\n#{indentation_bytes * indent}]"
+			else
+				"[#{items.join(', ')}]"
 			end
-			indent -= 1
-			buffer << ("	" * indent)
-			buffer << "]"
 		when Set
-			buffer << "Set[\n"
-			indent += 1
-			object.to_a.sort!.each do |value|
-				buffer << ("	" * indent)
-				pretty(value, buffer:, indent:)
-				buffer << ",\n"
+			new_lines = false
+			length = 0
+			items = object.to_a.sort!.map do |item|
+				pretty_item = pretty(item, indent: indent + 1)
+				new_lines = true if pretty_item.include?("\n")
+				length += pretty_item.bytesize
+				pretty_item
 			end
-			indent -= 1
-			buffer << ("	" * indent)
-			buffer << "]"
+
+			if new_lines || length > max_width - (indent * indent_width)
+				"Set[\n#{indentation_bytes * (indent + 1)}#{items.join(",\n#{indentation_bytes * (indent + 1)}")},\n#{indentation_bytes * indent}]"
+			else
+				"Set[#{items.join(', ')}]"
+			end
+		when Module
+			object.name
 		when Symbol, String, Integer, Float, Regexp, Range, Rational, Complex, true, false, nil
-			buffer << object.inspect
+			object.inspect
 		else
-			buffer << "#{object.class.name}(\n"
-			indent += 1
-			object.instance_variables.each do |name|
+			buffer = +""
+			instance_variables = object.instance_variables
+			if instance_variables.length > 0
+				buffer << "#{object.class.name}(\n"
+				indent += 1
+				object.instance_variables.each do |name|
+					buffer << ("	" * indent)
+					buffer << ":#{name} => "
+					buffer << pretty(object.instance_variable_get(name), indent:)
+					buffer << ",\n"
+				end
+				indent -= 1
 				buffer << ("	" * indent)
-				buffer << ":#{name} => "
-				pretty(object.instance_variable_get(name), buffer:, indent:)
-				buffer << ",\n"
+				buffer << ")"
+			else
+				buffer << "#{object.class.name}()"
 			end
-			indent -= 1
-			buffer << ("	" * indent)
-			buffer << ")"
 		end
 	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: difftastic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: x86_64-linux
 authors:
 - Joel Drapper
 bindir: exe
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies: []
 email:
 - joel@drapper.me
@@ -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