Top Level Namespace

Defined Under Namespace

Classes: String

Constant Summary collapse

MYVERSION =

di - a wrapper around GNU diff(1)

Copyright © 2008-2021 Akinori MUSHA

All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

"0.4.4"
MYNAME = 
File.basename($0)
MYCOPYRIGHT = 
"Copyright (c) 2008-2021 Akinori MUSHA"
DIFF_CMD = 
ENV.fetch('DIFF', 'diff')
ENV_NAME = 
"#{MYNAME.tr('-a-z', '_A-Z')}_OPTIONS"
RSYNC_EXCLUDE_FILE_GLOBS = 
[
  'tags', 'TAGS', 'GTAGS', 'GRTAGS', 'GSYMS', 'GPATH',
  '.make.state', '.nse_depinfo',
  '*~', '\#*', '.\#*', ',*', '_$*', '*$',
  '*.old', '*.bak', '*.BAK',
  '*.orig', '*.rej', '*.del-*',
  '*.a', '*.olb', '*.o', '*.obj',
  /\A[^.].*[^.]\.so(?:\.[0-9]+)*\z/,
  '*.bundle', '*.dylib',
  '*.exe', '*.Z', '*.elc', '*.py[co]', '*.ln',
  /\Acore(?:\.[0-9]+)*\z/,
]
RSYNC_EXCLUDE_DIR_GLOBS = 
[
  'RCS', 'SCCS', 'CVS', 'CVS.adm',
  '.svn', '.git', '.bzr', '.hg',
]
FIGNORE_GLOBS = 
ENV.fetch('FIGNORE', '').split(':').map { |pat|
  '*' + pat
}
PLUS_SIGN = 
'+'
MINUS_SIGN = 
'-'
EQUAL_SIGN = 
'='

Instance Method Summary collapse

Instance Method Details

#call_diff(*args) ⇒ Object 



648
649
650
651
652
653
654
 
# File 'lib/di.rb', line 648

def call_diff(*args)
  invoke_colorizer
  xsystem *[DIFF_CMD, $diff.flags, args].flatten
  status = $? >> 8
  $status = status if $status < status
  return status
end

#colorize_context_diff ⇒ Object 



959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
 
# File 'lib/di.rb', line 959

def colorize_context_diff
  colors = $diff.colors
  colors.to_function ||= colors.off + colors.function

  state = :comment
  hunk_part = nil
  $stdin.each_line { |line|
    line.chomp!
    replace_invalid_bytes!(line)
    case state
    when :comment
      case line
      when /^\*{3} /
        color = colors.file1
      when /^-{3} /
        color = colors.file2
      when /^\*{15}/
        state = :hunk
        hunk_part = 0
        line.sub!(/^(\*{15} )/) {
          $1 + colors.to_function
        }
        color = colors.header
      end
    when :hunk
      case hunk_part
      when 0
        case line
        when /^\*{3} /
          hunk_part = 1
          color = colors.header
        else
          # error
          color = colors.comment
        end
      when 1, 2
        check = false
        case line
        when /^\-{3} /
          if hunk_part == 1
            hunk_part = 2
            color = colors.header
          else
            #error
            color = colors.comment
          end
        when /^\*{3} /, /^\*{15} /
          state = :comment
          redo
        when /^\+ /
          color = colors.new
          check = $diff.highlight_whitespace
        when /^- /
          color = colors.old
          check = $diff.highlight_whitespace
        when /^! /
          color = colors.changed
          check = $diff.highlight_whitespace
        when /^  /
          color = colors.unchanged
        else
          # error
          color = colors.comment
        end
        if check
          highlight_whitespace_in_context_diff!(line, color)
        end
      end
    end

    print color, line, colors.off, "\n"
  }
end

#colorize_hunk_in_unified_diff_inline(hunk) ⇒ Object 



837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
 
# File 'lib/di.rb', line 837

