rio 0.3.3 → 0.3.4

data/lib/rio/{filter/chomp.rb → ops/construct.rb}

@@ -36,26 +36,18 @@
 
 
 module RIO
-  module Filter #:nodoc: all
-    module Chomp
-      module IOE
-        def gets(*args) super.chomp end
-        def readline(*args) super.chomp end
-        def each_line(*args,&block)
-          super { |l|
-            yield l.chomp
-          }
-        end
-        def readlines(*args) super.map(&:chomp) end
-      end
-      include IOE
-#      def self.extend_object(ioh)
-#        super
-#        cio = ioh.ios.clone
-#        cio.extend(IOE)
-#        ioh.iostack.push(cio)
-#      end
+  module Ops
+    module Construct
+      def strio(*args) new_rio(:strio,*args) end
+      def stdio(*args) new_rio(:stdio,*args) end
+      def stderr(*args) new_rio(:stderr,*args) end
+      def temp(*args)  new_rio(:temp,*args)  end
+      def tempfile(*args)  new_rio(:tempfile,*args)  end
+      def tempdir(*args)  new_rio(:tempdir,*args)  end
+      def tcp(*args)  new_rio(:tcp,*args)  end
+      def cmdio(*args)  new_rio(:cmdio,*args)  end
+      def sysio(*args)  new_rio(:sysio,*args)  end
+      def fd(*args)  new_rio(:fd,*args)  end
     end
   end
 end
-__END__

data/lib/rio/ops/create.rb

@@ -72,6 +72,9 @@ module RIO
           new_rio(Impl::U.rootdir(),*args,&block) 
         end
         alias :root :rootpath
+        def cleanpath(*args)
+          new_rio(Impl::U.cleanpath(fspath,*args))
+        end
       end
     end
   end

data/lib/rio/ops/dir.rb

@@ -122,7 +122,7 @@ module RIO
     module Dir
       module Existing
         def selective?
-          %w[sel nosel stream_sel stream_nosel].any? { |k| cx.has_key?(k) }
+          %w[entry_sel stream_sel stream_nosel].any? { |k| cx.has_key?(k) }
         end
         def mkdir(*args) self end
         def mkpath(*args) self end
@@ -178,7 +178,7 @@ module RIO
         include Cp::Dir::Output
         public
 
-        def entries(*args,&block) _set_select('entries','sel',:true?,*args,&block) end
+        def entries(*args,&block) _set_select('entries',*args,&block) end
 
         def each(*args,&block)
           # p callstr('each',*args)
@@ -217,10 +217,16 @@ module RIO
             nil
           end
         end
-
+        def handle_skipped
+          #return unless cx.has_key?('skip_args') or cx['skipping']
+          return self unless cx.has_key?('skip_args')
+          args = cx['skip_args'] || []
+          self.skipentries(*args)
+        end
         def each_(*args,&block)
           #p "#{callstr('each_',*args)} sel=#{cx['sel'].inspect} nosel=#{cx['nosel'].inspect}"
-          sel = Match::Entry::Selector.new(cx['sel'],cx['nosel'])
+          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 =~ /^\.(\.)?$/
@@ -234,7 +240,7 @@ module RIO
               end
 
               if cx.has_key?('all') and erio.directory?
-                rsel = Match::Entry::Selector.new(cx['r_sel'],cx['r_nosel'])
+                rsel = Match::Entry::SelectorClassic.new(cx['r_sel'],cx['r_nosel'])
                 _add_recurse_iter_cx(erio).each(&block) if rsel.match?(erio)
               end
               
@@ -277,7 +283,7 @@ module RIO
           }
           ario.cx = new_cx
         end
-        CX_DIR_ITER_KEYS = %w[sel nosel]
+        CX_DIR_ITER_KEYS = %w[entry_sel]
         CX_STREAM_ITER_KEYS = %w[stream_rectype stream_itertype stream_sel stream_nosel]
         def _add_iter_cx(ario)
           if nostreamenum?

data/lib/rio/ops/either.rb

@@ -97,10 +97,24 @@ module RIO
         end
 
         def ss_type?
-          return 'entries' if cx['ss_type'].nil?
-          return cx['ss_type'] if %w[files dirs entries nofiles nodirs noentries].include?(cx['ss_type'])  
-          nil
+          case cx['ss_type']
+          when nil
+            'entries'
+          when 'files', 'dirs', 'entries', 'skipfiles', 'skipdirs', 'skipentries'
+            cx['ss_type'] 
+          else
+            nil
+          end
+        end
+
+        require 'Pathname'
+        def realpath
+          new_rio(Impl::U.realpath(fspath))
+        end
+        def mountpoint?
+          Impl::U.mountpoint?(fspath)
         end
+
       end
 
       module ExistOrNot

data/lib/rio/ops/path.rb

@@ -75,6 +75,7 @@ module RIO
         def size(*args) Impl::U.size(self.to_s,*args) end 
         def size?(*args) Impl::U.size?(self.to_s,*args) end 
         def zero?(*args) Impl::U.zero?(self.to_s,*args) end
+        def root?(*args) Impl::U.root?(self.to_s) end
 
       end
       module URI
@@ -173,7 +174,7 @@ module RIO
         end
 
         def +(arg)
-          new_rio(softreset.to_s + ensure_rio(arg).to_s)
+          new_rio(softreset.to_str + ensure_rio(arg).to_str)
         end
 
         private
@@ -256,12 +257,14 @@ module RIO
   end
 end
 require 'rio/ops/create'
+require 'rio/ops/construct'
 module RIO
   module Ops
     module Path
       module Empty
         include Ops::Path::Create
         include Ops::Path::URI
+        include Ops::Construct
       end
       module ExistOrNot
         def symlink(d) 

data/lib/rio/ops/stream/input.rb

@@ -164,10 +164,15 @@ module RIO
 
         def each_record_init_
         end
-
+        def handle_skipped
+          return self unless cx.has_key?('skip_args')
+          args = cx['skip_args'] || []
+          self.skiprecords(*args)
+        end
         def create_selrej()
           sel_args = cx['stream_sel']
           nosel_args = cx['stream_nosel']
+          handle_skipped
           selrej = RIO::Match::Record::SelRej.new(self,sel_args,nosel_args)
           [selrej,selrej.rangetops]
         end

data/lib/rio/ops/stream/read.rb

@@ -40,11 +40,9 @@ module RIO
   module Ops
     module Stream
       module Read
-        def slurp() 
+        def contents() 
           auto { ioh.gets(nil) }
         end
-        alias :to_string :slurp
-        alias :contents :slurp
         def readlines(*args)
           auto { ioh.readlines(*args) }
         end

data/lib/rio/{context/chomp.rb → prompt.rb}

@@ -34,20 +34,24 @@
 # <b>Rio is pre-alpha software. 
 # The documented interface and behavior is subject to change without notice.</b>
 
+#
+
+require 'rio'
 
-require 'rio/context/cxx.rb'
 module RIO
-  module Cx
-    module Methods
-      require 'rio/filter/chomp'
-      def chomp(arg=true,&block)
-        cx['chomp'] = arg
-        add_filter(Filter::Chomp) if arg and self.ioh
-        each(&block) if block_given?
-        self 
-      end
-      def chomp?() cxx?('chomp') end
-      def nochomp(arg=false,&block) chomp(arg,&block) end
-    end
+  def prompt(str="")
+    rio(?-).strip.print(str).gets
   end
+  module_function :prompt
+end
+
+if $0 == __FILE__
+  eval DATA.read, nil, $0, __LINE__+4
 end
+
+__END__
+
+puts
+puts("Run the tests that came with the distribution")
+puts("From the distribution directory use 'test/runtests.rb'")
+puts

data/lib/rio/rl/base.rb

@@ -130,7 +130,7 @@ module RIO
       def to_s() self.fspath || '' end
       def ==(other) self.to_s == other.to_s end
       def ===(other) self == other end
-      def =~(other) other =~ self.to_s end
+      def =~(other) other =~ self.to_str end
       def length() self.to_s.length end
       def fspath() nil end
       def path() nil end

data/lib/rio/rl/builder.rb

@@ -113,7 +113,9 @@ module RIO
           cl = Factory.instance.riorl_class(a0.scheme)
           o = cl.new(a0,*a) unless cl.nil?
           return o
-        when ?? , ?= , ?_ , ?",?[,?#,?`
+        when ::Symbol
+          a[0] = 'rio:' + a[0].to_s + ':'
+        when ?? , ?= , ?_ , ?", ?[, ?#, ?`
           a[0] = 'rio:'+CHMAP[a[0]]+':'
         when ?-
           a[0] = ( a.size == 1 ? 'rio:'+CHMAP[a[0]]+':' : 'rio:cmdio:' )

data/lib/rio/state.rb

