difftastic 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 207e850cc699486c73de8d32b74bd42cb3d13f2a67027038bef770483d24b0e7
-  data.tar.gz: 43ade182f9cedb9203a02afaab34f814ea4f38f6c38f3bbadefca756a23674d6
+  metadata.gz: 1d510021f0c6b7a634115cf8f9db68f37797f400842dfd3d334040054389af68
+  data.tar.gz: 82c8ce6d2a427ff5807a149e36527d55930bc2c41e0ec0d354891bf46d4bd90c
 SHA512:
-  metadata.gz: 786f0f2ad6ca34147d93a21d12df4bcf084f8468b82052ea047206cbe3be69c6814f3c7911aabba1d8b17b27fc2b9b5e8f3e6a9a3f0c60d359c60eb0e4f2b624
-  data.tar.gz: bae8870b2892c9398eca3a196446c208fe581f65c0ef58e1f271f41bb1a46aa87279ad96b2ead45d4b97093ae8865d878fa766a2830f2bdc6b5a51bebec37446
+  metadata.gz: 00cf6e8df80aa974071569a292464cfa1455ea2ecff55bb5e60ff36acb2773edcd3552ad4abe10980c7215f5ed10c28e7a6a45941f9e8986d2ea33d470f9f99d
+  data.tar.gz: a8791c8b54d1396e67c52343e7c0efebd66f393cc48311e9b2d6a876db829d6ca14dd687023e045cf91ef4440ec853eff30691bfc287ce8d8500b5df1d011a12

data/lib/difftastic/differ.rb

@@ -300,7 +300,7 @@ class Difftastic::Differ
 			("--width=#{@width}" if @width),
 		].compact!
 
-		result = Difftastic.execute(options.join(" "))
+		result = Difftastic.execute(options.join(" ")).lstrip.sub(/\n{2}\z/, "")
 
 		unless @show_paths
 			new_line_index = result.index("\n") + 1
@@ -328,7 +328,7 @@ class Difftastic::Differ
 			end
 
 			# Insert formatted labels at the top
-			result = "\n#{left_part}#{right_part}#{Difftastic::ANSI.reset}\n#{result}"
+			result = "#{left_part}#{right_part}#{Difftastic::ANSI.reset}\n#{result}"
 		end
 
 		# Removed due to inconsistencies in the original output. Need to improve the pattern matching.

data/lib/difftastic/version.rb

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

data/lib/difftastic.rb

@@ -2,6 +2,7 @@
 
 require "difftastic/version"
 require "tempfile"
+require "pretty_please"
 
 module Difftastic
 	autoload :ANSI, "difftastic/ansi"
@@ -65,111 +66,14 @@ module Difftastic
 				See `bundle lock --help` output for details.
 
 				If you're still seeing this message after taking those steps, try running
-				`bundle config` and ensure `force_ruby_platform` isn't set to `true`. See
-				https://github.com/fractaledmind/difftastic-ruby#check-bundle_force_ruby_platform
-				for more details.
+				`bundle config` and ensure `force_ruby_platform` isn't set to `true`.
 			MESSAGE
 		end
 
 		exe_file
 	end
 
-	def self.pretty(object, indent: 0, tab_width: 2, max_width: 60, max_depth: 5, max_instance_variables: 10, original_object: nil)
-		return "self" if object && object == original_object
-
-		original_object ||= object
-
-		case object
-		when Hash
-			return "{}" if object.empty?
-
-			buffer = +"{\n"
-			indent += 1
-			object.each do |key, value|
-				buffer << ("\t" * indent)
-				case key
-				when Symbol
-					buffer << "#{key.name}: "
-				else
-					buffer << pretty(key, indent:, original_object:)
-					buffer << " => "
-				end
-				buffer << pretty(value, indent:, original_object:)
-				buffer << ",\n"
-			end
-			indent -= 1
-			buffer << ("\t" * indent)
-			buffer << "}"
-		when Array
-			new_lines = false
-			length = 0
-			items = object.map do |item|
-				pretty_item = pretty(item, indent: indent + 1, original_object:)
-				new_lines = true if pretty_item.include?("\n")
-				length += pretty_item.bytesize
-				pretty_item
-			end
-
-			if new_lines || length > max_width - (indent * tab_width)
-				"[\n#{"\t" * (indent + 1)}#{items.join(",\n#{"\t" * (indent + 1)}")},\n#{"\t" * indent}]"
-			else
-				"[#{items.join(', ')}]"
-			end
-		when Set
-			new_lines = false
-			length = 0
-			items = object.to_a.sort!.map do |item|
-				pretty_item = pretty(item, indent: indent + 1, original_object:)
-				new_lines = true if pretty_item.include?("\n")
-				length += pretty_item.bytesize
-				pretty_item
-			end
-
-			if new_lines || length > max_width - (indent * tab_width)
-				"Set[\n#{"\t" * (indent + 1)}#{items.join(",\n#{"\t" * (indent + 1)}")},\n#{"\t" * indent}]"
-			else
-				"Set[#{items.join(', ')}]"
-			end
-		when Module
-			object.name
-		when Pathname
-			%(Pathname("#{object.to_path}"))
-		when Symbol, String, Integer, Float, Regexp, Range, Rational, Complex, true, false, nil
-			object.inspect
-		else
-			buffer = +""
-			instance_variables = object.instance_variables
-			if instance_variables.length > 0 && indent < max_depth
-				buffer << "#{object.class.name}(\n"
-				indent += 1
-
-				if indent < max_depth
-					object.instance_variables.take(max_instance_variables).each do |name|
-						buffer << ("\t" * indent)
-						buffer << name.name
-						buffer << " = "
-
-						buffer << pretty(object.instance_variable_get(name), indent:, original_object:)
-						buffer << ",\n"
-					end
-
-					if object.instance_variables.count > max_instance_variables
-						buffer << ("\t" * indent)
-						buffer << "...\n"
-					end
-				else
-					buffer << ("\t" * indent)
-					buffer << "...\n"
-				end
-
-				indent -= 1
-				buffer << ("\t" * indent)
-				buffer << ")"
-			elsif indent >= max_depth
-				buffer << "#{object.class.name}(...)"
-			else
-				buffer << "#{object.class.name}()"
-			end
-		end
+	def self.pretty(object, indent: 0, tab_width: 2, max_width: 60, max_depth: 5, max_items: 10)
+		PrettyPlease.inspect(object, indent:, tab_width:, max_width:, max_depth:, max_items:)
 	end
 end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: difftastic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Joel Drapper
 bindir: exe
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
-dependencies: []
+date: 2025-02-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pretty_please
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - joel@drapper.me
 executables: