rio 0.3.3 → 0.3.4

data/lib/rio/doc/MISC.rb

@@ -76,6 +76,7 @@ which can be chained to a Rio method as in this example or stored in a variable.
  array = ario.readlines
 
  ario = rio('afile')
+
 In this case the resource specified is a relative path. After the first line
 the Rio does know or care whether it
 is a path to a file nor whether it exists. Rio provides many methods that only deal with a resource
@@ -93,6 +94,7 @@ The rio constructor can be used to specify non-file-system resources, but for th
 our discussion to paths to entities on file-systems.
 
  array = ario.readlines
+
 Now that we have a Rio, we can call one of its methods; in this case _readlines_. This is an example of using
 a Rio as a proxy for the builtin IO#readlines. Given the method _readlines_, the Rio opens 'afile' for reading, 
 calls readlines on the resulting IO object, closes the IO object, and returns the lines read.
@@ -131,7 +133,7 @@ a second copy, we might do something like this:
  afile.rewind > rio('acopy2')
  afile.close
 
-Actually the 'thinking-process' of the Rio when it sees a copy-to operator is much more complex that described above.
+Actually the 'thinking process' of the Rio when it sees a copy-to operator is much more complex that described above.
 If its argument had been a rio referencing a directory, it would not have opened itself for reading, 
 but instead used FileUtils#cp to copy itself; if its argument had been a string, its contents would have ended up
 in the string; If its argument had been an array, its lines would been elements of that array; if its argument had 

data/lib/rio/doc/SYNOPSIS.rb

@@ -60,30 +60,37 @@ For the following assume:
  astring = ""
  anarray = []
 
-Copy a file into a string
- rio('afile') > astring 
+Copy or append a file to a string
+ rio('afile') > astring      # copy
+ rio('afile') >> astring     # append
 
-Copy a string into a file
- rio('afile') < astring 
+Copy or append a string to a file
+ rio('afile') < astring      # copy
+ rio('afile') << astring     # append
 
-Copy the chomped lines of a file into an array
- rio('afile').chomp > anarray
+Copy or append the lines of a file to an array
+ rio('afile') > anarray     
+ rio('afile') >> anarray
  
-Copy a file into another file
- rio('afile') > rio('another_file')
+Copy or append a file to another file
+ rio('afile') > rio('another_file')  
+ rio('afile') >> rio('another_file') 
 
-Copy a file into a directory
- rio('afile') > rio('adir')
+Copy a file to a directory
+ rio('adir') << rio('afile')
 
-Copy an entire directory structure into another directory
- rio('adir') > rio('another_directory')
+Copy a directory structure to another directory
+ rio('adir') >> rio('another_directory')
 
-Copy a web page into a file
+Copy a web-page to a file
  rio('http://rubydoc.org/') > rio('afile')
 
-Copy a file from a ftp server into a local file
- rio('ftp://host/afile.gz') > rio('afile.gz')
-
+Ways to get the chomped lines of a file into an array
+ anarray = rio('afile').chomp[]         # subscript operator
+ rio('afile').chomp > anarray           # copy-to operator
+ anarray = rio('afile').chomp.to_a      # to_a
+ anarray = rio('afile').chomp.readlines # IO#readlines
+ 
 Copy a gzipped file un-gzipping it
  rio('afile.gz').gzip > rio('afile')
 
@@ -102,11 +109,8 @@ Iterate over only the files in a directory
 Iterate over only the .rb files in a directory
  rio('adir').files('*.rb') { |entrio| ... }
 
-Iterate over only the directories in a directory
- rio('adir').dirs { |entrio| ... }
-
 Iterate over only the _dot_ files in a directory
- rio('adir').dirs(/^\./) { |entrio| ... }
+ rio('adir').files(/^\./) { |entrio| ... }
 
 Iterate over the files in a directory and its subdirectories, skipping '.svn' and 'CVS' directories 
  rio('adir').norecurse(/^\.svn$/,'CVS').files { |entrio| ... }
@@ -114,24 +118,15 @@ Iterate over the files in a directory and its subdirectories, skipping '.svn' an
 Create an array of the .rb entries in a directory
  anarray = rio('adir')['*.rb']
 
-Iterate over the .rb files in a directory and its subdirectories
- rio('adir').all.files('*.rb') { |entrio| ... }
-
 Create an array of the .rb entries in a directory and its subdirectories
  anarray = rio('adir').all['*.rb']
 
-Create an array of the .rb files in a directory and its subdirectories
- anarray = rio('adir').all.files['*.rb']
+Iterate over the .rb files in a directory and its subdirectories
+ rio('adir').all.files('*.rb') { |entrio| ... }
 
 Copy an entire directory structure and the .rb files within it
  rio('adir').dirs.files('*.rb') > rio('another_directory')
 
