riel 1.1.17 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d9fec4fdc968d7eac63fc2e894a6bd3b2252d86f
+  data.tar.gz: 38b6c94c7045866f8fbf88fdd6ec7861a0bd0750
+SHA512:
+  metadata.gz: 59546acde4a6fdf7d2716be86af60d2cc6c5a3a6fa389dede2790de02c2c251f6708510f59413c07c6f79604529c8c957cd4a5e48250f1007ecf3cae9740a10f
+  data.tar.gz: a2d02521a496858feb6d9d08dfb2fca21ec6bf7f97c9b381ef971554ad49a8c8bf9ec6f30ebeb1d0106e557b04a474a4b1c544ce928ea94b251810c44cb432f2

data/lib/riel/date.rb

@@ -4,9 +4,17 @@
 
 require 'date'
 
-class Date
-  # Returns the number of days in the given month.
-  def self.days_in_month year, month
-    (Date.new(year, 12, 31) << (12 - month)).day
+module RIEL
+  module DateExt
+    def self.included base
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      # Returns the number of days in the given month.
+      def days_in_month year, month
+        (Date.new(year, 12, 31) << (12 - month)).day
+      end
+    end
   end
 end

data/lib/riel/dir.rb

@@ -3,90 +3,96 @@
 
 require 'pathname'
 
-class Dir
-
-  # Returns the home directory, for both Unix and Windows.
-  unless RUBY_VERSION.index('1.9')
-    def self.home
-      ENV["HOME"] || begin
-                       hd = ENV["HOMEDRIVE"]
-                       hp = ENV["HOMEPATH"]
-                       if hd || hp
-                         (hd || "") + (hp || "\\")
-                       end
-                     end
+module RIEL
+  module DirExt
+    def self.included base
+      base.extend ClassMethods
     end
-  end
 
-  # Removes directories containing no files or files matching only those in
-  # args[:deletable_files], which are basenames.
-  def self.remove_if_empty(dir, args = Hash.new)
-    deletable = args[:deletable] || Array.new
-    verbose   = args[:verbose]
-    level     = args[:level] || 0
+    module ClassMethods
+      # Returns the home directory, for both Unix and Windows.
+      unless RUBY_VERSION.index('1.9')
+        def home
+          ENV["HOME"] || begin
+                           hd = ENV["HOMEDRIVE"]
+                           hp = ENV["HOMEPATH"]
+                           if hd || hp
+                             (hd || "") + (hp || "\\")
+                           end
+                         end
+        end
+      end
 
-    subargs = args.dup
-    subargs[:level] = level + 1
+      # Removes directories containing no files or files matching only those in
+      # args[:deletable_files], which are basenames.
+      def remove_if_empty dir, args = Hash.new
+        deletable = args[:deletable] || Array.new
+        verbose   = args[:verbose]
+        level     = args[:level] || 0
 
-    dir = Pathname.new(dir) unless dir.kind_of?(Pathname)
+        subargs = args.dup
+        subargs[:level] = level + 1
 
-    if level <= 1 && verbose
-      puts "dir: #{dir}"
-    end
+        dir = Pathname.new(dir) unless dir.kind_of?(Pathname)
 
-    if dir.readable?
-      dir.children.sort.each do |child|
-        if child.exist? && child.directory?
-          self.remove_if_empty child, subargs
+        if level <= 1 && verbose
+          puts "dir: #{dir}"
         end
-      end
-      
-      if dir.expand_path == Pathname.pwd.expand_path
-        puts "skipping current directory: #{dir}" if verbose
-      else
-        can_delete = dir.children.all? do |x| 
-          bname = x.basename.to_s
-          deletable.any? do |del|
-            if del.kind_of? String
-              bname == del
-            elsif del.kind_of? Regexp
-              del.match bname
-            else
-              false
+
+        if dir.readable?
+          dir.children.sort.each do |child|
+            if child.exist? && child.directory?
+              self.remove_if_empty child, subargs
             end
           end
