di 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89485791b2612b6df2c0cce66f24856571c85dde
-  data.tar.gz: 8ac703cf8b70c4ccb5a680c91f64c12f8d7c21cf
+  metadata.gz: 492fd8b1ee082ed8ee489760ef1d360b9f56d12a
+  data.tar.gz: d2e3f3b24063143f279f5bb83889ec798b64127a
 SHA512:
-  metadata.gz: 6693cdfccee6b3787ed382feb31cd51818f548ba2e5643121920bfb81d7932632ed2ca01bb263e56d1a9c60d6a39f4077a21e988338274bb4c4baf97274d774e
-  data.tar.gz: 032c8c70a6851bc94f2901401b454011873419dc9cc80a6ec0e2f2de2272abe555d1682529217cb6298a7f700d3ac922bd81b8a6c7d1a0524d490b0fa90df48f
+  metadata.gz: e0951beceb1947defd0d710a4458ef9ce6835190b00bc19e8544f6fcb0b43949e2e13972f8e11441b46373461fe8b7a9174941cc235754d6131a48583d4f3bf8
+  data.tar.gz: e870a6f3e215697edb356316b0ff77ddb07b98246b7974985a00ab91f305d929a5a0283e04d1ab0006bb41d82db43109d715e36bdaa20d216c1b4d3aaa20f809

data/HISTORY

@@ -1,3 +1,8 @@
+== 0.4.2 2013-08-16
+
+* Do not close inherited file descriptors on invoking diff(1) so that
+  `di file <(command)` works.
+
 == 0.4.1 2013-04-11
 
 * Set better labels and disable pager if invoked by git difftool.

data/di.gemspec

@@ -14,6 +14,7 @@ default settings and some original features.
 EOS
   gem.summary       = %q{A wrapper around GNU diff(1)}
   gem.homepage      = "https://github.com/knu/di"
+  gem.license       = "2-clause BSDL"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/di.rb

@@ -28,7 +28,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.4.1"
+MYVERSION = "0.4.2"
 MYNAME = File.basename($0)
 MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA"
 
@@ -79,6 +79,11 @@ def warn(*lines)
   }
 end
 
+def xsystem(*args)
+  args << { :close_others => false } unless RUBY_VERSION < '1.9'
+  system(*args)
+end
+
 def setup
   require 'ostruct'
   $diff = OpenStruct.new({
@@ -375,7 +380,7 @@ usage: #{MYNAME} [flags] [files]
 
 ----
   EOF
-      system(DIFF_CMD, '--version')
+      xsystem(DIFF_CMD, '--version')
       exit
     }
     opts.on('--help',
@@ -623,7 +628,7 @@ end
 
 def call_diff(*args)
   invoke_colorizer
-  system *[DIFF_CMD, $diff.flags, args].flatten
+  xsystem *[DIFF_CMD, $diff.flags, args].flatten
   status = $? >> 8
   $status = status if $status < status
   return status

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: di
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -48,7 +48,8 @@ files:
 - test/helper.rb
 - test/test_di.rb
 homepage: https://github.com/knu/di
-licenses: []
+licenses:
+- 2-clause BSDL
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A wrapper around GNU diff(1)