riel 1.1.11 → 1.1.12

data/lib/riel/asciitable/row.rb

@@ -45,7 +45,7 @@ module RIEL
       end
 
       def print
-        banner = (0 .. @table.last_column).collect { |col| bc = BannerCell.new(@char, col, 1) }
+        banner = (0 .. @table.last_column).collect { |col| BannerCell.new(@char, col, 1) }
         bannervalues = banner.collect_with_index do |bc, col| 
           width = @table.column_width col
           bc.formatted_value width, :center
@@ -60,8 +60,6 @@ module RIEL
         lastdatarow = table.data_rows.last
         statrownum = table.last_row + 1
 
-        nrows = lastdatarow + 1 - firstdatarow
-        
         super table, statrownum
         
         ncolumns = @table.last_column
@@ -99,7 +97,7 @@ module RIEL
       def calculate col, fromrow, torow
         nrows = torow + 1 - fromrow
         total = @table.column(col).total fromrow, torow
-        avg = total / nrows
+        total / nrows
       end
     end
   end

data/lib/riel/enumerable.rb

@@ -2,8 +2,7 @@
 # -*- ruby -*-
 
 module Enumerable
-
-  def collect_with_index(&blk)
+  def collect_with_index &blk
     ary = []
     self.each_with_index do |item, idx|
       ary << blk.call(item, idx)
@@ -13,7 +12,7 @@ module Enumerable
 
   NOT_NIL = Object.new
 
-  def select_with_index(arg = NOT_NIL, &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)
@@ -21,7 +20,7 @@ module Enumerable
     ary
   end
 
