riel 1.0.0 → 1.1.2

data/lib/riel/hash.rb

@@ -9,4 +9,7 @@ class Hash
   end
   $-w = true
 
+  #$$$ add HashToArray
+  # checkins_by_month = Hash.new { |hash, key| hash[key] = Array.new }
+
 end

data/lib/riel/io.rb

@@ -1,6 +1,9 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'riel/file'
+
+
 class IO
 
   $-w = false
@@ -17,4 +20,14 @@ class IO
 
   $-w = true
 
+  def self.writelines(name, lines)
+    fpn = File._to_pathname(name)
+    
+    fpn.open(File::WRONLY | File::TRUNC | File::CREAT) do |f|
+      f.puts lines
+    end
+
+    fpn
+  end
+
 end

data/lib/riel/pathname.rb

@@ -13,4 +13,12 @@ class Pathname
     basename.to_s - extname.to_s
   end
 
+  # Returns an array of the path split into its components.
+  # for example: "/usr/bin/ls" => "usr", "bin", "ls"
+  def split_path
+    elements = Array.new
+    each_filename { |fn| elements << fn.to_s }
+    elements
+  end
+
 end

data/lib/riel/string.rb

@@ -3,13 +3,27 @@
 
 require 'riel/text'
 
+#
+# = string.rb
+#
+# RIEL extensions to the Ruby String class.
+#
+# Author:: Jeff Pace <jpace@incava.org>
+# 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.
+  #
+  # Returns the string, as a number if it is one, and nil otherwise,
+  #
   def num
     begin
       Integer(self)
@@ -18,31 +32,59 @@ class String
     end
   end
 
-  # returns a string based on this instance, with the first occurrance of
+  # 
+  # 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
 
+  # 
+  # Represents infinity, for the +to_ranges+ function.
+  #
   Infinity = (1.0 / 0)
 
+  # :stopdoc:
   #                       from  (maybe   to           this)
   RANGE_REGEXP = %r{^ \s* (\d*) (?: \s* (\-|\.\.) \s* (\d*) )? \s* $ }x
+  # :startdoc:
 
-  # splits num into array of ranges.
-  # handles 
+  #
+  # 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
+
+  # 
+  # 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
-    str.split(%r{\s*,\s*}).each do |section|
+    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
+      from = String._matchdata_to_number(md, 1, min)
+      to   = String._has_matchdata?(md, 2) ? String._matchdata_to_number(md, 3, max) : from
 
       prevrange = ranges[-1]
 
@@ -56,26 +98,28 @@ class String
     ranges
   end
 
-  def self._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
-  end
-
-  def to_ranges
-    String.to_ranges(self)
-  end
-
+  # :stopdoc:
   HIGHLIGHTER = ::Text::ANSIHighlighter.new
-
-  # returns a highlighted (colored) version of the string, applying the regular
+  # :startdoc:
+  
+  # 
+  # Returns a highlighted (colored) version of the string, applying the regular
   # expressions in the array, which are paired with the desired color.
+  #
   def highlight(re, color)
     gsub(re) do |match|
       HIGHLIGHTER.color(color, match)
     end
   end
 
+  # :stopdoc:
+  def self._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
+  end
+  # :startdoc:
+
 end

data/test/riel/io_test.rb

@@ -2,11 +2,12 @@
 # -*- ruby -*-
 
 require 'rubyunit'
-require 'riel/env'
+require 'riel/io'
+
 
 class IOTestCase < RUNIT::TestCase
 
-  def test_readlines
+  def xtest_readlines
     orig = $/
 
     $/ = nil
@@ -19,4 +20,18 @@ class IOTestCase < RUNIT::TestCase
     $/ = orig
   end
 
+  def test_writelines
+    name = "/tmp/testfile_writelines." + $$.to_s
+    writelines = Array.new
+    writelines << "this is line one"
+    writelines << "line two is this"
+
+    puts "writelines: <<<#{writelines}>>>"
+    
+    IO.writelines(name, writelines)
+
+    readlines = IO.readlines name
+    assert_equal writelines.collect { |line| line + "\n" }, readlines
+  end
+
 end

data/test/riel/string_test.rb

@@ -11,6 +11,10 @@ class StringToRangeTestCase < RUNIT::TestCase
     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
   end
 
   def test_string_to_range
@@ -22,7 +26,7 @@ class StringToRangeTestCase < RUNIT::TestCase
 
     do_string_to_range_test([  1 ..  4 ],                                       "1-4")
     do_string_to_range_test([ -String::Infinity ..  4 ],                        "-4")
