rio 0.3.6 → 0.3.7

data/lib/rio/ops/dir.rb

@@ -35,7 +35,6 @@
 # The documented interface and behavior is subject to change without notice.</b>
 
 
-require 'extensions/object'
 require 'rio/grande'
 require 'rio/cp'
 require 'rio/ops/either'
@@ -191,6 +190,13 @@ module RIO
           read_()
         end
 
+        def get()
+          self.each_ent_ { |d|
+            return d
+          }
+          return nil
+        end
+
         def rewind() ioh.rewind(); self end
         def seek(integer) ioh.seek(integer); self end
 
@@ -224,30 +230,43 @@ module RIO
           args = cx['skip_args'] || []
           self.skipentries(*args)
         end
+        def handle_ent_(estr,selfstr,sel,&block)
+          begin
+            erio = new_rio_cx(selfstr ? Impl::U.join(selfstr,estr) : estr )
+            
+            if stream_iter?
+              _add_stream_iter_cx(erio).each(&block) if erio.file? and sel.match?(erio)
+            else
+              yield _add_iter_cx(erio) if sel.match?(erio)
+            end
+            
+            if cx.has_key?('all') and erio.directory?
+              rsel = Match::Entry::SelectorClassic.new(cx['r_sel'],cx['r_nosel'])
+              _add_recurse_iter_cx(erio).each(&block) if rsel.match?(erio)
+            end
+            
+          rescue ::Errno::ENOENT, ::URI::InvalidURIError => ex
+            $stderr.puts(ex.message+". Skipping.")
+          end
+        end
         def each_(*args,&block)
           #p "#{callstr('each_',*args)} sel=#{cx['sel'].inspect} nosel=#{cx['nosel'].inspect}"
           handle_skipped()
           sel = Match::Entry::Selector.new(cx['entry_sel'])
           selfstr = (self.to_s == '.' ? nil : self.to_s)
           self.ioh.each do |estr|
-            next if estr =~ /^\.(\.)?$/
-            begin
-              erio = new_rio_cx(selfstr ? Impl::U.join(selfstr,estr) : estr )
- 
-              if stream_iter?
-                _add_stream_iter_cx(erio).each(&block) if erio.file? and sel.match?(erio)
-              else
-                yield _add_iter_cx(erio) if sel.match?(erio)
-              end
-
-              if cx.has_key?('all') and erio.directory?
-                rsel = Match::Entry::SelectorClassic.new(cx['r_sel'],cx['r_nosel'])
-                _add_recurse_iter_cx(erio).each(&block) if rsel.match?(erio)
-              end
-              
-            rescue ::Errno::ENOENT, ::URI::InvalidURIError => ex
-              $stderr.puts(ex.message+". Skipping.")
-            end
+            next if 
+            handle_ent_(estr,selfstr,sel,&block) unless estr =~ /^\.(\.)?$/
+          end
+          closeoneof? ? self.close : self
+        end
+        def each_ent_(*args,&block)
+          #p "#{callstr('each_',*args)} sel=#{cx['sel'].inspect} nosel=#{cx['nosel'].inspect}"
+          handle_skipped()
+          sel = Match::Entry::Selector.new(cx['entry_sel'])
+          selfstr = (self.to_s == '.' ? nil : self.to_s)
+          while estr = self.ioh.read
+            handle_ent_(estr,selfstr,sel,&block) unless estr =~ /^\.(\.)?$/
           end
           closeoneof? ? self.close : self
         end

data/lib/rio/rl/ioi.rb

@@ -56,8 +56,8 @@ module RIO
       def initialize(ios=nil)
         @ios = ios
       end
-      def initialize_copy(*args)
-        @ios = @ios.clone unless @ios.nil?
+      def initialize_copy(cp)
+        @ios = cp.ios.clone unless cp.ios.nil?
       end
       def open(*args)
         @ios

data/lib/rio/scheme/temp.rb

@@ -36,7 +36,7 @@
 #
 require 'tmpdir'
 module RIO
-  module Temp
+  module Temp #:nodoc: all
     RESET_STATE = 'Temp::Reset'
 
     require 'rio/rl/base'
@@ -55,7 +55,7 @@ module RIO
       def scheme() self.class.const_get(:RIOSCHEME) end
       def opaque()
         td = self.escape(@tmpdir.to_s)
