rubysh 0.0.5 → 0.0.6

data/Gemfile

@@ -1,4 +1,8 @@
-source 'https://rubygems.org'
+# Execute bundler hook if present
+['~/.', '/etc/'].any? do |file|
+ File.lstat(path = File.expand_path(file + 'bundle-gemfile-hook')) rescue next
+ eval(File.read(path), binding, path); break true
+end || source('https://rubygems.org/')
 
 # Specify your gem's dependencies in rubysh.gemspec
 gemspec

data/README.md

@@ -55,8 +55,8 @@ are arbitrary symbols):
 
     command = Rubysh('echo', 'hi', Rubysh.stdout > :stdout, Rubysh.stderr > :stderr)
     runner = command.run
-    runner.data(:stdout) # "hi\n"
-    runner.data(:stderr) # ""
+    runner.read(:stdout) # "hi\n"
+    runner.read(:stderr) # ""
 
 ## Controlled input
 

data/Rakefile

@@ -1,10 +1,14 @@
 #!/usr/bin/env rake
-# require 'bundler/gem_tasks'
+require 'bundler/gem_tasks'
+require 'bundler/setup'
+require 'chalk-rake/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs = ["lib"]
+  t.libs = ['lib']
   # t.warning = true
   t.verbose = true
-  t.test_files = FileList['test/**/*.rb']
+  t.test_files = FileList['test/**/*.rb'].reject do |file|
+    file.end_with?('_lib.rb') || file.include?('/_lib/')
+  end
 end

data/lib/rubysh/subprocess/pipe_wrapper.rb

@@ -50,12 +50,10 @@ class Rubysh::Subprocess
 
     def dump_json_and_close(msg)
       dumped = SERIALIZER.dump(msg)
-      begin
-        @writer.write(dumped)
-      ensure
-        @writer.close
-        Rubysh.assert(@reader.closed?, "Reader should already be closed")
-      end
+      @writer.write(dumped)
+    ensure
+      @writer.close
+      Rubysh.assert(@reader.closed?, "Reader should already be closed")
     end
 
     def load_json_and_close
@@ -68,10 +66,10 @@ class Rubysh::Subprocess
         # e.g. ArgumentError: syntax error on line 0, col 2: `' (could
         # happen if the subprocess was killed while writing a message)
         raise Rubysh::Error::BaseError.new("Invalid message read from pipe: #{e}")
-      ensure
-        @reader.close
-        Rubysh.assert(@writer.closed?, "Writer should already be closed")
       end
+    ensure
+      @reader.close
+      Rubysh.assert(@writer.closed?, "Writer should already be closed")
     end
   end
 end

data/lib/rubysh/version.rb

@@ -1,3 +1,3 @@
 module Rubysh
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/rubysh.rb

@@ -135,7 +135,7 @@ module Rubysh
       opts = target
       target = nil
     end
-    target = :stdout
+    target ||= :stdout
 
     Redirect.new(1, '>', target, opts)
   end
@@ -145,7 +145,7 @@ module Rubysh
       opts = target
       target = nil
     end
-    target = :stdout
+    target ||= :stdout
 
     Redirect.new(1, '>>', target, opts)
   end
@@ -155,7 +155,7 @@ module Rubysh
       opts = target
       target = nil
     end
-    target = :stdin
+    target ||= :stdin
 
     Redirect.new(0, '<', target, opts)
   end

data/rubysh.gemspec