def colorize_hunk_in_unified_diff_inline(hunk)
  colors = $diff.colors

  skip_next = false

  Enumerator.new { |y|
    y << nil
    hunk.each { |line|
      y << line
    }
    y << nil << nil
  }.each_cons(4) { |line0, line1, line2, line3|
    case
    when skip_next
      skip_next = false
      next
    when line1.nil?
      break
    when /^[-+]/ !~ line0 && /^-/ =~ line1 &&  /^\+/ =~ line2 &&  /^[-+]/ !~ line3
      colorize_inline_diff(line1, line2)
      skip_next = true
      next
    when /^\+/ =~ line1
      color = colors.new
      ws = $diff.highlight_whitespace
    when /^-/ =~ line1
      color = colors.old
      ws = $diff.highlight_whitespace
    when /^ / =~ line1
      color = colors.unchanged
      ws = false
    end
    if ws
      line1 = line1.dup
      highlight_whitespace_in_unified_diff!(line1, color)
    end
    print color, line1, colors.off, "\n"
  }
end

#colorize_hunk_in_unified_diff_normal(hunk) ⇒ Object 



815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
 
# File 'lib/di.rb', line 815

def colorize_hunk_in_unified_diff_normal(hunk)
  colors = $diff.colors

  hunk.each { |line|
    case line
    when /^\+/
      color = colors.new
      ws = $diff.highlight_whitespace
    when /^-/
      color = colors.old
      ws = $diff.highlight_whitespace
    when /^ /
      color = colors.unchanged
      ws = false
    end
    if ws
      highlight_whitespace_in_unified_diff!(line, color)
    end
    print color, line, colors.off, "\n"
  }
end

#colorize_inline_diff(line1, line2) ⇒ Object 



877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
 
# File 'lib/di.rb', line 877

def colorize_inline_diff(line1, line2)
  words1, words2 = [line1, line2].map { |line|
    line[1..-1].split($diff.word_regex)
  }
  xwords1, xwords2 = [words1, words2].map { |words|
    words.each_with_index.map { |word, i| i.even? ? nil : word }
  }
  swords1, swords2, signs1, signs2 = [], [], [], []

  Diff::LCS.sdiff(xwords1, xwords2).each { |tuple|
    sign, (pos1, word1), (pos2, word2) = *tuple
    case sign
    when PLUS_SIGN
      if signs2.last == sign
        swords2.last << word2 if word2
      else
        swords2 << (word2 || '')
        signs2 << sign
      end
    when MINUS_SIGN
      if signs1.last == sign
        swords1.last << word1 if word1
      else
        swords1 << (word1 || '')
        signs1 << sign
      end
    else
      if signs1.last == sign
        swords1.last << words1[pos1]
      else
        swords1 << words1[pos1]
        signs1 << sign
      end
      if signs2.last == sign
        swords2.last << words2[pos2]
      else
        swords2 << words2[pos2]
        signs2 << sign
      end
    end
  }

  colors = $diff.colors

  aline1 = ''.tap { |line|
    signs1.zip(swords1) { |sign, word|
      case sign
      when EQUAL_SIGN
        line << colors.off << colors.old << word
      else
        line << colors.off << colors.old_word << word
      end
    }
  }
  aline2 = ''.tap { |line|
    signs2.zip(swords2) { |sign, word|
      case sign
      when EQUAL_SIGN
        line << colors.off << colors.new << word
      else
        line << colors.off << colors.new_word << word
      end
    }
  }

  print colors.old, '-', aline1, colors.off, "\n",
        colors.new, '+', aline2, colors.off, "\n"
end

#colorize_unified_diff ⇒ Object 



760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
 
# File 'lib/di.rb', line 760

def colorize_unified_diff
  begin
    require 'diff/lcs'
    colorize_unified_diff_hunk = method(:colorize_hunk_in_unified_diff_inline)
  rescue LoadError
    colorize_unified_diff_hunk = method(:colorize_hunk_in_unified_diff_normal)
  end

  colors = $diff.colors
  colors.to_function ||= colors.off + colors.function

  state = :comment
  hunk_left = nil
  hunk = []
  $stdin.each_line { |line|
    line.chomp!
    replace_invalid_bytes!(line)
    case state
    when :comment
      case line
      when /^\+{3} /
        color = colors.file1
      when /^-{3} /
        color = colors.file2
      when /^@@ -[0-9]+(,([0-9]+))? \+[0-9]+(,([0-9]+))?/
        state = :hunk
        hunk_left = ($1 ? $2.to_i : 1) + ($3 ? $4.to_i : 1)
        line.sub!(/^(@@ .*? @@ )/) {
          $1 + colors.to_function
        }
        color = colors.header
      else
        color = colors.comment
      end
    when :hunk
      hunk << line
      case line
      when /^[-+]/
        hunk_left -= 1
      when /^ /
        hunk_left -= 2
      end
      if hunk_left <= 0
        colorize_unified_diff_hunk.call(hunk)
        hunk_left = nil
        hunk.clear
        state = :comment
      end
      next
    end

    print color, line, colors.off, "\n"
  }
end

#diff_dirs(dir1, dir2, toplevel_p = false) ⇒ Object 



656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
 
# File 'lib/di.rb', line 656

def diff_dirs(dir1, dir2, toplevel_p = false)
  entries1 = diff_entries(dir1, toplevel_p)
  entries2 = diff_entries(dir2, toplevel_p)

  common = entries1 & entries2
  missing1 = entries2 - entries1
  missing2 = entries1 - entries2

  unless common.empty?
    files = []
    common.each { |file|
      file1 = File.join(dir1, file)
      file2 = File.join(dir2, file)
      file1_is_dir = File.directory?(file1)
      file2_is_dir = File.directory?(file2)
      if file1_is_dir && file2_is_dir
        diff_dirs(file1, file2) if $diff.recursive
      elsif !file1_is_dir && !file2_is_dir
        files << file1
      else
        missing1 << file
        missing2 << file
      end
    }
    diff_files(files, dir2)
  end

  if $diff.reversed
    [[dir1, missing2, true], [dir2, missing1, false]]
  else
    [[dir2, missing1, true], [dir1, missing2, false]]
  end.each { |dir, missing, direction|
    new_files = []
    case $diff.new_file
    when :bidirectional
      new_file = true
    when :unidirectional
      new_file = direction
    end
    missing.each { |entry|
      file = File.join(dir, entry)
      if new_file
        if File.directory?(file)
          if dir.equal?(dir1)
            diff_dirs(file, nil)
          else
            diff_dirs(nil, file)
          end
        else
          new_files << file
        end
      else
        printf "Only in %s: %s (%s)\n",
          dir, entry, File.directory?(file) ? 'directory' : 'file'
        $status = 1 if $status < 1
      end
    }
    if dir.equal?(dir1)
      diff_files(new_files, IO::NULL)
    else
      diff_files(IO::NULL, new_files)
    end
  }
end

#diff_entries(dir, toplevel_p) ⇒ Object 



721
722
723
724
725
726
727
728
729
730
731
732
 
# File 'lib/di.rb', line 721

def diff_entries(dir, toplevel_p)
  return [] if dir.nil?
  Dir.entries(dir).tap { |entries|
    entries.reject! { |file| diff_exclude?(dir, file) }
    if toplevel_p && (starting_file = $diff.starting_file)
      entries.reject! { |file| file < starting_file }
    end
  }
rescue => e
  warn "#{dir}: #{e}"
  return []
end

#diff_exclude?(dir, basename) ⇒ Boolean

Returns:

  • (Boolean) 


734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
 
# File 'lib/di.rb', line 734

def diff_exclude?(dir, basename)
  return true if basename == '.' || basename == '..'
  return false if $diff.include.any? { |pat|
    File.fnmatch(pat, basename, File::FNM_DOTMATCH)
  }
  return true if $diff.exclude.any? { |pat|
    File.fnmatch(pat, basename, File::FNM_DOTMATCH)
  }
  return true if $diff.fignore_exclude && FIGNORE_GLOBS.any? { |pat|
    File.fnmatch(pat, basename, File::FNM_DOTMATCH)
  }
  return true if $diff.rsync_exclude &&
    if File.directory?(File.join(dir, basename))
      RSYNC_EXCLUDE_DIR_GLOBS
    else
      RSYNC_EXCLUDE_FILE_GLOBS
    end.any? { |pat|
      if Regexp === pat
        pat.match(basename)
      else
        File.fnmatch(pat, basename, File::FNM_DOTMATCH)
      end
    }
  return false
end

#diff_files(file1, file2) ⇒ Object 



632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
 
# File 'lib/di.rb', line 632

def diff_files(file1, file2)
  file1, file2 = file2, file1 if $diff.reversed
  if file1.is_a?(Array)
    file2.is_a?(Array) and raise "cannot compare two sets of multiple files"
    file1.empty? and return 0

    call_diff('--to-file', file2, '--', file1)
  elsif file2.is_a?(Array)
    file1.empty? and return 0

    call_diff('--from-file', file1, '--', file2)
  else
    call_diff('--', file1, file2)
  end
