riel 1.1.17 → 1.2.0

data/test/riel/enumerable_test.rb

@@ -4,21 +4,96 @@
 require 'test/unit'
 require 'riel/enumerable'
 
+class Range
+  include RIEL::EnumerableExt
+end
+
+class Array
+  include RIEL::EnumerableExt
+end
+
 class EnumerableTestCase < Test::Unit::TestCase
-  def test_collect_with_index
-    assert_equal [ 0, 5, 12, 21, 32 ],     (4   ..   8).collect_with_index { |val, idx| val * idx }
-    assert_equal [ "", "b", "cc", "ddd" ], ('a' .. 'd').collect_with_index { |str, idx| str * idx }
+  def setup
+    @range = (4 .. 8)
+  end
+
+  def as_range
+    @range
+  end
+
+  def as_array
+    @range.to_a
+  end
+
+  def run_collect_with_index_test enum
+    assert_equal [ 0, 5, 12, 21, 32 ], enum.collect_with_index { |val, idx| val * idx }, "enum: #{enum.class}"
+  end
+
+  def test_array_collect_with_index
+    run_collect_with_index_test as_array
+  end
+  
+  def test_range_collect_with_index
+    run_collect_with_index_test as_range
+  end
+
+  def run_select_with_index_multi_test enum
+    assert_equal [ 5, 6, 7, 8 ], enum.select_with_index { |val, idx| val >= 5 }, "enum: #{enum.class}"
+  end
+  
+  def run_select_with_index_single_test enum
+    assert_equal [ 6 ], enum.select_with_index { |val, idx| val * idx == 12 }, "enum: #{enum.class}"
+  end
+  
+  def run_select_with_index_none_test enum
+    assert_equal [], enum.select_with_index { |val, idx| idx - val > 0  }
   end
   
-  def test_select_with_index
-    assert_equal [ 5, 6, 7, 8 ], (4 .. 8).select_with_index { |val, idx| val >= 5 }
-    assert_equal [ 6 ],          (4 .. 8).select_with_index { |val, idx| val * idx == 12 }
-    assert_equal [],             (4 .. 8).select_with_index { |val, idx| idx - val > 0  }
+  def test_array_select_with_index_multi
+    run_select_with_index_multi_test as_array
+  end
+  
+  def test_array_select_with_index_single
+    run_select_with_index_single_test as_array
+  end
+  
+  def test_array_select_with_index_none
+    run_select_with_index_none_test as_array
+  end
+  
+  def test_range_select_with_index_multi
+    run_select_with_index_multi_test as_range
+  end
+  
+  def test_range_select_with_index_single
+    run_select_with_index_single_test as_range
+  end
+  
+  def test_range_select_with_index_none
+    run_select_with_index_none_test as_range
+  end
+
+  def run_detect_with_index_match_test enum
+    assert_equal 5, enum.detect_with_index { |val, idx| val >= 5 }
+  end
+
+  def run_detect_with_index_no_match_test enum
+    assert_equal nil, enum.detect_with_index { |val, idx| idx - val > 0 }
+  end
+
+  def test_array_detect_with_index_match
+    run_detect_with_index_match_test as_array
+  end
+
+  def test_array_detect_with_index_no_match
+    run_detect_with_index_no_match_test as_array
+  end
+
+  def test_range_detect_with_index_match
+    run_detect_with_index_match_test as_range
   end
 
-  def test_detect_with_index
-    assert_equal 5,   (4 .. 8).detect_with_index { |val, idx| val >= 5 }
-    assert_equal 6,   (4 .. 8).detect_with_index { |val, idx| val * idx == 12 }
-    assert_equal nil, (4 .. 8).detect_with_index { |val, idx| idx - val > 0  }
+  def test_range_detect_with_index_no_match
+    run_detect_with_index_no_match_test as_range
   end
 end

data/test/riel/regexp_test.rb

@@ -19,4 +19,10 @@ class RegexpTestCase < Test::Unit::TestCase
     assert NegatedRegexp.new("a[b-z]").match("aa")
     assert NegatedRegexp.new(".+").match("")
   end
+  
+  def test_invalid_whole_word
+    assert_raises(RuntimeError) do
+      re = Regexp.create ':abc', wholewords: true
+    end
+  end
 end

data/test/riel/size_converter_test.rb

@@ -39,7 +39,7 @@ class SizeConverterTestCase < Test::Unit::TestCase
     assert_equal data[offset + didx], conv, "size index: #{sidx}; data index: #{didx}; offset: #{offset}; decimal_places: #{dec_places}"
   end
 
