easysh 0.1.0 → 0.1.1

data/lib/easysh.rb

@@ -17,7 +17,6 @@
 #  sh.ls.sort
 #  sh.ls.chars.to_a.sample(5)
 #  sh.cat('/dev/urandom').bytes.first(10)
-#  sh.ls._l.map{|l| l.split}
 #  sh.ps._e._o('euser,comm').map(&:split).group_by(&:first)
 #  
 #  # chaining commands
@@ -48,10 +47,10 @@
 #  # exit status
 #  p = sh.which('bash')
 #  puts p
-#  p.exitstatus        # => #<Process::Status: pid 5931 exit 0>
+#  p.status        # => #<Process::Status: pid 5931 exit 0>
 #  p = sh.which.nonexists
 #  puts p
-#  p.exitstatus        # => #<Process::Status: pid 6156 exit 1>
+#  p.status        # => #<Process::Status: pid 6156 exit 1>
 #
 #
 #  # instant mode
@@ -64,10 +63,10 @@
 #  # =>  Linux
 # 
 #
-class EasySH < Struct.new(:cmd, :opt, :chain, :instant)
+class EasySH < Struct.new(:cmd, :opt, :chain, :instant) # :no-doc:
   include Enumerable
 
-  attr_reader   :exitstatus
+  attr_reader   :status
 
   def method_missing name, *args, &block # :no-doc:
     begin
@@ -79,14 +78,14 @@ class EasySH < Struct.new(:cmd, :opt, :chain, :instant)
     r = if name.is_a? EasySH
           self.class.new [*cmd, *name.cmd], Hash[*opt, *name.opt], chain, instant
         else
-          args = [name.to_s.gsub(/^_+/) {|s| '-' * s.size}, *args]
+          args = [name && name.to_s.gsub(/^_+/) {|s| '-' * s.size}, *args].compact
           *args, opt = *args if args.last.is_a?(Hash) && args.last.keys.find{|k| k.is_a? Integer}
           args = args.map do |a|
             case a
             when Symbol
               "-#{a.length > 1 ? '-' : ''}#{a}"
             when Hash
-              a.map { |k,v| k.length > 1 ? "--#{k}=#{v}" : "-#{k} #{v}" }
+              a.map { |k,v| k.length > 1 ? "--#{k}=#{v}" : ["-#{k}", v.to_s] }
             else
               a.to_s
             end
@@ -142,7 +141,7 @@ class EasySH < Struct.new(:cmd, :opt, :chain, :instant)
       end
     ensure
       pipes.flatten.each { |io| io.close unless io.closed? }
-      @exitstatus = Process.wait2(lpid)[-1] rescue nil
+      @status = Process.wait2(lpid)[-1] rescue nil
       ['TERM', 'KILL'].each { |sig| Process.kill sig, *pids rescue nil }
       Process.waitall rescue nil
     end
@@ -163,16 +162,43 @@ class EasySH < Struct.new(:cmd, :opt, :chain, :instant)
     to_io { |i| while b = i.getbyte; yield b; end }
   end
 
-  alias :call    :method_missing
-  alias :[]      :method_missing
-  alias :to_ary  :to_a
-  alias :lines   :each_line
-  alias :each    :each_line
-  alias :lines   :each_line
-  alias :chars   :each_char
-  alias :bytes   :each_byte
-  alias :read    :to_s
-  alias :!       :to_s
+  def [] i, *args
+    case i
+    when Integer
+      return to_a[i] if args.empty?
+      return to_a[i, *args] if args.size == 1 && args[0].is_a?(Integer)
+    when Range
+      return to_a[i] if args.empty?
+    when Regexp
+      return to_s[i, *args]
+    end
+    method_missing nil, i, *args
+  end
+
+  def to_i
+    to_s if status.nil?
+    (status && status.exitstatus) || 0
+  end
+
+  def successful? 
+    to_i == 0
+  end
+
+  def failed?
+    ! successful?
+  end
+
+  alias :call        :method_missing
+  alias :to_ary      :to_a
+  alias :lines       :each_line
+  alias :each        :each_line
+  alias :lines       :each_line
+  alias :chars       :each_char
+  alias :bytes       :each_byte
+  alias :read        :to_s
+  alias :!           :to_s
+  alias :exitstatus  :status
+  alias :exitcode    :to_i
 
   def pretty_print(q)
     q.text self.inspect

