yaml-janitor 20251114 → 20251115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfafb9059761011d0d8dfc568f4cc5b8b5820b3370389e5d5985a8b7ff6f0d93
-  data.tar.gz: ffa37dd472c6594455eae81f98559e154308844e3fd3d12fb6ba0ef530ef09b4
+  metadata.gz: 9836d954e6602561f6197a639b73183bc96409e93d477191590192d689c669ae
+  data.tar.gz: f1f96ba5f15ec13038060a9ebdf6775a939e46d8b5fddaa190c8664e50925cc8
 SHA512:
-  metadata.gz: b2906bd8a997aa239635c800fae76d3e255b20d452bcc11350918c1890194280194653a9caf25212f66505c68859162ffc9bfc3940f540b381f81e16a289dc03
-  data.tar.gz: fe01011a9494bccf085dfdc44f7b0b10c62d2dcfd545287d5382c9aceca7e6af535f6097fea6831cef1d097ba394da6d783acd64aaf5ce9a733c47696a291a11
+  metadata.gz: 1a02c1e0afd72eb574dff29f779bd9de9a58a4455fee1be3ceb9e598e958608c3302da92784a1730f08927ef0f1a221f52a72b556d2d8d7e4de970252f9bfbe7
+  data.tar.gz: bded6694abd1eb893bcde70ac3144315ececc62a92eb20f7730ec85075b2bb14dd3ad696a32dd431644cb7f0b2fb559dad9e53a21094629352013bc296f029ea

data/README.md

@@ -45,6 +45,11 @@ Format with custom indentation:
 yaml-janitor --fix --indentation 4 config.yml
 ```
 
+Show diff of formatting changes:
+```bash
+yaml-janitor --diff config.yml
+```
+
 ### Ruby API
 
 ```ruby

data/bin/yaml-janitor

@@ -11,6 +11,7 @@ def print_usage
 
     Options:
       --fix               Format files in-place (without this, just check)
+      --diff              Show diff of formatting changes
       --config PATH       Path to config file (default: .yaml-janitor.yml)
       --indentation N     Number of spaces for indentation (default: 2)
       --line-width N      Maximum line width (default: 80)
@@ -24,12 +25,16 @@ def print_usage
       # Format files in-place
       yaml-janitor --fix config.yml
       yaml-janitor --fix --indentation 4 containers/
+
+      # Show diff of formatting changes
+      yaml-janitor --diff config.yml
   USAGE
   exit 0
 end
 
 # Parse args
 fix = false
+diff = false
 config_path = nil
 config_overrides = {}
 paths = []
@@ -39,6 +44,8 @@ while i < ARGV.length
   case ARGV[i]
   when "--fix"
     fix = true
+  when "--diff"
+    diff = true
   when "--config"
     i += 1
     config_path = ARGV[i]
@@ -90,10 +97,14 @@ paths.each do |path|
         if fix
           formatted_files << file
           puts "✓ #{file} (formatted)"
+        elsif diff
+          puts "✗ #{file}: needs formatting"
+          puts linter.generate_diff(result[:original], result[:formatted], file)
+          puts ""
         else
           puts "✗ #{file}: needs formatting"
         end
-      elsif !fix
+      elsif !fix && !diff
         puts "✓ #{file}"
       end
     end
@@ -110,10 +121,14 @@ paths.each do |path|
       if fix
         formatted_files << path
         puts "✓ #{path} (formatted)"
+      elsif diff
+        puts "✗ #{path}: needs formatting"
+        puts linter.generate_diff(result[:original], result[:formatted], path)
+        puts ""
       else
         puts "✗ #{path}: needs formatting"
       end
-    elsif !fix
+    elsif !fix && !diff
       puts "✓ #{path}"
     end
   else

data/lib/yaml_janitor/linter.rb

@@ -52,7 +52,9 @@ module YamlJanitor
       {
         violations: violations,
         fixed: fixed,
-        output: output
+        output: output,
+        original: yaml_content,
+        formatted: formatted
       }
     rescue => e
       {
@@ -67,6 +69,45 @@ module YamlJanitor
       }
     end
 
+    # Generate unified diff between original and formatted content
+    def generate_diff(original, formatted, path)
+      require 'tempfile'
+
+      # Write to temp files and use system diff
+      Tempfile.create(['original', '.yml']) do |orig_file|
+        Tempfile.create(['formatted', '.yml']) do |fmt_file|
+          orig_file.write(original)
+          orig_file.flush
+          fmt_file.write(formatted)
+          fmt_file.flush
+
+          # Use git diff if available (better formatting), fall back to diff
+          diff_cmd = if system('which git > /dev/null 2>&1')
+            "git diff --no-index --color=always #{orig_file.path} #{fmt_file.path}"
+          else
+            "diff -u #{orig_file.path} #{fmt_file.path}"
+          end
+
+          diff_output = `#{diff_cmd}`
+
+          # Replace temp file paths with actual path
+          # Git adds a/ and b/ prefixes (or just a/b for temp files)
+          orig_path_pattern = Regexp.escape(orig_file.path)
+          fmt_path_pattern = Regexp.escape(fmt_file.path)
+
+          # Handle various git diff formats
+          diff_output.gsub(/a\/#{orig_path_pattern}/, path)
+                    .gsub(/b\/#{fmt_path_pattern}/, "#{path} (formatted)")
+                    .gsub(/a#{orig_path_pattern}/, path)
+                    .gsub(/b#{fmt_path_pattern}/, "#{path} (formatted)")
+                    .gsub(/#{orig_path_pattern}/, path)
+                    .gsub(/#{fmt_path_pattern}/, "#{path} (formatted)")
+        end
+      end
+    rescue => e
+      "Error generating diff: #{e.message}"
+    end
+
     private
 
     def verify_semantics!(original, fixed)

data/lib/yaml_janitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YamlJanitor
-  VERSION = "20251114"
+  VERSION = "20251115"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-janitor
 version: !ruby/object:Gem::Version
-  version: '20251114'
+  version: '20251115'
 platform: ruby
 authors:
 - ducks
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-14 00:00:00.000000000 Z
+date: 2025-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych-pure