rubysh 0.1.2 → 0.2.0

data/lib/rubysh.rb

@@ -128,46 +128,32 @@ module Rubysh
     FD.new(2)
   end
 
-  def self.>(target=nil, opts=nil)
-    # Might want to DRY this logic up at some point. Right now seems
-    # like it'd just sacrifice clarity though.
-    if !opts && target.kind_of?(Hash)
-      opts = target
-      target = nil
-    end
+  def self.>(target=(t=true; nil), opts=(o=true; nil))
+    target, opts = handle_redirect_args(target, t, opts, o)
     target ||= :stdout
 
     Redirect.new(1, '>', target, opts)
   end
 
-  def self.>>(target=nil, opts=nil)
-    if !opts && target.kind_of?(Hash)
-      opts = target
-      target = nil
-    end
+  def self.>>(target=(t=true; nil), opts=(o=true; nil))
+    target, opts = handle_redirect_args(target, t, opts, o)
     target ||= :stdout
 
     Redirect.new(1, '>>', target, opts)
   end
 
-  def self.<(target=nil, opts=nil)
-    if !opts && target.kind_of?(Hash)
-      opts = target
-      target = nil
-    end
+  def self.<(target=(t=true; nil), opts=(o=true; nil))
+    target, opts = handle_redirect_args(target, t, opts, o)
     target ||= :stdin
 
     Redirect.new(0, '<', target, opts)
   end
 
   # Hack to implement <<<
-  def self.<<(fd=nil, opts=nil)
-    if !opts && fd.kind_of?(Hash)
-      opts = fd
-      fd = nil
-    end
-
+  def self.<<(fd=(f=true; nil), opts=(o=true; nil))
+    fd, opts = handle_redirect_args(fd, f, opts, o)
     fd ||= FD.new(0)
+
     TripleLessThan::Shell.new(fd, opts)
   end
 
@@ -189,4 +175,24 @@ module Rubysh
     log.error(formatted)
     raise msg if hard
   end
+
+  def self.handle_redirect_args(target, target_omitted, opts, opts_omitted)
+    if opts_omitted && target.kind_of?(Hash)
+      # Shift over if user provided target as a hash but omitted opts.
+      opts = target
+      opts_omitted = target_omitted
+
+      target = nil
+      target_omitted = true
+    end
+
+    # User provided a false-y value for target. This probably
+    # indicates a bug in the user's code, where a variable is
+    # accidentally nil.
+    if !target_omitted && !target
+      raise Rubysh::Error::BaseError.new("You provided #{target.inspect} as your redirect target. This probably indicates a bug in your code. Either omit the target argument or provide a non-false-y value for it.")
+    end
+
+    return target, opts
+  end
 end

data/lib/rubysh/version.rb

@@ -1,3 +1,3 @@
 module Rubysh
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/test/unit/lib/rubysh.rb

@@ -69,6 +69,19 @@ module RubyshTest::Unit
           assert_equal([Rubysh::Redirect.new(Rubysh::FD.new(2), '>', Rubysh::FD.new(1))], subprocess.directives)
         end
       end
+
+      # Rubysh('ls', '/tmp', Rubysh.stderr > Rubysh.stdout)
+      describe 'with a redirection' do
+        it 'raises if the argument is nil' do
+          assert_raises(Rubysh::Error::BaseError) {Rubysh.<(nil)}
+          assert_raises(Rubysh::Error::BaseError) {Rubysh.<(nil, :foo => :bar)}
+        end
+
+        it 'allows omitting target' do
+          Rubysh.<()
+          Rubysh.<(:foo => :bar)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubysh
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3657158191567713340
+      hash: 4577335666745550264
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3657158191567713340
+      hash: 4577335666745550264
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23