-        td += '/' unless td.nil? or td.empty? or (td.ends_with?('/') and td != '/')
+        td += '/' unless td.nil? or td.empty? or (td != '/' and td[-1] == ?/)
         td + self.escape(@prefix)
       end
       

data/lib/rio/state.rb

@@ -166,7 +166,7 @@ module RIO
 
       # Section: Error Handling
       def gofigure(sym,*args)
-        cs = "#{sym}("+args.map(&:to_s).join(',')+")"
+        cs = "#{sym}("+args.map{|el| el.to_s}.join(',')+")"
         msg = "Go Figure! rio('#{self.to_s}').#{cs} Failed"
         error(msg,sym,*args)
       end

data/lib/rio/stream/open.rb

@@ -81,17 +81,17 @@ module RIO
 end
 
 
-
+require 'rio/util'
 module RIO
   module Stream
     class Open < Base
       def size() 
         self.contents.size
       end
-      OUTPUT_SYMS = [:print,:printf,:puts,:putc,:write,
-                     :print!,:printf!,:puts!,:putc!,:write!,
-                     :put_,:putrec,:putrec!,:<,:<<
-      ].build_hash { |sym| [sym.to_s,1] }
+      OUTPUT_SYMS = Util::build_sym_hash([:print,:printf,:puts,:putc,:write,
+                                          :print!,:printf!,:puts!,:putc!,:write!,
+                                          :put_,:putrec,:putrec!,:<,:<< ])
+
       def sym_state(sym,im,om)
        if OUTPUT_SYMS[sym.to_s] or RIO::Ext::OUTPUT_SYMS[sym.to_s]
          om ||= (sym.to_s == '<<' ? 'a' : 'w')
@@ -192,10 +192,13 @@ module RIO
         cx['retrystate'] = nil
         self
       end
-      def getrec()
+      def get()
         self.close_.softreset
         nil
       end
+      alias :getline :get
+      alias :getrow :get
+      alias :getrec :get
 
       def check?() true end
       def base_state() 'Stream::Reset'  end

data/lib/rio/util.rb

@@ -0,0 +1,49 @@
+#--
+# =============================================================================== 
+# Copyright (c) 2005, Christopher Kleckner
+# All rights reserved
+#
+# This file is part of the Rio library for ruby.
+#
+# Rio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Rio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Rio; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# =============================================================================== 
+#++
+#
+# To create the documentation for Rio run the command
+#  rake rdoc
+# from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
+#
+# Suggested Reading
+# * RIO::Doc::SYNOPSIS
+# * RIO::Doc::INTRO
+# * RIO::Doc::HOWTO
+# * RIO::Rio
+#
+# <b>Rio is pre-alpha software. 
+# The documented interface and behavior is subject to change without notice.</b>
+
+
+module RIO
+  module Util #:nodoc: all
+    def build_sym_hash(syms)
+      result = {}
+      syms.each do |sym|
+        result[sym.to_s] = 1
+      end
+      result
+    end
+    module_function :build_sym_hash
+  end
+end

data/lib/rio/version.rb

@@ -39,7 +39,7 @@
 module RIO
   # :stopdoc:
   module Version #:nodoc: all
-    VERSION = '0.3.6'
+    VERSION = '0.3.7'
 
     N = VERSION.split('.').freeze
     MAJOR = N[0].freeze

data/test/tc/all.rb

@@ -2,7 +2,8 @@ require 'test/unit'
 require 'tc/testcase'
 
 #require 'tc/yaml'
-require 'tc/piper'
+require 'tc/dir_iter'
+require 'tc/piper' unless $mswin32
 require 'tc/cmdpipe'
 require 'tc/base'
 require 'tc/split'
@@ -39,6 +40,7 @@ require 'tc/eq'
 require 'tc/expand_path'
 require 'tc/ext'
 require 'tc/getrec'
+require 'tc/get'
 require 'tc/lines'
 require 'tc/methods'
 require 'tc/misc'

data/test/tc/cd1.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_cd1 < Test::RIO::TestCase

data/test/tc/clearsel.rb

@@ -13,8 +13,7 @@ class TC_RIO_clearsel < Test::Unit::TestCase
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  require 'extensions/symbol'
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def mkafile(*args)
     file = rio(*args)
     file < (0..1).map { |i| "L#{i}:#{file.to_s}\n" }

