di 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 492fd8b1ee082ed8ee489760ef1d360b9f56d12a
-  data.tar.gz: d2e3f3b24063143f279f5bb83889ec798b64127a
+  metadata.gz: 61c8f70aa068fb3d011c9baf120f8ec0b5978051
+  data.tar.gz: de784ceb4217db80523b59f63e6cb246bfa883a5
 SHA512:
-  metadata.gz: e0951beceb1947defd0d710a4458ef9ce6835190b00bc19e8544f6fcb0b43949e2e13972f8e11441b46373461fe8b7a9174941cc235754d6131a48583d4f3bf8
-  data.tar.gz: e870a6f3e215697edb356316b0ff77ddb07b98246b7974985a00ab91f305d929a5a0283e04d1ab0006bb41d82db43109d715e36bdaa20d216c1b4d3aaa20f809
+  metadata.gz: 35b97e1c80d0d57e95769997eec6c786e229564b2518e30a3df751356d7bc3db9987a2c72f31910ae6d4dd012fca4ea7aff097669323efb5940035cc425c8549
+  data.tar.gz: eabdb6553af81cec6b8ad8db3b7fb102e5caca21a1504d4b51955539d28c9d7092e56236d64681fcd0393afa2bbe317748f01029265ed44510312966f25a8925

data/HISTORY

@@ -1,3 +1,9 @@
+== 0.4.3 2015-01-05
+
+* Do not use colors if the terminal does not support colors.
+
+* Do not invoke a pager when on a dumb terminal.
+
 == 0.4.2 2013-08-16
 
 * Do not close inherited file descriptors on invoking diff(1) so that

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA
+Copyright (c) 2008-2015 Akinori MUSHA
 
 All rights reserved.
 

data/lib/di.rb

@@ -3,7 +3,7 @@
 #
 # di - a wrapper around GNU diff(1)
 #
-# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA
+# Copyright (c) 2008-2015 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.2"
+MYVERSION = "0.4.3"
 MYNAME = File.basename($0)
-MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA"
+MYCOPYRIGHT = "Copyright (c) 2008-2015 Akinori MUSHA"
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
 ENV_NAME = "#{MYNAME.tr('-a-z', '_A-Z')}_OPTIONS"
@@ -114,6 +114,14 @@ def setup
     })
 end
 
+def tty_color?
+  $stdout.tty? && `tput colors`.to_i >= 8
+end
+
+def tty_dumb?
+  !$stdout.tty? || ENV['TERM'] == 'dumb'
+end
+
 def parse_args!(args)
   require 'optparse'
 
@@ -133,7 +141,7 @@ usage: #{MYNAME} [flags] [files]
 
     opts.on('--[no-]pager',
       'Pipe output into pager if stdout is a terminal. [+][*]') { |val|
-      $diff.use_pager = val if $stdout.tty?
+      $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|
@@ -141,7 +149,7 @@ usage: #{MYNAME} [flags] [files]
       when true, 'always'
         $diff.colorize = true
       when 'auto'
-        $diff.colorize = $stdout.tty?
+        $diff.colorize = tty_color?
       when false, 'never'
         $diff.colorize = false
       else

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: di
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.2
 description: |
@@ -36,8 +36,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - HISTORY
 - LICENSE
 - README.rdoc
@@ -57,20 +57,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A wrapper around GNU diff(1)
 test_files:
 - test/helper.rb
 - test/test_di.rb
+has_rdoc: