di 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 61c8f70aa068fb3d011c9baf120f8ec0b5978051
-  data.tar.gz: de784ceb4217db80523b59f63e6cb246bfa883a5
+SHA256:
+  metadata.gz: 38a6ebb27f63c158a2281c8084a8b7e9f863c0694a27c65e046041dd417cb513
+  data.tar.gz: '05084a0031eb646d6250c9d479f23b8f438ac1ce6106f6c1b32d28fd4d02590b'
 SHA512:
-  metadata.gz: 35b97e1c80d0d57e95769997eec6c786e229564b2518e30a3df751356d7bc3db9987a2c72f31910ae6d4dd012fca4ea7aff097669323efb5940035cc425c8549
-  data.tar.gz: eabdb6553af81cec6b8ad8db3b7fb102e5caca21a1504d4b51955539d28c9d7092e56236d64681fcd0393afa2bbe317748f01029265ed44510312966f25a8925
+  metadata.gz: d410883c4714053d447fb99d320ebc5f451b3fab559f65b782e4d31d5885c6960b269e000377c0738c895063a93cadbecfb772aa7997acb4af300766ee14089c
+  data.tar.gz: e880ee0456c03170f1ca9276ee50864366b773bfa0b6182f1692251e5ae8438878fb3b06174ffc4ba22037fbfe9bae2ba04d37615133bc2976aa82089a8d6f5d

data/HISTORY

@@ -1,3 +1,8 @@
+== 0.4.4 2021-04-06
+
+* Fix a fatal conflict when -p is specified.
+  ("error: conflicting output format options.")
+
 == 0.4.3 2015-01-05
 
 * Do not use colors if the terminal does not support colors.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2015 Akinori MUSHA
+Copyright (c) 2008-2021 Akinori MUSHA
 
 All rights reserved.
 

data/lib/di.rb

@@ -3,7 +3,7 @@
 #
 # di - a wrapper around GNU diff(1)
 #
-# Copyright (c) 2008-2015 Akinori MUSHA
+# Copyright (c) 2008-2021 Akinori MUSHA
 #
 # All rights reserved.
 #
@@ -28,9 +28,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.4.3"
+MYVERSION = "0.4.4"
 MYNAME = File.basename($0)
-MYCOPYRIGHT = "Copyright (c) 2008-2015 Akinori MUSHA"
+MYCOPYRIGHT = "Copyright (c) 2008-2021 Akinori MUSHA"
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
 ENV_NAME = "#{MYNAME.tr('-a-z', '_A-Z')}_OPTIONS"
@@ -431,8 +431,9 @@ EOS
 
     opts.parse!(args)
 
+    # -U3 must come before -p, otherwise you get "error: conflicting output format options."
     $diff.format_flags.each { |format_flag|
-      set_flag(*format_flag)
+      prepend_flag(*format_flag)
     }
 
     if $diff.ignore_cvs_lines
@@ -535,6 +536,16 @@ def invoke_colorizer!
   }
 end
 
+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
+
 def set_flag(flag, val)
   case val
   when true, false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: di
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Akinori MUSHA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -51,7 +51,7 @@ homepage: https://github.com/knu/di
 licenses:
 - 2-clause BSDL
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,12 +66,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A wrapper around GNU diff(1)
 test_files:
 - test/helper.rb
 - test/test_di.rb
-has_rdoc: