rio 0.3.3 → 0.3.4

data/lib/rio/context.rb

@@ -85,7 +85,7 @@ module RIO
         str
       end
       def bequeath()
-        keys = %w[chomp closeoneof rename]
+        keys = %w[chomp strip closeoneof rename]
         q = {}
         p = {}
         ncx = Vars.new(q,p)

data/lib/rio/context/dir.rb

@@ -42,24 +42,66 @@ require 'rio/entrysel'
 module RIO
   module Cx
     module Methods
-      def dir_iter?() cx.has_key?('sel') || cx.has_key?('nosel') end
+      def dir_iter?() cx.has_key?('entry_sel') end
       
       private
 
-      def _addselkey(key,sym,*args)
-        cx[key] ||= Match::Entry::Sels.new
-        cx[key] << Match::Entry::List.new(sym,*args)
-        self
-      end
+      def _set_entry_sel_args(sel_type,*args)
+        #p callstr('_set_entry_sel_args',sel_type,*args)
 
+        es = (cx['entry_sel'] ||= {})
+        eargs = (es['args'] ||= {})
+        eargs[sel_type] ||= []
+        eargs[sel_type] += args
+      end
 
-      def _set_select(ss_type,key,sym,*args,&block)
+      def _set_select(ss_type,*args,&block)
         cx['ss_type'] = ss_type
-        _addselkey(key,sym,*args)
+        _set_entry_sel_args(ss_type,*args)
         return each(&block) if block_given?
         self
       end
 
+      def _selkey(sel_type)
+        #p callstr('_selkey',sel_type,skipping?)
+        if skipping?
+          cx['skipping'] = false
+          'skip' + sel_type
+        else
+          sel_type
+        end
+      end
+      public
+
+      def entries(*args,&block) 
+        _set_select(_selkey('entries'),*args,&block) 
+      end
+      def files(*args,&block)   
+        _set_select(_selkey('files'),*args,&block)   
+      end
+      def dirs(*args,&block)    
+        _set_select(_selkey('dirs'),*args,&block)     
+      end
+
+      def skipentries(*args,&block) 
+        _set_select('skipentries',*args,&block) 
+      end
+      def skipfiles(*args,&block)
+        _set_select('skipfiles',*args,&block)
+      end
+      def skipdirs(*args,&block)
+        _set_select('skipdirs',*args,&block)
+      end
+
+      private
+
+      def _addselkey(key,sym,*args)
+        #p callstr('_addselkey',key,sym,*args)
+        cx[key] ||= Match::Entry::Sels.new
+        cx[key] << Match::Entry::List.new(sym,*args)
+        self
+      end
+
       public
 
       def recurse(*args,&block)
@@ -72,21 +114,6 @@ module RIO
         return each(&block) if block_given?
         self
       end
-      def entries(*args,&block) _set_select('entries','sel',:true?,*args,&block) end
-      def files(*args,&block)   _set_select('files','sel',:file?,*args,&block)   end
-      def dirs(*args,&block)    _set_select('dirs','sel',:dir?,*args,&block)     end
-
-      def noentries(*args,&block) 
-        _set_select('noentries','nosel',:true?,*args,&block) 
-      end
-      def nofiles(*args,&block)
-        _addselkey('sel',:file?) unless args.empty?
-        _set_select('nofiles','nosel',:file?,*args,&block)
-      end
-      def nodirs(*args,&block)
-        _addselkey('sel',:dir?) unless args.empty?
-        _set_select('nodirs','nosel',:dir?,*args,&block)
-      end
     end
   end
 end

data/lib/rio/context/methods.rb

@@ -40,19 +40,21 @@ require 'rio/iomode'
 
 require 'rio/context/stream'   
 require 'rio/context/dir'   
-require 'rio/context/chomp'   
+require 'rio/context/skip'   
+require 'rio/filter'   
 require 'rio/context/closeoneof'   
 require 'rio/context/gzip'   
 
 module RIO
   module Cx #:nodoc: all
     module SS
-      STREAM_KEYS = %w[records lines rows bytes nolines norows norecords nobytes]
-      ENTRY_KEYS = %w[entries files dirs nofiles nodirs noentries]
+      STREAM_KEYS = %w[records lines rows bytes skiplines skiprows skiprecords nobytes]
+      ENTRY_KEYS = %w[entries files dirs skipfiles skipdirs skipentries]
       KEYS = ENTRY_KEYS + STREAM_KEYS
     end
   end
 end
+
 module RIO
   module Cx
     module Methods