end

#diff_main ⇒ Object 



592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
 
# File 'lib/di.rb', line 592

def diff_main
  invoke_pager

  $status = 0

  $diff.from_files.each { |from_file|
    if File.directory?(from_file)
      $diff.to_files.each { |to_file|
        if File.directory?(to_file)
          if $diff.relative
            to_file = File.expand_path(from_file, to_file)
          end

          diff_dirs(from_file, to_file, true)
        else
          if $diff.relative
            from_file = File.expand_path(to_file, from_file)
          else
            from_file = File.expand_path(File.basename(to_file), from_file)
          end

          diff_files(from_file, to_file)
        end
      }
    else
      $diff.to_files.each { |to_file|
        if File.directory?(to_file)
          if $diff.relative
            to_file = File.expand_path(from_file, to_file)
          else
            to_file = File.expand_path(File.basename(from_file), to_file)
          end
        end

        diff_files(from_file, to_file)
      }
    end
  }
end

#highlight_whitespace_in_context_diff!(line, color) ⇒ Object 



1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
 
# File 'lib/di.rb', line 1033

def highlight_whitespace_in_context_diff!(line, color)
  colors = $diff.colors
  colors.to_whitespace ||= colors.off + colors.whitespace

  line.gsub!(/^(..)|([ \t]+)$|( +)(?=\t)/) {
    if $1
      $1
    elsif $2
      colors.to_whitespace + $2
    else
      colors.to_whitespace + $3 << colors.off << color
    end
  }
end

#highlight_whitespace_in_unified_diff!(line, color) ⇒ Object 



946
947
948
949
950
951
952
953
954
955
956
957
 
# File 'lib/di.rb', line 946

def highlight_whitespace_in_unified_diff!(line, color)
  colors = $diff.colors
  colors.to_whitespace ||= colors.off + colors.whitespace

  line.gsub!(/([ \t]+)$|( +)(?=\t)/) {
    if $1
      colors.to_whitespace + $1
    else
      colors.to_whitespace + $2 << colors.off << color
    end
  }
end

#invoke_colorizer ⇒ Object 



524
525
526
 
# File 'lib/di.rb', line 524

def invoke_colorizer
  invoke_colorizer! if $diff.colorize
end

#invoke_colorizer! ⇒ Object 



528
529
530
531
532
533
534
535
536
537
 
# File 'lib/di.rb', line 528

def invoke_colorizer!
  invoke_filter {
    case $diff.format
    when :unified
      colorize_unified_diff
    when :context
      colorize_context_diff
    end
  }
end

#invoke_filter ⇒ Object 



485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
 
# File 'lib/di.rb', line 485

def invoke_filter
  $stdout.flush
  $stderr.flush
  pr, pw = IO.pipe
  ppid = Process.pid
  pid = fork {
    $stdin.reopen(pr)
    pr.close
    pw.close
    IO.select([$stdin], nil, [$stdin])
    yield
  }

  $stdout.reopen(pw)
  $stderr.reopen(pw) if $stderr.tty?
  pw.close
  at_exit {
    $stdout.flush
    $stderr.flush
    $stdout.reopen(IO::NULL)
    $stderr.reopen(IO::NULL)
    Process.waitpid(pid)
  }
end

#invoke_pager ⇒ Object 



510
511
512
 
# File 'lib/di.rb', line 510

def invoke_pager
  invoke_pager! if $diff.use_pager
end

#invoke_pager! ⇒ Object 



514
515
516
517
518
519
520
521
522
 
# File 'lib/di.rb', line 514

def invoke_pager!
  invoke_filter {
    begin
      exec(ENV['PAGER'] || 'more')
    rescue
      $stderr.puts "Pager failed."
    end
  }
end

#main(args) ⇒ Object 



66
67
68
69
70
71
72
73
74
 
# File 'lib/di.rb', line 66

def main(args)
  setup

  parse_args!(args)

  diff_main

  exit $status
end

#parse_args!(args) ⇒ Object 



125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
 
# File 'lib/di.rb', line 125

def parse_args!(args)
  require 'optparse'

  banner = <<-"EOF"