-  def run_test cls, offset
+  def run_size_test cls, offset
     SIZES.each_with_index do |data, sidx|
       assert_conversion cls, data, offset, 1, sidx
       (0 .. 2).each do |dec_places|
@@ -49,14 +49,14 @@ class SizeConverterTestCase < Test::Unit::TestCase
   end
 
   def test_default
-    run_test SizeConverter, 0
+    run_size_test SizeConverter, 0
   end
 
   def test_human
-    run_test SizeConverter::Human, 0
+    run_size_test SizeConverter::Human, 0
   end
 
   def test_si
-    run_test SizeConverter::SI, 3
+    run_size_test SizeConverter::SI, 3
   end
 end

data/test/riel/string_test.rb

@@ -5,12 +5,12 @@ require 'pathname'
 require 'test/unit'
 require 'riel/string'
 
+class String
+  include RIEL::StringExt
+end
+
 class StringToRangeTestCase < Test::Unit::TestCase
   def run_string_to_range_test exp, str, args = Hash.new
-    String.to_ranges(str, args).each_with_index do |rg, idx|
-      assert_equal exp[idx], rg
-    end
-
     str.to_ranges(args).each_with_index do |rg, idx|
       assert_equal exp[idx], rg
     end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: riel
 version: !ruby/object:Gem::Version
-  version: 1.1.17
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
 description: This library extends the core Ruby libraries.
@@ -35,7 +32,6 @@ extra_rdoc_files:
 - README.md
 files:
 - lib/riel.rb
-- lib/riel/array.rb
 - lib/riel/command.rb
 - lib/riel/date.rb
 - lib/riel/dir.rb
@@ -47,13 +43,7 @@ files:
 - lib/riel/hash.rb
 - lib/riel/integer.rb
 - lib/riel/io.rb
-- lib/riel/log.rb
-- lib/riel/log/log.rb
-- lib/riel/log/loggable.rb
-- lib/riel/log/logger.rb
-- lib/riel/log/severity.rb
 - lib/riel/matchdata.rb
-- lib/riel/optproc.rb
 - lib/riel/pathname.rb
 - lib/riel/rcfile.rb
 - lib/riel/regexp.rb
@@ -62,7 +52,6 @@ files:
 - lib/riel/string.rb
 - lib/riel/tempfile.rb
 - lib/riel/timer.rb
-- test/riel/array_test.rb
 - test/riel/command_test.rb
 - test/riel/date_test.rb
 - test/riel/dir_test.rb
@@ -73,9 +62,7 @@ files:
 - test/riel/hash_test.rb
 - test/riel/integer_test.rb
 - test/riel/io_test.rb
-- test/riel/log/format_test.rb
 - test/riel/matchdata_test.rb
-- test/riel/optproc_test.rb
 - test/riel/pathname_test.rb
 - test/riel/rcfile_test.rb
 - test/riel/regexp_test.rb
@@ -83,37 +70,32 @@ files:
 - test/riel/size_converter_test.rb
 - test/riel/string_test.rb
 - test/riel/tempfile_test.rb
-- test/riel/testlog/log_stack_test.rb
-- test/riel/testlog/log_test.rb
-- test/riel/testlog/loggable_test.rb
 - test/riel/timer_test.rb
 - README.md
 homepage: http://www.incava.org/projects/riel
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extensions to core Ruby code.
 test_files:
-- test/riel/array_test.rb
 - test/riel/command_test.rb
 - test/riel/date_test.rb
 - test/riel/dir_test.rb
@@ -124,9 +106,7 @@ test_files:
 - test/riel/hash_test.rb
 - test/riel/integer_test.rb
 - test/riel/io_test.rb
-- test/riel/log/format_test.rb
 - test/riel/matchdata_test.rb
-- test/riel/optproc_test.rb
 - test/riel/pathname_test.rb
 - test/riel/rcfile_test.rb
 - test/riel/regexp_test.rb
@@ -134,7 +114,4 @@ test_files:
 - test/riel/size_converter_test.rb
 - test/riel/string_test.rb
 - test/riel/tempfile_test.rb
-- test/riel/testlog/log_stack_test.rb
-- test/riel/testlog/log_test.rb
-- test/riel/testlog/loggable_test.rb
 - test/riel/timer_test.rb

data/lib/riel/array.rb

@@ -1,19 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-class Array 
-  $-w = false
-
-  # Wraps the array with brackets, and inserts a comma and a space between
-  # elements.
-
-  def to_s
-    "[ " + collect { |e| e.to_s }.join(", ") + " ]"
-  end
-  $-w = true
-
-  # $$$ this is the same as Array.sample
-  def rand
-    return self[Kernel.rand length]
-  end
-end

data/lib/riel/log/log.rb

