rubysh 0.0.2 → 0.0.3

data/lib/rubysh/subprocess/parallel_io.rb

@@ -74,7 +74,7 @@ class Rubysh::Subprocess
       begin
         ready_readers, ready_writers, _ = IO.select(potential_readers, potential_writers)
       rescue Errno::EINTR
-        next
+        retry
       end
 
       ready_readers.each do |reader|

data/lib/rubysh/util.rb

@@ -33,8 +33,19 @@ module Rubysh
         copy.close
       end
 
-      res = original.fcntl(Fcntl::F_DUPFD, fildes2)
-      Rubysh.assert(res == fildes2, "Tried to open #{fildes2} but ended up with #{res} instead", true)
+      # For some reason, Ruby 1.9 doesn't seem to let you close
+      # stdout/sterr. So if we didn't manage to close it above, then
+      # just use reopen. We could get rid of the close attempt above,
+      # but I'd rather leave this code as close to doing the same
+      # thing everywhere as possible.
+      begin
+        copy = io_without_autoclose(fildes2)
+      rescue Errno::EBADF
+        res = original.fcntl(Fcntl::F_DUPFD, fildes2)
+        Rubysh.assert(res == fildes2, "Tried to open #{fildes2} but ended up with #{res} instead", true)
+      else
+        copy.reopen(original)
+      end
     end
 
     def self.set_cloexec(file, enable=true)

data/lib/rubysh/version.rb

@@ -1,3 +1,3 @@
 module Rubysh
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,62 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubysh
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Greg Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: "Rubysh: Ruby subprocesses made easy"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Rubysh: Ruby subprocesses made easy'
+email:
 - gdb@gregbrockman.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -96,40 +89,34 @@ files:
 - test/unit/lib/rubysh/runner.rb
 - test/unit/lib/rubysh/subprocess.rb
 - test/unit/lib/rubysh/subprocess/parallel_io.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: "Rubysh makes shelling out easy with a __sh__-like syntax layer for Ruby:  irb -r rubysh >> command = Rubysh('echo', 'hello-from-Rubysh') | Rubysh('grep', '--color', 'Rubysh') >> command.run hello-from-Rubysh => Rubysh::Runner: echo hello-from-Rubysh | grep --color Rubysh (exitstatus: 0)"
-test_files: 
+summary: ! 'Rubysh makes shelling out easy with a __sh__-like syntax layer for Ruby:  irb
+  -r rubysh >> command = Rubysh(''echo'', ''hello-from-Rubysh'') | Rubysh(''grep'',
+  ''--color'', ''Rubysh'') >> command.run hello-from-Rubysh => Rubysh::Runner: echo
+  hello-from-Rubysh | grep --color Rubysh (exitstatus: 0)'
+test_files:
 - test/_lib.rb
 - test/functional/_lib.rb
 - test/functional/lib/fd-lister