data/lib/rio/{cxdir.rb → context/skip.rb}

@@ -35,45 +35,33 @@
 # The documented interface and behavior is subject to change without notice.</b>
 
 
+require 'rio/context/cxx.rb'
+
 module RIO
-  module CxDir #:nodoc: all
-    private
-    
-    def _ss_keys()  Cx::SS::ENTRY_KEYS + Cx::SS::STREAM_KEYS end
-    CX_ALL_SKIP_KEYS = ['retrystate']
-    def _add_recurse_iter_cx(ario)
-      new_cx = ario.cx
-      cx.keys.reject { |k| CX_ALL_SKIP_KEYS.include?(k) }.each { |k|
-        new_cx.set_(k,cx[k])
-      }
-      ario.cx = new_cx
-      ario
-    end
-    def _add_cx(ario,keys)
-      new_cx = ario.cx
-      keys.each {|k|
-        next unless cx.has_key?(k)
-        new_cx.set_(k,cx[k])
-      }
-      ario.cx = new_cx
-    end
-    CX_DIR_ITER_KEYS = %w[sel nosel]
-    CX_STREAM_ITER_KEYS = %w[stream_rectype stream_itertype stream_sel stream_nosel]
-    def _add_iter_cx(ario)
-      if nostreamenum?
-        _add_cx(ario,CX_DIR_ITER_KEYS)
+  module Cx
+    module Methods
+      def _arg_skip(args)
+        #p callstr('_arg_skip',args,cx.inspect)
+        cx['ss_skipped'] = cx['ss_type'].sub(/^skip/,'') if cx['ss_type']
+        cx['ss_type'] = 'skip'
+        cx['skip_args'] = args
       end
-      _add_stream_iter_cx(ario)
-    end
-    def _add_stream_iter_cx(ario)
-      _add_cx(ario,CX_STREAM_ITER_KEYS)
-      new_cx = ario.cx
-      if stream_iter?
-        new_cx.set_('ss_args',cx['ss_args']) if cx.has_key?('ss_args')
-        new_cx.set_('ss_type',cx['ss_type']) if cx.has_key?('ss_type')
+      def _noarg_skip
+        cx['ss_skipped'] = cx['ss_type'].sub(/^skip/,'') if cx['ss_type']
+        cx['ss_type'] = 'skip'
+        cx['skipping'] = true
+      end
+      def skipping?() cx['skipping'] end
+      def skip(*args,&block)
+        if args.empty?
+          _noarg_skip
+        else
+          _arg_skip(args)
+        end
+        each(&block) if block_given?
+        self
       end
-      ario.cx = new_cx
-      ario
+
     end
   end
 end

data/lib/rio/context/stream.rb

@@ -72,6 +72,7 @@ module RIO
         else cx.set_('stream_itertype',rt)
         end
       end
+
       def _set_selargs(sa,sel=true,&block)
         key = (sel ? 'stream_sel' : 'stream_nosel')
         cx[key] = sa
@@ -96,52 +97,73 @@ module RIO
         _set_selargs(args,sel,&block)
       end
 
+      def _sel()
+        !skipping?
+      end
+      def _sel_key(key)
+        (skipping? ? 'skip'+key : key)
+      end
       public
 
       def lines(*args,&block)   
         #p callstr('lines',*args)
-        _set_sstype('lines')
-        _lines(args,&block)
+        if skipping?
+          cx['skipping'] = false
+          skiplines(*args,&block)
+        else
+          _set_sstype('lines')
+          _lines(args,_sel,&block)
+        end
       end
       def lines_(*args,&block) 
         #p callstr('lines_',*args)
         _set_sstype('lines',false)
-        _lines(args,true,false,&block)
+        _lines(args,_sel,false,&block)
       end
 
       def records(*args,&block) 
-        _set_sstype('records')
-        _records(args,&block)
+        if skipping?
+          cx['skipping'] = false
+          skiprecords(*args,&block)
+        else
+          _set_sstype('records')
+          _records(args,_sel,&block)
+        end
       end
       def records_(*args,&block) 
         _set_sstype('records',false)
-        _records(args,true,false,&block)
+        _records(args,_sel,false,&block)
       end
 
       def rows(*args,&block) 
-        _set_sstype('rows')
-        _rows(args,&block)
+        if skipping?
+          cx['skipping'] = false
+          skiprows(*args,&block)
+        else
+          _set_sstype('rows')
+          _rows(args,_sel,&block)
+        end
       end
       def rows_(*args,&block) 
         _set_sstype('rows',false)