@@ -1,244 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-#
-# = log.rb
-#
-# Logging Module
-#
-# Author:: Jeff Pace <jpace@incava.org>
-# Documentation:: Author
-#
-
-require 'riel/log/logger'
-require 'riel/log/severity'
-require 'rubygems'
-require 'rainbow'
-
-#
-# == Log
-#
-# Very minimal logging output. If verbose is set, this displays the method and
-# line number whence called. It can be a mixin to a class, which displays the
-# class and method from where it called. If not in a class, it displays only the
-# method.
-# 
-# Remember: all kids love log.
-#
-# == Examples
-#
-# See the unit tests in log_test.rb
-#
-# == Usage
-#
-# The most general usage is simply to call:
-#
-#  Log.log "some message"
-#
-#  That will simply log the given message.
-#
-#  class YourClass
-#    include Loggable
-#
-#    def some_method(...)
-#      log "my message"
-# 
-#  That will log from the given class and method, showing the line number from
-#  which the logger was called.
-#
-#    def another_method(...)
-#      stack "my message"
-# 
-#  That will produce a stack trace from the given location.
-# 
-
-module RIEL
-  class Log
-    $LOGGING_LEVEL = nil
-
-    DEFAULT_FILENAME_WIDTH = -25
-    DEFAULT_LINENUM_WIDTH = 4
-    DEFAULT_FUNCTION_WIDTH = -20
-    
-    include Log::Severity
-
-    # by default, class methods delegate to a single app-wide log.
-
-    @@log = Logger.new
-
-    # Returns the logger of the log. A class method delegating to an instance
-    # method ... not so good. But temporary.
-    def self.logger
-      @@log
-    end
-
-    def self.method_missing meth, *args, &blk
-      validcolors = Sickill::Rainbow::TERM_COLORS
-      # only handling foregrounds, not backgrounds
-      if code = validcolors[meth]
-        add_color_method meth.to_s, code + 30
-        send meth, *args, &blk
-      else
-        super
-      end
-    end
-
-    def self.respond_to? meth
-      validcolors = Sickill::Rainbow::TERM_COLORS
-      validcolors.include?(meth) || super
-    end
-
-    def self.add_color_method color, code
-      instmeth = Array.new
-      instmeth << "def #{color} msg = \"\", lvl = Log::DEBUG, depth = 1, cname = nil, &blk"
-      instmeth << "  log(\"\\e[#{code}m\#{msg\}\\e[0m\", lvl, depth + 1, cname, &blk)"
-      instmeth << "end"
-      instance_eval instmeth.join("\n")
-
-      clsmeth = Array.new
-      clsmeth << "def #{color} msg = \"\", lvl = Log::DEBUG, depth = 1, cname = nil, &blk"
-      clsmeth << "  logger.#{color}(\"\\e[#{code}m\#{msg\}\\e[0m\", lvl, depth + 1, cname, &blk)"
-      clsmeth << "end"
-
-      class_eval clsmeth.join("\n")
-    end
-
-    def self.set_default_widths
-      logger.set_default_widths
-    end
-
-    def self.verbose
-      logger.verbose
-    end
-
-    def self.verbose= v
-      logger.verbose = v && v != 0 ? DEBUG : FATAL
-    end
-
-    def self.level= lvl
-      logger.level = lvl
-    end
-
-    def self.quiet
-      logger.quiet
-    end
-
-    def self.quiet= q
-      logger.quiet = q
-    end
-
-    def self.format
-      logger.format
-    end
-
-    def self.format= fmt
-      logger.format = fmt
-    end
-
-    # Assigns output to the given stream.
-    def self.output= io
-      logger.output = io
-    end
-
-    def self.output
-      logger.output
-    end
-
-    # sets whether to colorize the entire line, or just the message.
-    def self.colorize_line= col
-      logger.colorize_line = col
-    end
-
-    def self.colorize_line
-      logger.colorize_line
-    end
-
-    # Assigns output to a file with the given name. Returns the file; client
-    # is responsible for closing it.
-    def self.outfile= fname
-      logger.outfile = fname
-    end
-
-    def self.outfile
-      logger.outfile
-    end
-
-    # Creates a printf format for the given widths, for aligning output.
-    def self.set_widths file_width, line_width, func_width
-      logger.set_widths file_width, line_width, func_width
-    end
-
-    def self.ignore_file fname
-      logger.ignore_file fname
-    end
-    
-    def self.ignore_method methname
-      logger.ignored_method methname
-    end
-    
-    def self.ignore_class classname
-      logger.ignored_class classname
-    end
-
-    def self.log_file fname
-      logger.log_file fname
-    end
-    
-    def self.log_method methname
-      logger.log_method methname
-    end
-    
-    def self.log_class classname
-      logger.log_class classname
-    end
-
-    def self.debug msg = "", depth = 1, &blk
-      logger.log msg, DEBUG, depth + 1, &blk
-    end
-
-    def self.info msg = "", depth = 1, &blk
-      logger.log msg, INFO, depth + 1, &blk
-    end
-
-    def self.fatal msg = "", depth = 1, &blk
-      logger.log msg, FATAL, depth + 1, &blk
-    end
-
-    def self.log msg = "", lvl = DEBUG, depth = 1, cname = nil, &blk
-      logger.log msg, lvl, depth + 1, cname, &blk
-    end
-
-    def self.stack msg = "", lvl = DEBUG, depth = 1, cname = nil, &blk
-      logger.stack msg, lvl, depth + 1, cname, &blk
-    end
-
-    def self.warn msg = "", depth = 1, &blk
-      if verbose
-        logger.log msg, WARN, depth + 1, &blk
-      else
-        $stderr.puts "WARNING: " + msg
-      end
-    end
-
-    def self.error msg = "", depth = 1, &blk
-      if verbose
-        logger.log msg, ERROR, depth + 1, &blk
-      else
-        $stderr.puts "ERROR: " + msg
-      end
-    end
-
-    def self.write msg, depth = 1, cname = nil, &blk
-      if verbose
-        stack msg, Log::WARN, depth + 1, cname, &blk
-      elsif quiet
-        # nothing
-      else
-        $stderr.puts msg
-      end
-    end
-
-    def self.set_color lvl, color
-      logger.set_color lvl, color
-    end
-  end
-end