#{MYNAME} - a wrapper around GNU diff(1)
  version #{MYVERSION}

usage: #{MYNAME} [flags] [files]
  EOF

  opts = OptionParser.new(banner) { |opts|
    miniTrueClass = Class.new
    miniTrueClassHash = OptionParser::CompletingHash['-', false]
    opts.accept(miniTrueClass, miniTrueClassHash) { |arg, val|
      val == nil or val
    }

    opts.on('--[no-]pager',
      'Pipe output into pager if stdout is a terminal. [+][*]') { |val|
      $diff.use_pager = val unless val && tty_dumb?
    }
    opts.on('--[no-]color[=WHEN]',
      'Colorize output if stdout is a terminal and the format is unified or context. [+][*]') { |val|
      case val
      when true, 'always'
        $diff.colorize = true
      when 'auto'
        $diff.colorize = tty_color?
      when false, 'never'
        $diff.colorize = false
      else
        raise OptionParser::ParseError, "unknown value for --color: #{val}"
      end
    }
    opts.on('--[no-]highlight-whitespace',
      'Highlight whitespace differences in colorized output. [+][*]') { |val|
      $diff.highlight_whitespace = val
    }
    opts.on('--[no-]rsync-exclude', '--[no-]cvs-exclude',
      'Exclude some kinds of files and directories a la rsync(1). [+][*]') { |val|
      $diff.rsync_exclude = val
    }
    opts.on('--[no-]ignore-cvs-lines',
      'Ignore CVS/RCS keyword lines. [+][*]') { |val|
      $diff.ignore_cvs_lines = val
    }
    opts.on('--[no-]fignore-exclude',
      'Ignore files having suffixes specified in FIGNORE. [+][*]') { |val|
      $diff.fignore_exclude = val
    }
    opts.on('-R', '--relative[=-]', miniTrueClass,
      'Use relative path names.') { |val|
      $diff.relative = val
    }
    opts.on('-i', '--ignore-case[=-]', miniTrueClass,
      'Ignore case differences in file contents.') { |val|
      set_flag('-i', val)
    }
    # not supported (yet)
    #opts.on("--[no-]ignore-file-name-case",
    #  "Ignore case when comparing file names.") { |val|
    #  set_flag("--ignore-file-name-case", val)
    #}
    opts.on('-E', '--ignore-tab-expansion[=-]', miniTrueClass,
      'Ignore changes due to tab expansion.') { |val|
      set_flag('-E', val)
    }
    opts.on('-b', '--ignore-space-change[=-]', miniTrueClass,
      'Ignore changes in the amount of white space.') { |val|
      set_flag('-b', val)
    }
    opts.on('-w', '--ignore-all-space[=-]', miniTrueClass,
      'Ignore all white space.') { |val|
      set_flag('-w', val)
    }
    opts.on('-B', '--ignore-blank-lines[=-]', miniTrueClass,
      'Ignore changes whose lines are all blank.') { |val|
      set_flag('-B', val)
    }
    opts.on('-I RE', '--ignore-matching-lines=RE',
      'Ignore changes whose lines all match RE.') { |val|
      set_flag('-I', val)
    }
    opts.on('--[no-]strip-trailing-cr',
      'Strip trailing carriage return on input.') { |val|
      set_flag('--strip-trailing-cr', val)
    }
    opts.on('-a', '--text[=-]', miniTrueClass,
      'Treat all files as text.') { |val|
      set_flag('-a', val)
    }
    opts.on('-c[NUM]', '--context[=NUM]', Integer,
      'Output NUM (default 3) lines of copied context.') { |val|
      set_format_flag('-C', val ? val.to_s : '3')
    }
    opts.on('-C NUM', Integer,
      'Output NUM lines of copied context.') { |val|
      set_format_flag('-C', val.to_s)
    }
    opts.on('-u[NUM]', '--unified[=NUM]', Integer,
      'Output NUM (default 3) lines of unified context. [+]') { |val|
      set_format_flag('-U', val ? val.to_s : '3')
    }
    opts.on('-U NUM', Integer,
      'Output NUM lines of unified context.') { |val|
      set_format_flag('-U', val.to_s)
    }
    opts.on('-L LABEL', '--label=LABEL',
      'Use LABEL instead of file name.') { |val|
      set_flag('-L', val)
    }
    opts.on('-p', '--show-c-function[=-]', miniTrueClass,
      'Show which C function each change is in. [+]') { |val|
      set_flag('-p', val)
    }
    opts.on('-F RE', '--show-function-line=RE',
      'Show the most recent line matching RE.') { |val|
      set_flag('-F', val)
    }
    opts.on('-q', '--brief[=-]', miniTrueClass,
      'Output only whether files differ.') { |val|
      set_flag('-q', val)
    }
    opts.on('-e', '--ed[=-]', miniTrueClass,
      'Output an ed script.') { |val|
      if val
        set_format_flag('-e', val)
      end
    }
    opts.on('--normal[=-]', miniTrueClass,
      'Output a normal diff.') { |val|
      if val
        set_format_flag('--normal', val)
      end
    }
    opts.on('-n', '--rcs[=-]', miniTrueClass,
      'Output an RCS format diff.') { |val|
      if val
        set_format_flag('-n', val)
      end
    }
    opts.on('-y', '--side-by-side[=-]', miniTrueClass,
      'Output in two columns.') { |val|
      if val
        set_format_flag('-y', val)
      end
    }
    opts.on('-W NUM', '--width=NUM', Integer,
      'Output at most NUM (default 130) print columns.') { |val|
      set_flag('-W', val.to_s)
    }
    opts.on('--left-column[=-]', miniTrueClass,
      'Output only the left column of common lines.') { |val|
      set_flag('--left-column', val)
    }
    opts.on('--suppress-common-lines[=-]', miniTrueClass,
      'Do not output common lines.') { |val|
      set_flag('--suppress-common-lines', val)
    }
    opts.on('-D NAME', '--ifdef=NAME',
      'Output merged file to show `#ifdef NAME\' diffs.') { |val|
      set_format_flag('-D', val)
    }
    %w[old new changed unchanged].each { |gtype|
      opts.on("--#{gtype}-group-format=GFMT",
        "Format #{gtype} input groups with GFMT.") { |val|
        set_custom_format_flag("--#{gtype}-group-format", val)
      }
    }
    opts.on('--line-format=LFMT',
      'Format all input lines with LFMT.') { |val|
      set_custom_format_flag('--line-format', val)
    }
    %w[old new changed unchanged].each { |ltype|
      opts.on("--#{ltype}-line-format=LFMT",
        "Format #{ltype} input lines with LFMT.") { |val|
        set_custom_format_flag("--#{ltype}-line-format", val)
      }
    }
    opts.on('-l', '--paginate[=-]', miniTrueClass,
      'Pass the output through `pr\' to paginate it.') { |val|
      set_flag('-l', val)
    }
    opts.on('-t', '--expand-tabs[=-]', miniTrueClass,
      'Expand tabs to spaces in output.') { |val|
      set_flag('-t', val)
    }
    opts.on('-T', '--initial-tab[=-]', miniTrueClass,
      'Make tabs line up by prepending a tab.') { |val|
      set_flag('-T', val)
    }
    opts.on('--tabsize=NUM', Integer,
      'Tab stops are every NUM (default 8) print columns.') { |val|
      set_flag('--tabsize', val.to_s)
    }
    opts.on('--suppress-blank-empty[=-]', miniTrueClass,
      'Suppress space or tab before empty output lines.') { |val|
      set_flag('--suppress-blank-empty', val)
    }
    opts.on('-r', '--recursive[=-]', miniTrueClass,
      'Recursively compare any subdirectories found. [+]') { |val|
      set_flag('-r', val)
      $diff.recursive = val
    }
    opts.on('-N', '--[no-]new-file[=-]', miniTrueClass,
      'Treat absent files as empty. [+]') { |val|
      set_flag('-N', val)
      $diff.new_file = val ? :bidirectional : val
    }
    opts.on('--unidirectional-new-file[=-]', miniTrueClass,
      'Treat absent first files as empty.') { |val|
      set_flag('--unidirectional-new-file', val)
      $diff.new_file = val ? :unidirectional : val
    }
    opts.on('-s', '--report-identical-files[=-]', miniTrueClass,
      'Report when two files are the same.') { |val|
      set_flag('-s', val)
    }
    opts.on('-x PAT', '--exclude=PAT',
      'Exclude files that match PAT.') { |val|
      $diff.exclude << val
    }
    opts.on('-X FILE', '--exclude-from=FILE',
      'Exclude files that match any pattern in FILE.') { |val|
      if val == '-'
        $diff.exclude.concat(STDIN.read.split(/\n/))
      else
        $diff.exclude.concat(File.read(val).split(/\n/))
      end
    }
    opts.on('--include=PAT',
      'Do not exclude files that match PAT.') { |val|
      $diff.include << val
    }
    opts.on('-S FILE', '--starting-file=FILE',
      'Start with FILE when comparing directories.') { |val|
      $diff.starting_file = val
    }
    opts.on('--from-file=FILE1',
      'Compare FILE1 to all operands.  FILE1 can be a directory.') { |val|
      $diff.from_files = [val]
    }
    opts.on('--to-file=FILE2',
      'Compare all operands to FILE2.  FILE2 can be a directory.') { |val|
      $diff.to_files = [val]
    }
    opts.on('--horizon-lines=NUM', Integer,
      'Keep NUM lines of the common prefix and suffix.') { |val|
      set_flag('--horizon-lines', val.to_s)
    }
    opts.on('-d', '--minimal[=-]', miniTrueClass,
      'Try hard to find a smaller set of changes. [+]') { |val|
      set_flag('-d', val)
    }
    opts.on('--speed-large-files[=-]', miniTrueClass,
      'Assume large files and many scattered small changes.') { |val|
      set_flag('--speed-large-files', val)
    }
    opts.on('-v', '--version',
      'Output version info.') { |val|
      print <<-"EOF"
#{MYNAME} version #{MYVERSION}
#{MYCOPYRIGHT}

----
  EOF
      xsystem(DIFF_CMD, '--version')
      exit
    }
    opts.on('--help',
      'Output this help.') { |val|
      invoke_pager
      print opts, <<EOS
Options marked with [*] are this wrapper's original features.
Options marked with [+] are turned on by default.  To turn them off,
specify -?- for short options and --no-??? for long options, respectively.

Environment variables:
EOS
      [
        ['DIFF', 'Path to diff(1)'],
        [ENV_NAME, 'User\'s preferred default options'],
        ['PAGER', 'Path to pager (more(1) is used if not defined)'],
      ].each { |name, description|
        printf "    %-14s  %s\n", name, description
      }
      exit 0
    }
  }

  begin
    opts.parse('--rsync-exclude', '--fignore-exclude', '--ignore-cvs-lines',
               '--pager', '--color=auto', '--highlight-whitespace',
               '-U3', '-N', '-r', '-p', '-d')

    if ENV['GIT_DIFFTOOL_EXTCMD']
      if base = ENV['BASE']
        opts.parse('--label', File.join('a', base), '--label', File.join('b', base))
      end
      opts.parse('--no-pager')
    end

    if value = ENV[ENV_NAME]
      require 'shellwords'
      opts.parse(*value.shellsplit)
    end

    opts.parse!(args)

    # -U3 must come before -p, otherwise you get "error: conflicting output format options."
    $diff.format_flags.each { |format_flag|
      prepend_flag(*format_flag)
    }

    if $diff.ignore_cvs_lines
      opts.parse('-I', '\$\(LastChanged\(Date\|Revision\|By\)\|Date\|Revision\|Rev\|Author\|HeadURL\|URL\|Id\|Header\|\(Free\|Net\|Open\)BSD\|Name\|Locker\|Log\|RCSfile\|Source\|State\)\(\|: .* \|:: .*[ #]\)\$')
    end
  rescue OptionParser::ParseError => e
    warn e, "Try `#{MYNAME} --help' for more information."
    exit 64
  rescue => e
    warn e
    exit 1
  end

  begin
    if $diff.from_files
      $diff.to_files ||= args

      if $diff.to_files.empty?
        raise "missing operand"
      end
    elsif $diff.to_files
      $diff.from_files = args

      if $diff.from_files.empty?
        raise "missing operand"
      end
    else
      if args.size < 2
        raise "missing operand"
      end

      if File.directory?(args.first)
        $diff.to_files, $diff.from_files = args[0..0], args[1..-1]
        $diff.reversed = true
      else
        $diff.from_files, $diff.to_files = args[0..-2], args[-1..-1]
      end
    end

    if $diff.from_files.size != 1 && $diff.to_files.size != 1
      raise "wrong number of files given"
    end
  rescue => e
    warn e, "Try `#{MYNAME} --help' for more information."
    exit 64
  end