@@ -40,6 +40,7 @@ require 'rio/context'
 require 'rio/context/methods'
 require 'rio/ext'
 require 'rio/symantics'
+require 'rio/filter'
 $trace_states = false
 module RIO
 
@@ -49,7 +50,7 @@ module RIO
     # the abstract state from which all are derived
     # this level handles 
     # * some basic house keeping methods
-    # * the methods to communicate with the fs object
+    # * the methods to communicate with the rio object
     # * the state changing mechanism
     # * and some basic error handling stubs
     class Base
@@ -88,6 +89,7 @@ module RIO
       def self.new_r(riorl)
         new.init(riorl,Cx::Vars.new( { 'closeoneof' => true, 'closeoncopy' => true } ))
       end
+
       def init(riorl,cntx,iohandle=nil)
         @rl = riorl
         @cx = cntx
@@ -108,7 +110,7 @@ module RIO
 
       # the method for changing states
       # it's job is create an instance of the next state
-      # and change the value in the handle that is shared with the fs object
+      # and change the value in the handle that is shared with the rio object
       def become(new_class,*args)
         p "become : #{self.class.to_s} => #{new_class.to_s} (#{self.mode?})" if $trace_states
 #
@@ -121,9 +123,11 @@ module RIO
           raise
         end
       end
+
       def method_missing_trace_str(sym,*args)
         "missing: "+self.class.to_s+'['+self.to_url+']'+'.'+sym.to_s+'('+args.join(',')+')'
       end
+
       def method_missing(sym,*args,&block)
         p method_missing_trace_str(sym,*args) if $trace_states
 
@@ -166,21 +170,11 @@ module RIO
 
 
       extend Forwardable
-#      def_instance_delegators(:rl,:path,:to_s,:fspath,:opaque,:host,:length)
       def_instance_delegators(:rl,:path,:to_s,:fspath,:length)
 
-#      def fspath() @rl.fspath end
-#      def path() @rl.path() end
-#      def opaque() @rl.opaque() end
-#      def scheme() @rl.scheme() end
-#      def host() @rl.host() end
-#      def to_s() @rl.to_s() end
-#      def length() @rl.length end
-
-
       def ==(other) @rl == other end
       def ===(other) self == other end
-      def =~(other) other =~ self.to_s end
+      def =~(other) other =~ self.to_str end
       def to_url() @rl.url end
       def to_uri() @rl.uri end
       alias to_str to_s

data/lib/rio/stream.rb

@@ -43,13 +43,13 @@ require 'rio/ops/stream/output'
 require 'rio/ext'
 
 require 'rio/filter/gzip'
-require 'rio/filter/chomp'
+#require 'rio/filter/chomp'
+#require 'rio/filter/strip'
 require 'rio/filter/closeoneof'
 
 module RIO
 
   module Stream #:nodoc: all
-
     class Reset < Base
       # Mixin the appropriate ops
       #include Ops::Path::Str
@@ -108,6 +108,7 @@ module RIO
     class Input < IOBase
       include Ops::Stream::Input
       include Ini
+      include Filters
       def initialize_copy(*args)
         #p callstr('enter Input:initialize_copy',*args)
         super
@@ -117,10 +118,9 @@ module RIO
       def add_extensions()
         Ext::Input.add_extensions(self)
       end
-
       def add_filters
         add_filter(Filter::GZipRead) if gzip?
-        add_filter(Filter::Chomp) if chomp?
+        add_line_filters()
         if closeoneof?
           add_filter(Filter::CloseOnEOF)
           ioh.oncloseproc = proc { self.on_closeoneof }
@@ -152,6 +152,7 @@ module RIO
       include Ops::Stream::Input
       include Ops::Stream::Output
       include Ini
+      include Filters
       
       def initialize_copy(*args)
         super
@@ -166,8 +167,10 @@ module RIO
         Ext::Input.add_extensions(self)
         Ext::Output.add_extensions(self)
       end
+
       def add_filters
-        add_filter(Filter::Chomp) if chomp?
+        add_line_filters()
+
         if closeoneof?
           add_filter(Filter::CloseOnEOF)
           ioh.oncloseproc = proc { self.on_closeoneof }

data/lib/rio/stream/open.rb

@@ -83,7 +83,7 @@ module RIO
   module Stream
     class Open < Base
       def size() 