data/lib/riel/log/loggable.rb

@@ -1,101 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-#
-# = log.rb
-#
-# Logging Module
-#
-# Author:: Jeff Pace <jpace@incava.org>
-# Documentation:: Author
-#
-
-require 'riel/log/log'
-require 'rubygems'
-require 'rainbow'
-
-#
-# == Loggable
-#
-# Including this module in a class gives access to the logger methods.
-# 
-# == Examples
-#
-# See the unit tests in log_test.rb
-#
-# == Usage
-#
-#  class YourClass
-#    include Loggable
-#
-#    def some_method(...)
-#      log "my message"
-# 
-#  That will log from the given class and method, showing the line number from
-#  which the logger was called.
-#
-#    def another_method(...)
-#      stack "my message"
-# 
-#  That will produce a stack trace from the given location.
-# 
-
-module RIEL
-  module Loggable
-    # Logs the given message, including the class whence invoked.
-    def log msg = "", lvl = Log::DEBUG, depth = 1, &blk
-      Log.log msg, lvl, depth + 1, self.class.to_s, &blk
-    end
-
-    def debug msg = "", depth = 1, &blk
-      Log.log msg, Log::DEBUG, depth + 1, self.class.to_s, &blk
-    end
-
-    def info msg = "", depth = 1, &blk
-      Log.log msg, Log::INFO, depth + 1, self.class.to_s, &blk
-    end
-
-    def warn msg = "", depth = 1, &blk
-      Log.log msg, Log::WARN, depth + 1, self.class.to_s, &blk
-    end
-
-    def error msg = "", depth = 1, &blk
-      Log.log msg, Log::ERROR, depth + 1, self.class.to_s, &blk
-    end
-
-    def fatal msg = "", depth = 1, &blk
-      Log.log msg, Log::FATAL, depth + 1, self.class.to_s, &blk
-    end
-
-    def stack msg = "", lvl = Log::DEBUG, depth = 1, &blk
-      Log.stack msg, lvl, depth + 1, self.class.to_s, &blk
-    end
-
-    def write msg = "", depth = 1, &blk
-      Log.write msg, depth + 1, self.class.to_s, &blk
-    end
-
-    def method_missing meth, *args, &blk
-      validcolors = Sickill::Rainbow::TERM_COLORS
-      # only handling foregrounds, not backgrounds
-      if code = validcolors[meth]
-        add_color_method meth.to_s, code + 30
-        send meth, *args, &blk
-      else
-        super
-      end
-    end
-
-    def respond_to? meth
-      validcolors = Sickill::Rainbow::TERM_COLORS
-      validcolors.include?(meth) || super
-    end
-
-    def add_color_method color, code
-      meth = Array.new
-      meth << "def #{color}(msg = \"\", lvl = Log::DEBUG, depth = 1, cname = nil, &blk)"
-      meth << "  Log.#{color} msg, lvl, depth + 1, self.class.to_s, &blk"
-      meth << "end"
-      self.class.module_eval meth.join("\n")
-    end
-  end
-end