-        end
+          
+          if dir.expand_path == Pathname.pwd.expand_path
+            puts "skipping current directory: #{dir}" if verbose
+          else
+            can_delete = dir.children.all? do |x| 
+              bname = x.basename.to_s
+              deletable.any? do |del|
+                if del.kind_of? String
+                  bname == del
+                elsif del.kind_of? Regexp
+                  del.match bname
+                else
+                  false
+                end
+              end
+            end
 
-        if can_delete
-          dir.children.each do |x|
-            puts "removing file: #{x}" if verbose
-            x.delete
-          end
+            if can_delete
+              dir.children.each do |x|
+                puts "removing file: #{x}" if verbose
+                x.delete
+              end
 
-          puts "removing directory: #{dir}" if verbose
+              puts "removing directory: #{dir}" if verbose
 
-          dir.delete
-        else
-          # puts "#{dir} not empty"
+              dir.delete
+            else
+              # puts "#{dir} not empty"
+            end
+          end
+        elsif verbose
+          puts "#{dir} not readable"
         end
       end
-    elsif verbose
-      puts "#{dir} not readable"
-    end
-  end
 
-  # Moves and copies files to the given directory, creating
-  # it if it does not exist.
-  def self.move_and_copy_files dir, move_files, copy_files
-    dir.mkdir unless dir.exist?
+      # Moves and copies files to the given directory, creating
+      # it if it does not exist.
+      def move_and_copy_files dir, move_files, copy_files
+        dir.mkdir unless dir.exist?
 
-    move_files.each do |mfile|
-      File.move mfile.to_s, dir.to_s
-    end
+        move_files.each do |mfile|
+          File.move mfile.to_s, dir.to_s
+        end
 
-    copy_files.each do |cfile|
-      File.copy cfile.to_s, dir.to_s
+        copy_files.each do |cfile|
+          File.copy cfile.to_s, dir.to_s
+        end
+      end
     end
   end
-
 end

data/lib/riel/enumerable.rb

@@ -1,64 +1,43 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module Enumerable
-  def collect_with_index &blk
-    ary = []
-    self.each_with_index do |item, idx|
-      ary << blk.call(item, idx)
+module RIEL
+  module EnumerableExt
+    def collect_with_index &blk
+      ary = []
+      self.each_with_index do |item, idx|
+        ary << blk.call(item, idx)
+      end
+      ary
     end
-    ary
-  end
-
-  NOT_NIL = Object.new
-
-  def select_with_index arg = NOT_NIL, &blk
-    ary = []
-    self.each_with_index do |item, idx|
-      ary << item if _match?(arg, item, idx, &blk)
-    end
-    ary
-  end
 
-  def detect_with_index arg = NOT_NIL, &blk
-    self.each_with_index do |item, idx|
-      return item if _match?(arg, item, idx, &blk)
-    end
-    nil
-  end
-
-  alias :orig_select  :select
-  alias :orig_collect :collect
-  alias :orig_detect  :detect
-  alias :orig_reject  :reject
+    NOT_NIL = Object.new
 
-  origw = $-w
-  $-w = false
-  def select arg = NOT_NIL, &blk
-    ary = []
-    self.each_with_index do |item, idx|
-      ary << item if _match?(arg, item, idx, &blk)
+    def select_with_index arg = NOT_NIL, &blk
+      ary = []
+      self.each_with_index do |item, idx|
+        ary << item if _match?(arg, item, idx, &blk)
+      end
+      ary
     end
-    ary
-  end
 
-  def detect arg = NOT_NIL, &blk
-    self.each_with_index do |item, idx|
-      return item if _match?(arg, item, idx, &blk)
+    def detect_with_index arg = NOT_NIL, &blk
+      self.each_with_index do |item, idx|
+        return item if _match?(arg, item, idx, &blk)
+      end
+      nil
     end
-    nil
-  end
-  $-w = origw
 