-    do_string_to_range_test([ 4 .. String::Infinity ],                          "4-")
+    do_string_to_range_test([  4 .. String::Infinity  ],                        "4-")
 
     do_string_to_range_test([ -8 ..  4 ],                                       "-4",                :min => -8)
     do_string_to_range_test([  0 ..  4 ],                                       "-4",                :min => 0)

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
-  - 0
-  version: 1.0.0
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -04:00
+date: 2011-04-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,51 +29,51 @@ extra_rdoc_files:
 - README
 files: 
 - lib/riel.rb
-- lib/riel/enumerable.rb
-- lib/riel/date.rb
-- lib/riel/text.rb
+- lib/riel/filetype.rb
 - lib/riel/rcfile.rb
-- lib/riel/dir.rb
 - lib/riel/matchdata.rb
+- lib/riel/enumerable.rb
+- lib/riel/size_converter.rb
+- lib/riel/pathname.rb
+- lib/riel/array.rb
 - lib/riel/io.rb
-- lib/riel/env.rb
+- lib/riel/regexp.rb
+- lib/riel/ansicolor.rb
+- lib/riel/date.rb
 - lib/riel/hash.rb
-- lib/riel/array.rb
 - lib/riel/optproc.rb
-- lib/riel/regexp.rb
-- lib/riel/log.rb
+- lib/riel/command.rb
+- lib/riel/tempfile.rb
 - lib/riel/file.rb
+- lib/riel/dir.rb
+- lib/riel/text.rb
+- lib/riel/env.rb
+- lib/riel/log.rb
+- lib/riel/timer.rb
 - lib/riel/string.rb
 - lib/riel/setdiff.rb
-- lib/riel/tempfile.rb
-- lib/riel/timer.rb
-- lib/riel/filetype.rb
-- lib/riel/ansicolor.rb
-- lib/riel/pathname.rb
-- lib/riel/size_converter.rb
-- lib/riel/command.rb
+- test/riel/setdiff_test.rb
+- test/riel/command_test.rb
+- test/riel/log_test.rb
+- test/riel/array_test.rb
 - test/riel/optproc_test.rb
-- test/riel/text_test.rb
+- test/riel/tempfile_test.rb
 - test/riel/timer_test.rb
-- test/riel/hash_test.rb
+- test/riel/regexp_test.rb
+- test/riel/dir_test.rb
+- test/riel/date_test.rb
+- test/riel/size_converter_test.rb
 - test/riel/env_test.rb
 - test/riel/file_test.rb
-- test/riel/size_converter_test.rb
-- test/riel/io_test.rb
-- test/riel/rcfile_test.rb
-- test/riel/log_test.rb
-- test/riel/tempfile_test.rb
 - test/riel/filetype_test.rb
-- test/riel/setdiff_test.rb
-- test/riel/array_test.rb
+- test/riel/text_test.rb
+- test/riel/string_test.rb
 - test/riel/enumerable_test.rb
-- test/riel/dir_test.rb
 - test/riel/matchdata_test.rb
 - test/riel/pathname_test.rb
-- test/riel/string_test.rb
-- test/riel/regexp_test.rb
-- test/riel/command_test.rb
-- test/riel/date_test.rb
+- test/riel/hash_test.rb
+- test/riel/rcfile_test.rb
+- test/riel/io_test.rb
 - README
 has_rdoc: true
 homepage: http://www.incava.org/projects/riel
@@ -110,25 +110,25 @@ signing_key:
 specification_version: 3
 summary: Set of extensions to core Ruby code.
 test_files: 
+- test/riel/setdiff_test.rb
+- test/riel/command_test.rb
+- test/riel/log_test.rb
+- test/riel/array_test.rb
 - test/riel/optproc_test.rb
-- test/riel/text_test.rb
+- test/riel/tempfile_test.rb
 - test/riel/timer_test.rb
-- test/riel/hash_test.rb
+- test/riel/regexp_test.rb
+- test/riel/dir_test.rb
+- test/riel/date_test.rb
+- test/riel/size_converter_test.rb
 - test/riel/env_test.rb
 - test/riel/file_test.rb
-- test/riel/size_converter_test.rb
-- test/riel/io_test.rb
-- test/riel/rcfile_test.rb
-- test/riel/log_test.rb
-- test/riel/tempfile_test.rb
 - test/riel/filetype_test.rb
-- test/riel/setdiff_test.rb
-- test/riel/array_test.rb
+- test/riel/text_test.rb
+- test/riel/string_test.rb
 - test/riel/enumerable_test.rb
-- test/riel/dir_test.rb
 - test/riel/matchdata_test.rb
 - test/riel/pathname_test.rb
-- test/riel/string_test.rb
-- test/riel/regexp_test.rb
-- test/riel/command_test.rb
-- test/riel/date_test.rb
+- test/riel/hash_test.rb
+- test/riel/rcfile_test.rb
+- test/riel/io_test.rb