data/test/tc/copy-from.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_copyfrom < Test::RIO::TestCase

data/test/tc/copy-to.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_copy_to < Test::RIO::TestCase

data/test/tc/copyarray.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_copyarray < Test::Unit::TestCase
@@ -111,7 +108,7 @@ class TC_copyarray < Test::Unit::TestCase
     out = rio('out').delete!.mkpath
     assert(out[].empty?)
     inputdir = rio(@d[1])
-    out < inputdir[].map(&:to_s)
+    out < inputdir[].map{|el| el.to_s}
     assert_equal(@l[0],rio(out,@f[0].basename).lines[])
     assert_equal(@l[1],rio(out,@f[1].basename).lines[])
     assert_equal(@l[0],rio(out,@f[0]).lines[])

data/test/tc/copydir.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_copydir < Test::RIO::TestCase

data/test/tc/copydirlines.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_copydirlines < Test::RIO::TestCase

data/test/tc/copynonex.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_copynonex < Test::RIO::TestCase

data/test/tc/csv.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 class TC_csv < Test::Unit::TestCase
   include RIO_TestCase

data/test/tc/dir.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 class TC_dir < Test::Unit::TestCase
   include RIO_TestCase

data/test/tc/dir_iter.rb

@@ -0,0 +1,384 @@
+#!/usr/local/bin/ruby
+if $0 == __FILE__
+  Dir.chdir File.dirname(__FILE__)+'/../'
+  $:.unshift File.expand_path('../lib/')
+end
+
+if ENV['TEST_RIO'] == 'gem'
+  require 'rubygems'
+  require_gem 'rio'
+else
+  require 'rio'
+end
+
+require 'tc/testcase'
+
+class TC_dir_iter < Test::RIO::TestCase
+  @@once = false
+  @@exp = {}
+  def self.once
+    @@once = true
+    (0..3).each { |n_ents|
+      d = rio('d'+n_ents.to_s).delete!.mkdir
+      @@exp[d.to_s] = []
+      d.chdir { |dir|
+        (0...n_ents).each { |fnum|
+          @@exp[d.to_s] << rio('f'+fnum.to_s).touch
+        }
+      }
+    }
+  end
+  def setup
+    super
+    self.class.once unless @@once
+  end
+  def otest_dir
+    (1..1).each do |n_ents|
+      get_each_dir(n_ents)
+    end
+  end
+  def doem(&block)
+    rio('.').each { |d|
+      ma = /d(\d)/.match(d.to_s)
+      n_ents = ma[1].to_i
+      exp = @@exp[d.to_s]
+      d.chdir { |dir|
+        yield(dir,n_ents,exp)
+      }
+    }
+  end
+  def test_ss
+    doem { |d,n,exp|
+      ans = d[]
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_each
+    doem { |d,n,exp|
+      ans = []
+      d.each { |e| ans << e }
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_read
+    doem { |d,n,exp|
+      ans = []
+      while e = d.read
+        ans << e
+      end
+      ans.reject! { |el| el =~ /^\.{1,2}$/ }
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_each_get_break
+    doem { |d,n,exp|
+      ans = []
+      d.each { |e| 
+        ans << e 
+        break
+      }
+      assert_array_equal(exp[0..0],ans)
+      ent = d.get
+      assert_equal(exp[1],ent)
+      ent2 = d.get
+      if ent.nil?
+        assert_equal(exp[0],ent2)
+      else
+        assert_equal(exp[2],ent2)
+      end
+    }
+  end
+  def test_each_get
+    doem { |d,n,exp|
+      ans = []
+      d.each { |e| 
+        ans << e 
+      }
+      assert_array_equal(exp,ans)
+      ent = d.get
+      assert_equal(exp[0],ent)
+    }
+  end
+  def test_each_get_nceof
+    doem { |d,n,exp|
+      ans = []
+      d.nocloseoneof.each { |e| 
+        ans << e 
+        break
+      }
+      assert_array_equal(exp[0..0],ans)
+      ent = d.get
+      assert_equal(exp[1],ent)
+      ent2 = d.get
+      assert_equal(exp[2],ent2)
+    }
+  end
+  def test_each_get_nac
+    doem { |d,n,exp|
+      ans = []
+      d.noautoclose.each { |e| 
+        ans << e 
+        break
+      }
+      assert_array_equal(exp[0..0],ans)
+      ent = d.get
+      assert_equal(exp[1],ent)
+      ent2 = d.get
+      assert_equal(exp[2],ent2)
+    }
+  end
+  def test_get_get
+    doem { |d,n,exp|
+      ans = []
+      while e = d.get
+        ans << e
+      end
+      while e = d.get
+        ans << e
+      end
+      assert_array_equal(exp+exp,ans)
+    }
+  end
+  def test_get_get_nac
+    doem { |d,n,exp|
+      ans = []
+      d.noautoclose
+      while e = d.get
+        ans << e
+      end
+      while e = d.get
+        ans << e
+      end
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_each_each
+    doem { |d,n,exp|
+      ans = []
+      d.each { |e| 
+        ans << e 
+      }
+      d.each { |e|
+        ans << e
+      }
+      assert_array_equal(exp+exp,ans)
+    }
+  end
+  def test_each_each_nac
+    doem { |d,n,exp|
+      ans = []
+      d.noautoclose.each { |e| 
+        ans << e 
+      }
+      d.each { |e|
+        ans << e
+      }
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_get
+    doem { |d,n,exp|
+      ans = []
+      while e = d.get
+        ans << e
+      end
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_get_select
+    doem { |d,n,exp|
+      ans = []
+      d.entries(/1/)
+      while e = d.get
+        ans << e
+      end
+      exp = exp.select { |el| el =~ /1/ }
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_get_skip
+    doem { |d,n,exp|
+      ans = []
+      d.skip(/1/)
+      while e = d.get
+        ans << e
+      end
+      exp = exp.reject { |el| el =~ /1/ }
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_get_skip_files
+    doem { |d,n,exp|
+      ans = []
+      d.skip.files(/1/)
+      while e = d.get
+        ans << e
+      end
+      exp = exp.reject { |el| el =~ /1/ }
+      assert_array_equal(exp,ans)
+    }
+  end
+  def test_get_skipfiles
+    doem { |d,n,exp|
+      ans = []
+      d.skipfiles(/1/)
+      while e = d.get
+        ans << e
+      end
+      exp = exp.reject { |el| el =~ /1/ }
+      assert_array_equal(exp,ans)
+    }
+  end
+  def get_each_dir(n_ents)
+    expa = []
+    d = rio('dir').delete!.mkdir
+    (0..n_ents-1).each { |n| 
+      expa << (d/'f'+n.to_s).touch
+    }
+    
+    d = rio('dir')
+    assert_array_equal(expa,d[])
+
+    begin
+      d = rio('dir')
+      ans = []
+      d.each { |ent| ans << ent }
+      assert_equal(expa,ans)
+    end
+    begin
+      d = rio('dir')
+      ans = []
+      while ent = d.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+    begin
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+
+    return
+    #  $trace_states = true
+
+    # iterate twice using #get (no auto close)
+    begin
+      f = rio('f.txt').nocloseoneof
+      ans = []
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+
+    # iterate using #get then using #each (no auto close)
+    begin
+      f = rio('f.txt').nocloseoneof
+      ans = []
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+    
+    # iterate using #each then using #get (no auto close)
+    begin
+      f = rio('f.txt').nocloseoneof
+      ans = []
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+    
+    # iterate twice using #get (with auto close)
+    begin
+      f = rio('f.txt')
+      ans = []
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa+expa,ans)
+    end
+    
+    # assure get returns nil once after iteration using #get (with auto close)
+    begin
+      f = rio('f.txt')
+      ans = []
+
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+
+      rec = f.get
+      assert_nil(rec)
+
+      rec = f.get
+      assert_equal(expa[0],rec)
+    end
+
+    begin
+      f = rio('f.txt')
+      ans = []
+
+      rec = f.get
+      assert_equal(expa[0],rec)
+      ans << rec unless rec.nil?
+      f.each do |rec|
+        ans << rec
+      end
+      rec = f.get
+      assert_nil(rec)
+    end
+
+    begin
+      f = rio('f.txt')
+      ans = []
+
+      (0...n_lines).each do |n|
+        rec = f.get
+        assert_equal(expa[n],rec)
+      end
+      rec = f.get
+      assert_nil(rec)
+
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+
+    begin
+      f = rio('f.txt')
+      ans = []
+
+      (0...n_lines).each do |n|
+        rec = f.get
+        assert_equal(expa[n],rec)
+      end
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+  end
+end