-  def detect_with_index(arg = NOT_NIL, &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
@@ -35,7 +34,7 @@ module Enumerable
 
   origw = $-w
   $-w = false
-  def select(arg = NOT_NIL, &blk)
+  def select arg = NOT_NIL, &blk
     ary = []
     self.each_with_index do |item, idx|
       ary << item if _match?(arg, item, idx, &blk)
@@ -43,7 +42,7 @@ module Enumerable
     ary
   end
 
-  def detect(arg = NOT_NIL, &blk)
+  def detect arg = NOT_NIL, &blk
     self.each_with_index do |item, idx|
       return item if _match?(arg, item, idx, &blk)
     end
@@ -51,7 +50,7 @@ module Enumerable
   end
   $-w = origw
 
-  def _match?(arg, item, idx, &blk)
+  def _match? arg, item, idx, &blk
     if blk 
       args = [ item ]
       args << idx if idx && blk.arity > 1
@@ -62,5 +61,4 @@ module Enumerable
       arg == item
     end
   end
-  
 end

data/lib/riel/file.rb

@@ -11,7 +11,7 @@ require 'fileutils'
 
 orig_verbose = $VERBOSE
 $VERBOSE = nil
-path = ENV['PATH'].dup
+ENV['PATH'].dup
 $VERBOSE = orig_verbose
 
 class File

data/lib/riel/optproc.rb

@@ -7,7 +7,6 @@ require 'riel/text'
 require 'riel/enumerable'
 
 module OptProc
-
   class Option
     include Loggable
 
@@ -101,8 +100,7 @@ module OptProc
     def match args, opt = args[0]
       return nil unless %r{^-}.match opt
 
-      tag, val = opt.split('=', 2)
-      tag ||= opt
+      tag = opt.split('=', 2)[0] || opt
 
       @md = nil
       
@@ -114,7 +112,7 @@ module OptProc
     end
 
     def set_value args, opt = args[0]
-      tag, val = opt.split '=', 2
+      val = opt.split('=', 2)[1]
       args.shift
 
       if @md
@@ -143,8 +141,6 @@ module OptProc
             args.shift
           end
         end
-      else
-        # log { "no type" }
       end
 
       value = value_from_match
@@ -188,22 +184,16 @@ module OptProc
     end
 
     def to_boolean val
-      %w{ yes true on soitenly }.include?(val.downcase)
+      %w{ yes true on soitenly }.include? val.downcase
     end
 
     def set val, opt = nil, args = nil
-      # log { "argtype: #{@argtype}; md: #{@md.inspect}" }
-
       setargs = [ val, opt, args ].select_with_index { |x, i| i < @set.arity }
-      # log "val: #{val}"
       @set.call(*setargs)
     end
   end
 
-
   class OptionSet
-    include Loggable
-
     attr_reader :options
     
     def initialize data
@@ -238,20 +228,6 @@ module OptProc
           end
         end
       end
-
-      if false
-        [ @longopts, @shortopts ].each do |list|
-          list.each_with_index do |v, idx|
-            log { "#{idx} => #{v.inspect}" }
-          end
-        end
-        [ @regexps ].each do |map|
-          map.each do |k, v|
-            log { "#{k} => #{v.inspect}" }
-          end
-        end
-      end
-
     end
 
     COMBINED_OPTS_RES = [
@@ -264,14 +240,9 @@ module OptProc
     def process_option args
       opt = args[0]
 
-      # log { "processing option #{opt}" }
-
       if md = COMBINED_OPTS_RES.collect { |re| re.match opt }.detect
         lhs = md[1]
         rhs = "-" + md[2]
-
-        # log { "lhs, rhs: #{lhs.inspect}, #{rhs.inspect}" }
-        
         args[0, 1] = lhs, rhs
         
         return process_option args
@@ -286,7 +257,6 @@ module OptProc
                       @shortopts[ch]
                     end
 
-        # log { "opts: #{assocopts.inspect}" }
         if assocopts && x = set_option(assocopts, args)
           return x
         end
@@ -295,9 +265,6 @@ module OptProc
       if x = set_option(@options, args)
         return x
       elsif @bestmatch
-        # what's the best match here ...?
-        log { "bestmatch: #{@bestmatch}" }
-        log { "bestopts : #{@bestopts.inspect}" }
         if @bestopts.size == 1
           @bestopts[0].set_value args
           return @bestopts[0]
@@ -316,20 +283,17 @@ module OptProc
       @bestopts  = Array.new
       
       optlist.each do |option|
-        if mv = option.match(args)
-          if mv >= 1.0
-            # exact match:
-            option.set_value args
-            return option
-          elsif !@bestmatch || @bestmatch <= mv
-            @bestmatch = mv
-            @bestopts  << option
-          end
+        next unless mv = option.match(args)
+        if mv >= 1.0
+          # exact match:
+          option.set_value args
+          return option
+        elsif !@bestmatch || @bestmatch <= mv
+          @bestmatch = mv
+          @bestopts  << option
         end
       end
       nil
     end
-    
   end
-
 end

data/lib/riel/string.rb

@@ -27,7 +27,7 @@ class String
   def num
     begin
       Integer self
-    rescue ArgumentError => ae
+    rescue ArgumentError
       nil
     end
   end

data/lib/riel.rb

@@ -4,7 +4,7 @@ $:.unshift(riellibdir) unless
   $:.include?(riellibdir) || $:.include?(File.expand_path(riellibdir))
 
 module RIEL
-  VERSION = '1.1.11'
+  VERSION = '1.1.12'
 end
 
 rbfiles = Dir[riellibdir + "/riel/**/*.rb"]

data/test/riel/dir_test.rb

@@ -27,17 +27,6 @@ class DirTestCase < Test::Unit::TestCase
     testdir.mkdir
     assert testdir.exist?
 
-    # create a structure like this:
-    layout = [
-      :a => [ 
-        :a0 => %w{ a00 a01 a02 }
-      ],
-      :b => [ 
-        :b0 => %w{  },
-        :b1 => %w{ b10 b11 }
-      ]
-    ]
-
     a = testdir + 'a'
     a.mkdir
     (0 .. 5).each do |ai|

data/test/riel/optproc_test.rb

@@ -205,9 +205,9 @@ class OptProcTestCase < Test::Unit::TestCase
 
   def test_value_regexp
     @range_start = nil
-    opt = OptProc::Option.new(:tags    => %w{ --after },
-                              :arg     => [ :required, :regexp, %r{ ^ (\d+%?) $ }x ],
-                              :set     => Proc.new { |md| @range_start = md[1] })
+    opt = OptProc::Option.new(:tags => %w{ --after },
+                              :arg  => [ :required, :regexp, %r{ ^ (\d+%?) $ }x ],
+                              :set  => Proc.new { |md| @range_start = md[1] })
     
     %w{ 5 5% 10 90% }.each do |rg|
       [

data/test/riel/rcfile_test.rb

@@ -31,10 +31,7 @@ class RCFileTestCase < Test::Unit::TestCase
       
     rc = RCFile.new tempfile
     (0 ... num).each do |i|
-      key = "name#{i}"
       assert_not_nil rc.settings[i]
-      pair = rc.settings[i]
-      
       assert_equal [ "name#{i}", "value#{i}" ], rc.settings[i]
     end
   end

data/test/riel/text_test.rb

@@ -93,6 +93,6 @@ class TextTestCase < Test::Unit::TestCase
     str = "precision"
 
     # this tests that string.reverse does not mean ANSI reverse
-    assert_equal "noisicerp", "precision".reverse
+    assert_equal "noisicerp", str.reverse
   end
 end

data/test/riel/timer_test.rb

@@ -21,7 +21,7 @@ class TimerTestCase < Test::Unit::TestCase
   def test_to_stdout
     orig_out = $stdout
     $stdout = StringIO.new
-    timer = Timer.new(TIMER_STRING) do
+    Timer.new(TIMER_STRING) do
       sleep 0.1
     end
 
@@ -32,7 +32,7 @@ class TimerTestCase < Test::Unit::TestCase
   
   def test_to_io
     stringio = StringIO.new
-    timer = Timer.new("sleep for a second", :io => stringio) do
+    Timer.new("sleep for a second", :io => stringio) do
       sleep 0.1
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riel
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 1
-  - 11
-  version: 1.1.11
+  - 12
+  version: 1.1.12
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-22 00:00:00 -05:00
+date: 2012-11-23 00:00:00 -05:00
 default_executable: 
 dependencies: []