-Iterate over the chomped lines of a file
- rio('afile').chomp.lines { |line| ... }
-
-Put the chomped lines of a file into an array
- anarray = rio('afile').chomp.lines[]
-
 Iterate over the first 10 chomped lines of a file
  rio('afile').chomp.lines(0..9) { |line| ... }
 
@@ -154,10 +149,10 @@ Put chomped lines that start with 'Rio' into an array
  anarray = rio('afile').chomp[/^Rio/]
 
 Iterate over the non-empty, non-comment chomped lines of a file
- rio('afile').chomp.nolines(:empty?,/^\s*#/) { |line| ... }
+ rio('afile').chomp.skiplines(:empty?,/^\s*#/) { |line| ... }
 
 Copy the output of th ps command into an array, skipping the header line and the ps command entry
- rio(?-,'ps -a').nolines(0,/ps$/) > anarray 
+ rio(?-,'ps -a').skiplines(0,/ps$/) > anarray 
 
 Prompt for input and return what was typed
  ans = rio(?-).print("Type Something: ").chomp.gets 

data/lib/rio/entrysel.rb

@@ -54,7 +54,7 @@ module RIO
         end
         def ===(el) self =~ el end 
         abstract_method :=~
-                         
+                
       end
       class Any < Base
         def =~(entry) true end
@@ -74,6 +74,14 @@ module RIO
       class Symbol < Base
         def =~(entry) entry.__send__(@match_to) end
       end
+      class And < Base
+        def initialize(matches)
+          super(matches.flatten.map { |arg| Match::Entry.create(arg) })
+        end
+        def =~(el)
+          (@match_to.empty? or @match_to.all? { |sel| sel =~ el })
+        end
+      end
       def create(arg)
         case arg
         when ::String     then Glob.new(arg)
@@ -82,6 +90,7 @@ module RIO
         when ::Symbol     then Symbol.new(arg)
         when ::TrueClass  then Any.new(arg)
         when ::FalseClass then None.new(arg)
+        when ::Array      then And.new(arg)
         else raise ArgumentError,"a String,Regexp,Proc or Symbol is required (#{arg})"
         end
       end
@@ -93,9 +102,6 @@ module RIO
   module Match
     module Entry
       class List
-        def callstr(func,*args)
-          self.class.to_s+'['+self.to_s+']'+'.'+func.to_s+'('+args.join(',')+')'
-        end
         attr_reader :sym
         attr_accessor :list
         def initialize(sym,*args)
@@ -116,9 +122,14 @@ module RIO
         end
         extend Forwardable
         def_instance_delegators(:@list,:each)
+        def callstr(func,*args)
+          self.class.to_s+'['+self.to_s+']'+'.'+func.to_s+'('+args.join(',')+')'
+        end
       end
       class Sels < Array
         def <<(entry_list)
+          #p callstr('<<',entry_list)
+          
           same_sym = self.grep(entry_list)
           if same_sym.empty?
             super
@@ -126,11 +137,59 @@ module RIO
             same_sym[0].list = entry_list.list
           end
         end
+        def callstr(func,*args)
+          self.class.to_s+'['+self.to_s+']'+'.'+func.to_s+'('+args.join(',')+')'
+        end
       end
       class Selector
-        def initialize(sel,nosel)
-          @sel = sel
-          @nosel = nosel
+        attr_reader :sel,:nosel
+        def initialize(entry_sel)
+          @entry_sel = entry_sel
+          @sel = @nosel = nil
+          process_entry_sel() if @entry_sel
+        end
+        def es_args() 
+          es = @entry_sel
+          es['args']
+        end
+        def something_selected?
+          %w[entries files dirs].any? { |k| es_args.has_key?(k) }
+        end
+        def something_skipped?
+          %w[skipentries skipfiles skipdirs].any? { |k| es_args.has_key?(k) }
+        end
+        def skip_type(skip_args)
+          
+        end
+        def process_entry_sel()
+          ea = es_args
+          raise RuntimeError, "Internal error: entry_sel_args not set" unless ea
+          if something_selected?
+            @sel = Match::Entry::Sels.new 
+            @sel << Match::Entry::List.new(:true?,*ea['entries']) if ea.has_key?('entries')
+            @sel << Match::Entry::List.new(:file?,*ea['files']) if ea.has_key?('files')
+            @sel << Match::Entry::List.new(:dir?,*ea['dirs']) if ea.has_key?('dirs')
+          end
+          if something_skipped?
+            @nosel = Match::Entry::Sels.new 
+            if ea.has_key?('skipentries')
+              @nosel << Match::Entry::List.new(:true?,*ea['skipentries'])
+            end
+            if ea.has_key?('skipfiles')
+              @nosel << Match::Entry::List.new(:file?,*ea['skipfiles'])
+              unless ea['skipfiles'].empty? or ea.has_key?('files')
+                @sel ||= Match::Entry::Sels.new 
+                @sel << Match::Entry::List.new(:file?)
+              end
+            end
+            if ea.has_key?('skipdirs')
+              @nosel << Match::Entry::List.new(:dir?,*ea['skipdirs'])
+              unless ea['skipdirs'].empty? or ea.has_key?('dirs')
+                @sel ||= Match::Entry::Sels.new 
+                @sel << Match::Entry::List.new(:dir?)
+              end
+            end
+          end
         end
         def inspect()
           str = sprintf('#<Selector:0x%08x',self.object_id)
@@ -144,7 +203,7 @@ module RIO
 
         def yes?(el)
           @sel.nil? or @sel.detect { |match_entry| match_entry =~ el }
-#          @sel.nil? or @sel.grep(el)
+          #          @sel.nil? or @sel.grep(el)
         end
         def no?(el)
           @nosel.detect { |match_entry| match_entry =~ el } unless @nosel.nil?
@@ -155,8 +214,16 @@ module RIO
         def match?(el)
           yes?(el) and not no?(el)
         end
+        def callstr(func,*args)
+          self.class.to_s+'['+self.to_s+']'+'.'+func.to_s+'('+args.join(',')+')'
+        end
+      end
+      class SelectorClassic < Selector
+        def initialize(sel,nosel)
+          @sel = sel
+          @nosel = nosel
+        end
       end
     end
-    
   end
 end

data/lib/rio/file.rb

@@ -64,7 +64,8 @@ module RIO
       def each(*args,&block)
         #p "#{callstr('each',*args)} ss_type=#{ss_type?}"
         if ss_type? == 'files' and !stream_iter?
-          sel = Match::Entry::Selector.new(cx['sel'],cx['nosel'])
+          #sel = Match::Entry::Selector.new(cx['sel'],cx['nosel'])
+          sel = Match::Entry::Selector.new(cx['entry_sel'])
           yield new_rio_cx(self) if sel.match?(self)
         else
           fstream.each(*args,&block)

data/lib/rio/filter.rb

@@ -0,0 +1,95 @@
+#--
+# =============================================================================== 
+# 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 Filter #:nodoc: all
+    def self.make_line_filter(sym)
+      module_eval %{
+        module #{sym.to_s.capitalize}
+         module IOE
+          def gets(*args) super.__send__(:#{sym}) end
+          def readline(*args) super.__send__(:#{sym}) end
+          def each_line(*args,&block) super { |l| yield l.__send__(:#{sym}) } end
+          def readlines(*args) super.map(&:#{sym}) end
+         end
+         include IOE
+        end
+      }
+    end
+  end
+end
+module RIO
+  module Cx
+    module Methods
+      require 'rio/context/cxx.rb'
+      def self.make_filter_methods(sym)
+        module_eval %{
+          def #{sym}(arg=true,&block)
+            cx['#{sym}'] = arg
+            add_filter(Filter::#{sym.to_s.capitalize}) if arg and self.ioh
+            each(&block) if block_given?
+            self 
+          end
+          def #{sym}?() cxx?('#{sym}') end
+          def no#{sym}(arg=false,&block) #{sym}(arg,&block) end
+        }
+      end
+    end
+  end
+end
+
+module RIO
+  FILTER_SYMS = [:chomp, :strip, :lstrip, :rstrip]
+  FILTER_SYMS.each { |sym|
+    Filter.make_line_filter(sym)
+    Cx::Methods.make_filter_methods(sym)
+  }
+  module Stream
+    module Filters
+
+      def add_line_filters()
+        add_filter(Filter::Chomp) if chomp?
+        add_filter(Filter::Strip) if strip?
+        add_filter(Filter::Lstrip) if lstrip?
+        add_filter(Filter::Rstrip) if rstrip?
+      end
+
+    end    
+  end    
+end
+
+__END__

data/lib/rio/filter/closeoneof.rb

@@ -70,7 +70,7 @@ module RIO
         #p callstr('copy_stream',dst)
         close_on_eof(super)
       end
-      def slurp() 
+      def contents() 
         close_on_eof(super)
       end
       def readlines(*args)

data/lib/rio/grande.rb

@@ -75,77 +75,3 @@ module RIO
 
   end
 end
-module RIO
-  module Grande
-    module Dir
-
-      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'])
-        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.dir?
-              rsel = Match::Entry::Selector.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
-        closeoneof? ? self.close.softreset : self
-      end
-
-
-
-      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)
-        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')
-        end
-        ario.cx = new_cx
-        ario
-      end
-    end
-  end
-end