-        _rows(args,true,false,&block)
+        _rows(args,_sel,false,&block)
       end
 
 
-      def nolines(*args,&block) 
-        #p callstr('nolines',*args)
+      def skiplines(*args,&block) 
+        #p callstr('skiplines',*args)
         self.lines() unless args.empty? or cx.has_key?('stream_sel')
-        _set_sstype('nolines')
+        _set_sstype('skiplines')
         _lines(args,false,&block)
       end
-      def norecords(*args,&block) 
+      def skiprecords(*args,&block) 
         self.records() unless args.empty? or cx.has_key?('stream_sel')
-        _set_sstype('norecords')
+        _set_sstype('skiprecords')
         _records(args,false,&block)
       end
-      def norows(*args,&block) 
+      def skiprows(*args,&block) 
         self.rows() unless args.empty? or cx.has_key?('stream_sel')
-        _set_sstype('norows')
+        _set_sstype('skiprows')
         _rows(args,false,&block)
       end
 

data/lib/rio/cp.rb

@@ -79,7 +79,6 @@ module RIO
       module Output
         include InOut
 
-
         protected
 
         def cpfrom_obj_(obj)
@@ -119,7 +118,10 @@ module RIO
             self
           }
         end
+        alias :copy_to :>
+        alias :append_to :>>
         private
+
         def _cpto_rio(arg,sym)
           ario = ensure_rio(arg)
           ario = ario.join(self.filename) if ario.dir?
@@ -132,10 +134,13 @@ module RIO
           }
         end
       end
+
       module Output
         include Util::Output
         def <<(arg) cpclose { _cpfrom(arg) } end
         def <(arg) cpclose { _cpfrom(arg) } end
+        alias :copy_from :<
+        alias :append_from :<<
 
         private
 
@@ -164,6 +169,8 @@ module RIO
         include Util::Output
         def <(arg) cpclose { self.iostate(:<) < arg } end
         def <<(arg) cpclose { self.iostate(:<<) << arg } end
+        alias :copy_from :<
+        alias :append_from :<<
       end
       module Input
         include Util::Input
@@ -173,6 +180,8 @@ module RIO
         def >>(arg) 
           spcp(arg) || cpclose(arg) { self.iostate(:>>) >> arg } 
         end
+        alias :copy_to :>
+        alias :append_to :>>
         def copy_as_file?(arg)
           arg.kind_of?(Rio) and arg.scheme == 'ftp'
         end
@@ -184,7 +193,6 @@ module RIO
             nil
           end
         end
-        alias :copy :>
       end
     end
   end
@@ -196,12 +204,15 @@ module RIO
         include Util::Output
         def <(arg) cpclose { self.iostate(:<) < arg } end
         def <<(arg) cpclose { self.iostate(:<<) << arg } end
+        alias :copy_from :<
+        alias :append_from :<<
       end
       module Input
         include Util::Input
         def >(arg) cpclose(arg) { self.iostate(:>) > arg } end
         def >>(arg) cpclose(arg) { self.iostate(:>>) >> arg } end
-        alias :copy :>
+        alias :copy_to :>
+        alias :append_to :>>
       end
     end
   end
@@ -213,6 +224,8 @@ module RIO
         include Util::Output
         def <<(arg)  _cpfrom(arg); self  end
         def <(arg)  _cpfrom(arg); self end
+        alias :copy_from :<
+        alias :append_from :<<
 
         private
 
@@ -225,7 +238,10 @@ module RIO
         def _cpfrom_rio(ario)
           #p callstr('_cpfrom_rio',ario)
           dest = self.join(ario.filename)
-          if ario.dir?
+          case
+          when ario.symlink?
+            ::File.symlink(ario.readlink.to_s,dest.to_s)
+          when ario.dir?
             dest.mkdir
             ario.nostreamenum.each do |el|
               dest < el
@@ -251,7 +267,8 @@ module RIO
           end
           self
         end
-        alias :copy :>
+        alias :copy_to :>
+        alias :append_to :>>
 
         private
 
@@ -284,6 +301,8 @@ module RIO
             _cpsrc(arg) << arg
           end
         end
+        alias :copy_from :<
+        alias :append_from :<<
 
         private
 

data/lib/rio/dir.rb

@@ -115,9 +115,9 @@ module RIO
         cx['retrystate'] = nil
         self
       end