-        self.slurp.size
+        self.contents.size
       end
       OUTPUT_SYMS = [:print,:printf,:puts,:putc,:write,
                      :print!,:printf!,:puts!,:putc!,:write!,

data/lib/rio/version.rb

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

data/test/mswin32.rb

@@ -17,7 +17,7 @@ require 'tc/misc'
 require 'tc/pa'
 require 'tc/paths'
 require 'tc/qae'
-require 'tc/nolines'
+require 'tc/skiplines'
 require 'tc/records'
 require 'tc/expand_path'
 require 'tc/clearsel'

data/test/runtests_gem.rb

@@ -3,7 +3,7 @@ Dir.chdir File.dirname(__FILE__)
 #$:.unshift File.expand_path('../lib/')
 
 require 'rubygems'
-require_gem 'rio'
+require 'rio'
 
 
 #require 'rio'

data/test/tc/all.rb

@@ -1,6 +1,9 @@
 require 'test/unit'
 require 'tc/testcase'
 
+require 'tc/skip'
+require 'tc/skiplines'
+require 'tc/selnosel'
 require 'tc/csv'
 require 'tc/csv2'
 require 'tc/csv_columns'

data/test/tc/copy-from.rb

@@ -43,18 +43,18 @@ class TC_copyfrom < Test::RIO::TestCase
     str = "HelloWorld\n"
     ario < str
     assert(ario.closed?,"Rio closes after copy-from string")
-    assert_equal(str,ario.slurp)
+    assert_equal(str,ario.contents)
     ario << str
-    assert_equal(str+str,ario.slurp)
+    assert_equal(str+str,ario.contents)
   end
 
   def test_arrayofstrings_file
     ario = rio('oua').delete!.puts!("If you are seeing this, rio < array is broken")
     str = "HelloWorld\n"
     ario < [str]
-    assert_equal(str,ario.slurp)
+    assert_equal(str,ario.contents)
     ario << [str]
-    assert_equal(str+str,ario.slurp)
+    assert_equal(str+str,ario.contents)
   end
 
 
@@ -85,7 +85,7 @@ class TC_copyfrom < Test::RIO::TestCase
     str = "HelloWorld\n"
     ario < str
     assert(ario.file?,"Copy from string creates a file")
-    assert_equal(str,ario.slurp)
+    assert_equal(str,ario.contents)
   end
 
   def test_arrayofstrings_nonex
@@ -93,7 +93,7 @@ class TC_copyfrom < Test::RIO::TestCase
     str = "HelloWorld\n"
     ario < [str]
     assert(ario.file?,"Copy from array of strings creates a file")
-    assert_equal(str,ario.slurp)
+    assert_equal(str,ario.contents)
   end
 
   def test_simple_rio0
@@ -129,8 +129,8 @@ class TC_copyfrom < Test::RIO::TestCase
     url = 'http://localhost/rio/hw.html'
     urio = rio(url)
     ario < urio
-    exp = urio.slurp
-    assert_equal(exp,ario.slurp)
+    exp = urio.contents
+    assert_equal(exp,ario.contents)
   end
   def test_uri_rio_to_dir
     ario = rio('ud').delete!.mkdir
@@ -141,7 +141,7 @@ class TC_copyfrom < Test::RIO::TestCase
     $trace_states = false
     drio = rio(ario,urio.filename)
     assert(drio.file?)
-    assert(urio.slurp,drio.slurp)
+    assert(urio.contents,drio.contents)
   end
   def test_uri_string_to_dir
     ario = rio('uds').delete!.mkdir
@@ -152,28 +152,28 @@ class TC_copyfrom < Test::RIO::TestCase
     $trace_states = false
     drio = rio(ario,urio.filename)
     assert(drio.file?)
-    assert(urio.slurp,drio.slurp)
+    assert(urio.contents,drio.contents)
   end
   def test_url_string_to_file
     ario = rio('out').delete!.touch
     url = 'http://localhost/rio/hw.html'
     ario < url
     exp = url
-    assert_equal(exp,ario.slurp)
+    assert_equal(exp,ario.contents)
   end
   def test_url_array_to_file
     ario = rio('out').delete!.touch
     url = 'http://localhost/rio/hw.html'
     ario < [url]
     exp = url
-    assert_equal(exp,ario.slurp)
+    assert_equal(exp,ario.contents)
   end
   def test_url_string_to_nonex
     ario = rio('outz').delete!
     url = 'http://localhost/rio/hw.html'
     ario < url
     exp = url
-    assert_equal(exp,ario.slurp)
+    assert_equal(exp,ario.contents)
   end
   def test_simple_ary
     dst = rio('dst').delete!.mkpath