@@ -2,9 +2,9 @@
 require File.expand_path('../lib/rubysh/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Greg Brockman"]
-  gem.email         = ["gdb@gregbrockman.com"]
-  gem.description   = "Rubysh: Ruby subprocesses made easy"
+  gem.authors       = ['Greg Brockman']
+  gem.email         = ['gdb@gregbrockman.com']
+  gem.description   = 'Rubysh: Ruby subprocesses made easy'
   gem.summary       = "Rubysh makes shelling out easy with a __sh__-like syntax layer for Ruby:
 
     irb -r rubysh
@@ -12,15 +12,17 @@ Gem::Specification.new do |gem|
     >> command.run
     hello-from-Rubysh
     => Rubysh::Runner: echo hello-from-Rubysh | grep --color Rubysh (exitstatus: 0)"
-  gem.homepage      = ""
+  gem.homepage      = ''
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "rubysh"
-  gem.require_paths = ["lib"]
+  gem.name          = 'rubysh'
+  gem.require_paths = ['lib']
   gem.version       = Rubysh::VERSION
 
-  gem.add_development_dependency 'minitest', '3.1.0'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'chalk-rake'
+  gem.add_development_dependency 'minitest', '3.1.0'
 end

data/test/functional/lib/leaked_fds.rb

@@ -3,20 +3,6 @@ require 'shellwords'
 
 module RubyshTest::Functional
   class LeakedFDsTest < FunctionalTest
-    # Try to remove inteference from other tests
-    def close_high_fds
-      begin
-        (3..20).each do |fd|
-          begin
-            io = IO.new(fd)
-          rescue Errno::EBADF
-          else
-            io.close
-          end
-        end
-      end
-    end
-
     def parse_lsof(stdout)
       pids = []
       stdout.split("\n").each do |line|
@@ -25,58 +11,81 @@ module RubyshTest::Functional
       pids
     end
 
-    before do
-      close_high_fds
+    def original_fds
+      output = `lsof -p "#{$$}" -F f`
+      parse_lsof(output)
     end
 
+    def expected_fd_count(original, pids)
+      # MRI 1.9 reserves FDs 3, 4 for itself.
+      #
+      # TODO: I don't fully understand what FDs MRI decides it needs,
+      # but some typical output here is that pids is [0, 1, 2, 5, 6,
+      # 8, 255] while original is [0, 1, 2, 3, 4, 5, 6, 7, 8].
+      #
+      # That may actually indicate a bug in Rubysh somewhere, but I
+      # think it means MRI likes opening FDs.
+      if RUBY_VERSION =~ /\A1.9\./
+        assert_equal(pids.length, original.length - 2, "Pids is #{pids.inspect} while original is #{original.inspect}")
+      else
+        assert_equal(pids.length, original.length, "Pids is #{pids.inspect} while original is #{original.inspect}")
+      end
+    end
+
+
     describe 'when spawning with no pipe' do
       it 'has no unexpected FDs, post-exec' do
-        cmd = Rubysh(File.expand_path('fd-lister', File.dirname(__FILE__)), Rubysh.stdout > :stdout)
+        original = original_fds
+        cmd = Rubysh(File.expand_path('../fd-lister', __FILE__), Rubysh.stdout > :stdout, Rubysh.stderr > '/dev/null')
         result = cmd.run
 
-        stdout = result.data(:stdout)
+        stdout = result.read(:stdout)
         pids = parse_lsof(stdout)
-        assert_equal([0, 1, 2, 255], pids)
+        expected_fd_count(original, pids)
       end
     end
 
     describe 'when spawning with a redirect' do
       it 'has no unexpected FDs, post-exec' do
-        cmd = Rubysh(File.expand_path('fd-lister', File.dirname(__FILE__)), Rubysh.stderr > '/dev/null', Rubysh.stdout > :stdout)
+        original = original_fds
+        cmd = Rubysh(File.expand_path('../fd-lister', __FILE__), Rubysh.stderr > '/dev/null', Rubysh.stdout > :stdout)
         result = cmd.run
 
-        stdout = result.data(:stdout)
+        stdout = result.read(:stdout)
         pids = parse_lsof(stdout)
-        assert_equal([0, 1, 2, 255], pids)
+        expected_fd_count(original, pids)
       end
     end
 
     describe 'when spawning with a pipe' do
       it 'has no unexpected FDs, post-fork' do
-        cmd = Rubysh(File.expand_path('fd-lister', File.dirname(__FILE__))) | Rubysh('cat', Rubysh.stdout > :stdout)
+        original = original_fds
+        cmd = Rubysh(File.expand_path('../fd-lister', __FILE__)) | Rubysh('cat', Rubysh.stdout > :stdout)
         result = cmd.run
 
-        stdout = result.data(:stdout)
+        stdout = result.read(:stdout)
         pids = parse_lsof(stdout)
-        assert_equal([0, 1, 2, 255], pids)
+        expected_fd_count(original, pids)
       end
 
       it 'has no unexpected FDs, post-fork, when on the right side of a pipe' do
-        cmd = Rubysh('echo') | Rubysh(File.expand_path('fd-lister', File.dirname(__FILE__)), Rubysh.stdout > :stdout)
+        original = original_fds
+        cmd = Rubysh('echo') | Rubysh(File.expand_path('../fd-lister', __FILE__), Rubysh.stdout > :stdout)
         result = cmd.run
 
-        stdout = result.data(:stdout)
+        stdout = result.read(:stdout)
         pids = parse_lsof(stdout)
-        assert_equal([0, 1, 2, 255], pids)
+        expected_fd_count(original, pids)
       end
 
       it 'has no unexpected FDs, post-fork, when in the middle of two pipes' do
-        cmd = Rubysh('echo') | Rubysh(File.expand_path('fd-lister', File.dirname(__FILE__))) | Rubysh('cat', Rubysh.stdout > :stdout)
+        original = original_fds
+        cmd = Rubysh('echo') | Rubysh(File.expand_path('../fd-lister', __FILE__)) | Rubysh('cat', Rubysh.stdout > :stdout)
         result = cmd.run
 
-        stdout = result.data(:stdout)
+        stdout = result.read(:stdout)
         pids = parse_lsof(stdout)
-        assert_equal([0, 1, 2, 255], pids)
+        expected_fd_count(original, pids)
       end
     end
   end

data/test/functional/lib/triple_less_than.rb

@@ -8,7 +8,7 @@ module RubyshTest::Functional
         result = cmd.run
 
         assert_equal(0, result.exitstatus)
-        output = result.data(:stdout)
+        output = result.read(:stdout)
         assert_equal('test', output)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubysh
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chalk-rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: ! 'Rubysh: Ruby subprocesses made easy'
 email:
 - gdb@gregbrockman.com
@@ -103,12 +135,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1492953900327640253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1492953900327640253
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23