-
-       def close_() 
-         #p callstr('close_')+" ioh=#{self.ioh} open?=#{open?}"
+      
+      def close_() 
+        #p callstr('close_')+" ioh=#{self.ioh} open?=#{open?}"
         return self unless self.open? 
         self.clear_selection
         self.ioh.close 
@@ -126,11 +126,12 @@ module RIO
         self
       end
       protected :close_
-
+      
+      CX_ENTRY_SEL_KEYS = %w[nostreamenum entry_sel skip_args ss_skipped]
       def clear_selection()
-        cx.delete('sel')
-        cx.delete('nosel')
-        cx.delete('nostreamenum')
+        CX_ENTRY_SEL_KEYS.each { |k|
+          cx.delete(k)
+        }
         self
       end
 

data/lib/rio/doc/HOWTO.rb

@@ -53,7 +53,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
 
 * Read a file into a string.
    # method 1
-   string = ario.slurp
+   string = ario.contents
    # method 2
    ario > string
 
@@ -61,7 +61,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 1
    ario >> string
    # method 2
-   string += ario.slurp
+   string += ario.contents
 
 * Read lines of a file into an array
    # method 1
@@ -111,13 +111,13 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 1
    rio('afile.gz').gzip > string
    # method 2
-   string = rio('afile.gz').gzip.slurp
+   string = rio('afile.gz').gzip.contents
 
 * Append a gzipped file into a string
    # method 1
    rio('afile.gz').gzip >> string
    # method 2
-   string += rio('afile.gz').gzip.slurp
+   string += rio('afile.gz').gzip.contents
 
 * Iterate through all the lines of a file
    # method 1
@@ -132,7 +132,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    rio('afile.gz').gzip { |line| ... }
 
 * Iterate through all non-empty lines of a gzipped file, with each line chomped
-   rio('afile.gz').gzip.chomp.nolines(:empty?) { |line| ... }
+   rio('afile.gz').gzip.chomp.skiplines(:empty?) { |line| ... }
 
 * Iterate through the first 100 lines of a file
    # method 1