-  def _match? arg, item, idx, &blk
-    if blk 
-      args = [ item ]
-      args << idx if idx && blk.arity > 1
-      blk.call(*args)
-    elsif arg == NOT_NIL
-      !item.nil?
-    else
-      arg == item
+    def _match? arg, item, idx, &blk
+      if blk 
+        args = [ item ]
+        args << idx if idx && blk.arity > 1
+        blk.call(*args)
+      elsif arg == NOT_NIL
+        !item.nil?
+      else
+        arg == item
+      end
     end
   end
 end

data/lib/riel/pathname.rb

@@ -9,7 +9,7 @@ class Pathname
   # a compliment to the +dirname+, +basename+, and +extname+ family, this returns
   # the basename without the extension, e.g. "foo" from "/usr/share/lib/foo.bar".
   def rootname
-    basename.to_s - extname.to_s
+    basename.to_s.sub extname.to_s, ''
   end
 
   # Returns an array of the path split into its components.

data/lib/riel/rcfile.rb

@@ -1,12 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-
 # Represents a resource file, where '#' is used to comment to end of lines, and
 # name/value pairs are separated by '=' or ':'.
 
 class RCFile
-
   attr_reader :settings
 
   # Reads the RC file, if it exists, and if a block is passed, calls the block

data/lib/riel/regexp.rb

@@ -3,15 +3,12 @@
 
 # Negates the given expression.
 class NegatedRegexp < Regexp
-
   def match str
     !super
   end
-
 end
 
 class Regexp