end

#prepend_flag(flag, val) ⇒ Object 



539
540
541
542
543
544
545
546
547
 
# File 'lib/di.rb', line 539

def prepend_flag(flag, val)
  case val
  when true, false
    $diff.flags.reject! { |f,| f == flag }
    $diff.flags.unshift [flag] if val
  else
    $diff.flags.unshift [flag, val]
  end
end

#replace_invalid_bytes!(text) ⇒ Object 



1048
1049
1050
1051
1052
1053
 
# File 'lib/di.rb', line 1048

def replace_invalid_bytes!(text)
  colors = $diff.colors
  text.replace(text.replace_invalid_bytes { |byte|
      '%s<%02X>%s' % [colors.open_inv, byte, colors.close_inv]
    })
end

#set_custom_format_flag(flag, *val) ⇒ Object 



583
584
585
586
587
588
589
590
 
# File 'lib/di.rb', line 583

def set_custom_format_flag(flag, *val)
  if !$diff.custom_format_p
    $diff.format_flags.clear
    $diff.custom_format_p = true
  end
  $diff.format = :custom
  $diff.format_flags << [flag, *val]
end

#set_flag(flag, val) ⇒ Object 



549
550
551
552
553
554
555
556
557
 
# File 'lib/di.rb', line 549

def set_flag(flag, val)
  case val
  when true, false
    $diff.flags.reject! { |f,| f == flag }
    $diff.flags << [flag] if val
  else
    $diff.flags << [flag, val]
  end