@@ -142,7 +142,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    rio('afile.rb.gz').gzip.lines(0,/^\s*#/) { |line| ... }
 
 * Iterate through the lines of a ruby file that are neither empty nor comments, with all lines chomped
-   rio('afile.rb.gz').chomp.nolines(/^\s*#/,:empty?) { |line| ... }
+   rio('afile.rb.gz').chomp.skiplines(/^\s*#/,:empty?) { |line| ... }
 
 * Read all the comment lines from a ruby file into an array with all lines chomped
    # method 1
@@ -155,7 +155,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 1
    ario.chomp.lines(proc{ |line| line.length <= 1024}) > array
    # method 2
-   array = ario.chomp.nolines[proc{ |line| line.length > 1024}]
+   array = ario.chomp.skiplines[proc{ |line| line.length > 1024}]
    # method 3
    array = ario.chomp.lines(proc{ |line| line.length <= 1024}).to_a
 
@@ -240,21 +240,21 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 2
    array = ario.lines[proc{ |l| l.length > 128}]
    # method 3
-   array = ario.nolines[proc{ |l| l.length <= 128}]
+   array = ario.skiplines[proc{ |l| l.length <= 128}]
   
 * Copy all lines that do not start with 'zippy' into another file
    # method 1
-   ario.nolines(/^zippy/) > rio('another_file')
+   ario.skiplines(/^zippy/) > rio('another_file')
    # method 2
-   ario.lines.nolines(/^zippy/) > rio('another_file')
+   ario.lines.skiplines(/^zippy/) > rio('another_file')
    # method 3
-   rio('another_file') < ario.nolines(/^zippy/)
+   rio('another_file') < ario.skiplines(/^zippy/)
   
 * Copy the first 10 lines and lines starting with 'zippy', but exclude any lines longer than 128 bytes
    # method 1
-   ario.lines(0...10,/^zippy/).nolines(proc{ |l| l.length > 128}] > rio('another_file')
+   ario.lines(0...10,/^zippy/).skiplines(proc{ |l| l.length > 128}] > rio('another_file')
    # method 2
-   rio('another_file') < ario.lines(0...10,/^zippy/).nolines(proc{ |l| l.length > 128})
+   rio('another_file') < ario.lines(0...10,/^zippy/).skiplines(proc{ |l| l.length > 128})
   
 
 
@@ -313,19 +313,19 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
 
 * Put all files excluding those that are symlinks to files in an array
    # method 1
-   array = ario.nofiles[:symlink?]
+   array = ario.skipfiles[:symlink?]
    # method 2
-   array = ario.nofiles(:symlink?).files[]
+   array = ario.skipfiles(:symlink?).files[]
    # method 3
-   array = ario.nofiles(:symlink?).to_a
+   array = ario.skipfiles(:symlink?).to_a
    # method 4
-   array = ario.files.nofiles[:symlink?]
+   array = ario.files.skipfiles[:symlink?]
 
 * Put all entries that are not files (or symlinks to files) into an array
    # method 1
-   array = ario.nofiles[]
+   array = ario.skipfiles[]
    # method 2
-   array = ario.nofiles.to_a
+   array = ario.skipfiles.to_a
 
 * Put all entries that are symlinks to files into an array
    # method 1
@@ -335,15 +335,15 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
 
 * Put all directories except those named '.svn' into an array
    # method 1
-   array = ario.nodirs['.svn']
+   array = ario.skipdirs['.svn']
    # method 2
-   array = ario.nodirs[/^\.svn/]
+   array = ario.skipdirs[/^\.svn/]
    # method 3
-   array = ario.nodirs('.svn').to_a
+   array = ario.skipdirs('.svn').to_a
    # method 4
-   array = ario.nodirs('.svn').dirs[]
+   array = ario.skipdirs('.svn').dirs[]
    # method 5
-   array = ario.nodirs('.svn')[]
+   array = ario.skipdirs('.svn')[]
 
 
 ---
@@ -359,7 +359,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 2
    rio('dstfile') < rio('srcfile')
    # method 3
-   rip('dstfile').print!(rio('srcfile').slurp)
+   rip('dstfile').print!(rio('srcfile').contents)
 
 * Append the contents of one file to another file
    # method 1
@@ -367,7 +367,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 2
    rio('dstfile') << rio('srcfile')
    # method 3
-   rip('dstfile').a.print!(rio('srcfile').slurp)
+   rip('dstfile').a.print!(rio('srcfile').contents)
 
 * Copy the first 10 lines of one file to another file
    # method 1
@@ -389,7 +389,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 2
    rio('afile') < rio('http://ruby-doc.org/')
    # method 3
-   rio('afile').print!(rio('http://ruby-doc.org/').slurp)
+   rio('afile').print!(rio('http://ruby-doc.org/').contents)
 
 * Append the output of the daytime server running on the localhost to a file
    # method 1
@@ -416,7 +416,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 2
    rio('afile.gz').gzip < rio('afile')
    # method 3
-   rio('afile.gz').gzip.print!( rio('afile').slurp )
+   rio('afile.gz').gzip.print!( rio('afile').contents )
 
 * Create an ungzipped copy of a gzipped file
    # method 1
@@ -424,7 +424,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 2
    rio('afile.gz').gzip > rio('afile')
    # method 3
-   rio('afile').print!( rio('afile.gz').gzip.slurp )
+   rio('afile').print!( rio('afile.gz').gzip.contents )
 
 * Copy the first 100 lines of gzipped file on a webserver into a local file
    # method 1
@@ -448,9 +448,9 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
 
 * Count the lines of code in a directory tree of ruby source files
    # method 1
-   cnt = ario.all.files('*.rb').chomp.nolines(/^\s*#/,/^\s*$/).inject(0) { |sum,l|  sum += 1 }
+   cnt = ario.all.files('*.rb').chomp.skiplines(/^\s*#/,/^\s*$/).inject(0) { |sum,l|  sum += 1 }
    # method 2
-   cnt = ario.all.files('*.rb').chomp.nolines[/^\s*#/,/^\s*$/].size
+   cnt = ario.all.files('*.rb').chomp.skiplines[/^\s*#/,/^\s*$/].size
 
 * Concatanate the contents of all .txt files in a directory into an array
    # method 1
@@ -548,7 +548,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 4
    rio(?-) < rio('afile')
    # method 5
-   rio(?-).print(rio('afile').slurp)
+   rio(?-).print(rio('afile').contents)
 
 * Emulate a simplified unix 'head' command which reads from stdin and writes the first 10 lines to stdout
    # method 1
@@ -560,7 +560,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
 
 * Read the output of the 'ps' command into an array without the header line or the line representing
   the 'ps' command itself
-   ps =  rio(?-,'ps -a').nolines[0,/ps$/]
+   ps =  rio(?-,'ps -a').skiplines[0,/ps$/]
 
 * Run an external program, copying its input from one location and its output from another, 
   and make it look very much like a shell command.