-
   # shell expressions to Ruby regular expression sequences
   SH2RE = Hash[
     '*'  => '.*', 
@@ -103,7 +100,7 @@ class Regexp
     else
       pattern.sub!(%r{ ^\/ (.*[^\\]) \/ $ }x) { $1 }
     end
-    
+
     if wholewords
       # sanity check:
 
@@ -116,7 +113,7 @@ class Regexp
       end.compact
       
       if errs.length > 0
-        Log.warn "pattern '#{pattern}' does not " + errs.join(" and ") + " on a word boundary"
+        raise RuntimeError.new("pattern '#{pattern}' does not " + errs.join(" and ") + " on a word boundary")
       end
       pattern = '\b' + pattern + '\b'
     elsif wholelines
@@ -148,5 +145,4 @@ class Regexp
   # applies Perl-style substitution (s/foo/bar/).
   def self.perl_subst pat
   end
-  
 end

data/lib/riel/setdiff.rb

@@ -8,8 +8,6 @@ class SetDiff
   def self.new a, b
     allitems = a | b
 
-    diff_type = :identical
-
     a_and_b = Array.new
     a_not_in_b = Array.new
     b_not_in_a = Array.new

data/lib/riel/string.rb

@@ -10,98 +10,93 @@
 # Documentation:: Author
 #
 
-class String
-  #
-  # Returns whether the string ends with the given substring.
-  #
-  def ends_with substr
-    return rindex(substr) == length - substr.length
-  end
-
-  #
-  # Returns the string, as a number if it is one, and nil otherwise,
-  #
-  def num
-    begin
-      Integer self
-    rescue ArgumentError
-      nil
+module RIEL
+  module StringExt
+    #
+    # Returns whether the string ends with the given substring.
+    #
+    def ends_with substr
+      return rindex(substr) == length - substr.length
     end
-  end
 
-  # 
-  # Returns a string based on this instance, with the first occurrance of
-  # +other+ removed. +other+ may be a string or regular expression.
-  #
-  def - other
-    sub other, ''
-  end
+    #
+    # Returns the string, as a number if it is one, and nil otherwise,
+    #
+    def num
+      begin
+        Integer self
+      rescue ArgumentError
+        nil
+      end
+    end
 
-  # 
-  # Represents infinity, for the +to_ranges+ function.
-  #
-  Infinity = (1.0 / 0)
+    # 
+    # Returns a string based on this instance, with the first occurrance of
+    # +other+ removed. +other+ may be a string or regular expression.
+    #
+    def - other
+      sub other, ''
+    end
 
-  # :stopdoc:
-  #                       from  (maybe   to           this)
-  RANGE_REGEXP = %r{^ \s* (\d*) (?: \s* (\-|\.\.) \s* (\d*) )? \s* $ }x
-  # :startdoc:
+    # 
+    # Represents infinity, for the +to_ranges+ function.
+    #
+    Infinity = (1.0 / 0)
 
-  #
-  # A class method for +to_ranges+. Deprecated in favor of the instance method.
-  # 
-  def self.to_ranges str, args = Hash.new
-    str.to_ranges args
-  end
+    # :stopdoc:
+    #                       from  (maybe   to           this)
+    RANGE_REGEXP = %r{^ \s* (\d*) (?: \s* (\-|\.\.) \s* (\d*) )? \s* $ }x
+    # :startdoc:
 
-  # 
-  # Splits num into array of ranges, limiting itself to +args[:min]+ and +args[:max]+,
-  # if specified. The +args[:collapse]+, if true, results in sequential values put
-  # into the same range.
-  # 
-  # Examples:
-  #   
-  #    "1,2".to_ranges                                   # [ 1 .. 1, 2 .. 2 ]
-  #    "1,2".to_ranges :collapse => true                 # [ 1 .. 2 ]
-  #    "1-4".to_ranges                                   # [ 1 .. 4 ]
-  #    "1-3,5-6,10,11,12,".to_ranges :collapse => true   # [ 1 .. 3, 5 .. 6, 10 .. 12 ]
-  #    "1-3,5-6,10,11,12,".to_ranges                     # [ 1 .. 3, 5 .. 6, 10 .. 10, 11 .. 11, 12 .. 12 ]
-  #    "-4".to_ranges                                    # [ -String::Infinity ..  4 ]
-  #    "4-".to_ranges                                    # [ 4 .. String::Infinity ]
-  #    "1-".to_ranges :min => 0, :max => 8               # [ 1 .. 8 ]
-  # 
-  def to_ranges args = Hash.new
-    min = args[:min] || -Infinity
-    max = args[:max] || Infinity
-    collapse = args[:collapse]
-    
-    ranges = Array.new
-    self.split(%r{\s*,\s*}).each do |section|
-      md = section.match(RANGE_REGEXP)
-      next unless md
+    # 
+    # Splits num into array of ranges, limiting itself to +args[:min]+ and +args[:max]+,
+    # if specified. The +args[:collapse]+, if true, results in sequential values put
+    # into the same range.
+    # 
+    # Examples:
+    #   
+    #    "1,2".to_ranges                                   # [ 1 .. 1, 2 .. 2 ]
+    #    "1,2".to_ranges :collapse => true                 # [ 1 .. 2 ]
+    #    "1-4".to_ranges                                   # [ 1 .. 4 ]
+    #    "1-3,5-6,10,11,12,".to_ranges :collapse => true   # [ 1 .. 3, 5 .. 6, 10 .. 12 ]
+    #    "1-3,5-6,10,11,12,".to_ranges                     # [ 1 .. 3, 5 .. 6, 10 .. 10, 11 .. 11, 12 .. 12 ]
+    #    "-4".to_ranges                                    # [ -String::Infinity ..  4 ]
+    #    "4-".to_ranges                                    # [ 4 .. String::Infinity ]
+    #    "1-".to_ranges :min => 0, :max => 8               # [ 1 .. 8 ]
+    # 
+    def to_ranges args = Hash.new
+      min = args[:min] || -Infinity
+      max = args[:max] || Infinity
+      collapse = args[:collapse]
       
-      from = String._matchdata_to_number md, 1, min
-      to = String._has_matchdata?(md, 2) ? String._matchdata_to_number(md, 3, max) : from
+      ranges = Array.new
+      self.split(%r{\s*,\s*}).each do |section|
+        md = section.match(RANGE_REGEXP)
+        next unless md
+        
+        from = _matchdata_to_number md, 1, min
+        to = _has_matchdata?(md, 2) ? _matchdata_to_number(md, 3, max) : from
 
-      prevrange = ranges[-1]
+        prevrange = ranges[-1]
 
-      if collapse && prevrange && prevrange.include?(from - 1) && prevrange.include?(to - 1)
-        ranges[-1] = (prevrange.first .. to)
-      else
-        ranges << (from .. to)
+        if collapse && prevrange && prevrange.include?(from - 1) && prevrange.include?(to - 1)
+          ranges[-1] = (prevrange.first .. to)
+        else
+          ranges << (from .. to)
+        end
       end
-    end
 
-    ranges
-  end
+      ranges
+    end
 
-  # :stopdoc:
-  def self._has_matchdata? md, idx
-    md && md[idx] && !md[idx].empty?
-  end
+    # :stopdoc:
+    def _has_matchdata? md, idx
+      md && md[idx] && !md[idx].empty?
+    end
 
-  def self._matchdata_to_number md, idx, default
-    _has_matchdata?(md, idx) ? md[idx].to_i : default
+    def _matchdata_to_number md, idx, default
+      _has_matchdata?(md, idx) ? md[idx].to_i : default
+    end
+    # :startdoc:
   end
-  # :startdoc:
 end

data/lib/riel/timer.rb

@@ -1,17 +1,16 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'riel/log'
+require 'logue/log'
 
 class Timer
-
   def initialize what, args = Hash.new
     if args.kind_of? Fixnum
       args = { :level => args }
     end
 
     @io    = args[:io]    || $stdout
-    @level = args[:level] || Log::DEBUG
+    @level = args[:level] || Logue::Log::DEBUG
     
     stmsg  = args.include?(:startmsg) ? args[:startmsg] : "#{what} start time"
     endmsg = args.include?(:endmsg)   ? args[:endmsg]   : "#{what} end   time"
@@ -34,19 +33,18 @@ class Timer
       if @io
         @io.puts "#{msg}: #{value}"
       else
-        Log.log "#{msg}: #{value}", @level
+        Logue::Logue::Log.log "#{msg}: #{value}", @level
       end
     end
   end
-
 end
 
 def timethis what
   sttime = Time.new
-  Log.log "#{what} start time: #{sttime}"
+  Logue::Log.log "#{what} start time: #{sttime}"
   yield
   endtime = Time.new
-  Log.log "#{what} start time: #{sttime}"
-  Log.log "#{what} end time  : #{endtime}"
-  Log.log "#{what} elapsed   : #{endtime - sttime}"
+  Logue::Log.log "#{what} start time: #{sttime}"
+  Logue::Log.log "#{what} end time  : #{endtime}"
+  Logue::Log.log "#{what} elapsed   : #{endtime - sttime}"
 end

data/lib/riel.rb

@@ -4,5 +4,5 @@ $:.unshift(riellibdir) unless
   $:.include?(riellibdir) || $:.include?(File.expand_path(riellibdir))
 
 module RIEL
-  VERSION = '1.1.17'
+  VERSION = '1.2.0'
 end

data/test/riel/date_test.rb

@@ -4,6 +4,10 @@
 require 'test/unit'
 require 'riel/date'
 
+class Date
+  include RIEL::DateExt
+end
+
 class DateTestCase < Test::Unit::TestCase
   def run_date_test expected, year, month
     dim = Date.days_in_month(year, month)

data/test/riel/dir_test.rb

@@ -6,6 +6,10 @@ require 'pathname'
 require 'riel/dir'
 require 'riel/file'
 
+class Dir
+  include RIEL::DirExt
+end
+
 class DirTestCase < Test::Unit::TestCase
   def test_home
     assert_equal ENV["HOME"], Dir.home