data/test/test_easysh.rb

@@ -37,6 +37,33 @@ class EasySHTest < Test::Unit::TestCase
     end
   end
 
+  def test_alternatives
+    ref_cmd = sh['ls', '-l'].cmd
+    assert_equal ref_cmd, sh.ls['-l'].cmd
+    assert_equal ref_cmd, sh.ls[:l].cmd
+    assert_equal ref_cmd, sh.ls(:l).cmd
+    assert_equal ref_cmd, sh.ls._l.cmd
+    assert_equal ref_cmd, sh['ls']._l.cmd
+
+    ref_cmd = sh['ls', '--all', '--color=auto'].cmd
+    assert_equal ref_cmd, sh.ls.__all[:color => :auto].cmd
+    assert_equal ref_cmd, sh.ls.__all(:color => :auto).cmd
+    assert_equal ref_cmd, sh.ls[:all][:color => :auto].cmd
+    assert_equal ref_cmd, sh.ls(:all)[:color => :auto].cmd
+
+    ref_cmd = sh['tail', '-f', '-n', '3'].cmd
+    assert_equal ref_cmd, sh.tail._f._n['3'].cmd
+    assert_equal ref_cmd, sh.tail._f._n(3).cmd
+    assert_equal ref_cmd, sh.tail._f[n: 3].cmd
+    assert_equal ref_cmd, sh.tail._f[:n, 3].cmd
+    assert_equal ref_cmd, sh.tail._f(n: 3).cmd
+    assert_equal ref_cmd, sh.tail._f(:n, 3).cmd
+    assert_equal ref_cmd, sh.tail(:f, n: 3).cmd
+    assert_equal ref_cmd, sh.tail(:f, :n, 3).cmd
+    assert_equal ref_cmd, sh.tail[:f, n: 3].cmd
+    assert_equal ref_cmd, sh.tail[:f, :n, 3].cmd
+  end
+
   def test_enumerator
     with_tmpfile [*10..25].join("\n") do |tmppath, content|
       kat = sh.cat
@@ -97,9 +124,36 @@ class EasySHTest < Test::Unit::TestCase
     with_tmpfile do |tmppath, content|
       assert_fd_count_equal do
         assert_equal ((kat < tmppath) | kat).to_s, content
-        ((sh.echo('hello') | kat) > tmppath).!
+        ((sh.echo('hello') | kat) > tmppath).to_s
         assert_equal File.read(tmppath).chomp, 'hello'
       end
     end
   end
+
+  def test_lines_regex
+    assert_fd_count_equal do
+      assert_equal sh.echo["a\nb"][1], 'b'
+      assert_equal sh.echo["a\nb"][-1], 'b'
+      assert_equal sh.echo["a\nb\nc"][0..1], ['a', 'b']
+      assert_equal sh.echo["a\nb\nc"][1, 2], ['b', 'c']
+      assert_equal sh.echo["a\nb\nc"][1, 2, 3].class, sh.class
+      assert_equal sh.echo["a\nb\nc"][1..2, 3].class, sh.class
+      assert_equal sh.echo["hello\nabcword"][/b.*o/], 'bcwo'
+      assert_equal sh.echo["hello\nabcword"][/b(.*)o/, 1], 'cw'
+      assert_equal sh.echo("Hello world\nThis is a test")[/T.*$/], "This is a test"
+      assert_equal sh.echo("Hello world\nThis is a test")[/T.* ([^ ]*)$/, 1], "test"
+    end
+  end
+
+  def test_status
+    assert_equal sh.true.exitcode, 0
+    assert_not_equal sh.false.exitstatus, 0
+    assert_equal sh.true.successful?, true
+    assert_equal sh.false.failed?, true
+    sh1 = sh.true
+    assert_equal sh1.status, nil
+    sh1.to_s
+    assert_not_equal sh1.status, nil
+    assert_equal sh1.exitcode, 0
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easysh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies: []
 description: Synatactic sugars about shell executables, redirects and pipes
 email: quark@zju.edu.cn
@@ -19,7 +19,7 @@ extra_rdoc_files: []
 files:
 - lib/easysh.rb
 - test/test_easysh.rb
-homepage: https://github.com/quark-zju/easyshell
+homepage: https://github.com/quark-zju/easysh
 licenses: []
 post_install_message: 
 rdoc_options: []