end

#set_format_flag(flag, *val) ⇒ Object 



559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
 
# File 'lib/di.rb', line 559

def set_format_flag(flag, *val)
  $diff.format_flags.clear
  $diff.custom_format_p = false
  case flag
  when '-C'
    $diff.format = :context
  when '-U'
    $diff.format = :unified
  when '-e'
    $diff.format = :ed
  when '--normal'
    $diff.format = :normal
  when '-n'
    $diff.format = :rcs
  when '-y'
    $diff.format = :side_by_side
  when '-D'
    $diff.format = :ifdef
  else
    $diff.format = :unknown
  end
  $diff.format_flags << [flag, *val]
end

#setup ⇒ Object 



87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
 
# File 'lib/di.rb', line 87

def setup
  require 'ostruct'
  $diff = OpenStruct.new({
      :exclude => [],
      :include => [],
      :flags => [],
      :format_flags => [],
      :format => :normal,
      :colors => OpenStruct.new({
          :comment	=> "\e[1m",
          :file1	=> "\e[1m",
          :file2	=> "\e[1m",
          :header	=> "\e[36m",
          :function	=> "\e[m",
          :new		=> "\e[32m",
          :old		=> "\e[31m",
          :new_word	=> "\e[7;32m",
          :old_word	=> "\e[7;31m",
          :changed	=> "\e[33m",
          :unchanged	=> "",
          :whitespace	=> "\e[40m",
          :off		=> "\e[m",
          :open_inv	=> "\e[7m",
          :close_inv	=> "\e[27m",
        }),
      :reversed => false,
      :word_regex => /([@$%]*[[:alnum:]_]+|[^\n])/,
    })
end

#tty_color? ⇒ Boolean

Returns:

  • (Boolean) 


117
118
119
 
# File 'lib/di.rb', line 117

def tty_color?
  $stdout.tty? && `tput colors`.to_i >= 8
end

#tty_dumb? ⇒ Boolean

Returns:

  • (Boolean) 


121
122
123
 
# File 'lib/di.rb', line 121

def tty_dumb?
  !$stdout.tty? || ENV['TERM'] == 'dumb'
end

#warn(*lines) ⇒ Object 



76
77
78
79
80
 
# File 'lib/di.rb', line 76

def warn(*lines)
  lines.each { |line|
    STDERR.puts "#{MYNAME}: #{line}"
  }
end

#xsystem(*args) ⇒ Object 



82
83
84
85
 
# File 'lib/di.rb', line 82

def xsystem(*args)
  args << { :close_others => false } unless RUBY_VERSION < '1.9'
  system(*args)
end