riel 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9fec4fdc968d7eac63fc2e894a6bd3b2252d86f
-  data.tar.gz: 38b6c94c7045866f8fbf88fdd6ec7861a0bd0750
+  metadata.gz: 556377e46b194e614f127b38aed69a4a219c7649
+  data.tar.gz: f8dcbbd034dca93cd8951c472b6a08a0f01921a4
 SHA512:
-  metadata.gz: 59546acde4a6fdf7d2716be86af60d2cc6c5a3a6fa389dede2790de02c2c251f6708510f59413c07c6f79604529c8c957cd4a5e48250f1007ecf3cae9740a10f
-  data.tar.gz: a2d02521a496858feb6d9d08dfb2fca21ec6bf7f97c9b381ef971554ad49a8c8bf9ec6f30ebeb1d0106e557b04a474a4b1c544ce928ea94b251810c44cb432f2
+  metadata.gz: '08816409b9098824794181fbb0169bca37ea211e0da34cc5d052d02a6ed34b37284bb3c9932c0440dfcf1a36a95ce36d2c2c287b4f56126dbfb43417ed58808b'
+  data.tar.gz: 2af4733c75275ceb397aa619269846a51bde309f568177d62a6560c83aaeb331747cfd91d7e229027b516d7fe3c68afc72c520a3f5952c77859c79f2b1ba06e5

data/lib/riel/filetype.rb

@@ -121,7 +121,7 @@ class FileType
   end
 
   def text? file
-    return false unless File.exists?(file)
+    return false unless File.exist?(file)
     
     if md = EXTENSION_REGEXP.match(file.to_s)
       suffix = md[1]

data/lib/riel/rcfile.rb

@@ -1,31 +1,36 @@
 #!/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 ':'.
+# 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
-  # with each name/value pair, which are also accessible via
-  # <code>settings</code>.
+  # Reads the RC file, if it exists, and if a block is passed, calls the block with each name/value
+  # pair, which are also accessible via <code>settings</code>.
 
-  def initialize(fname, &blk)
+  def initialize args = Hash.new, &blk
     @settings = Array.new
+
+    unless lines = args[:lines]
+      if fname = args[:filename]
+        lines = IO::readlines fname
+      end
+    end
+
+    cmtre = Regexp.new '\s*#.*'
+    nvre = Regexp.new '\s*[=:]\s*'
     
-    if File.exists? fname
-      IO::readlines(fname).each do |line|
-        line.sub!(/\s*#.*/, "")
-        line.chomp!
-        name, value = line.split(/\s*[=:]\s*/)
-        if name && value
-          name.strip!
-          value.strip!
-          @settings << [ name, value ]
-          if blk
-            blk.call name, value
-          end
+    lines.each do |line|
+      line.sub! cmtre, ''
+      name, value = line.split nvre
+      if name && value
+        name.strip!
+        value.strip!
+        @settings << [ name, value ]
+        if blk
+          blk.call name, value
         end
       end
     end

data/test/riel/rcfile_test.rb

@@ -3,36 +3,40 @@
 
 require 'test/unit'
 require 'riel/rcfile'
-require 'riel/tempfile'
+require 'paramesan'
 
 class RCFileTestCase < Test::Unit::TestCase
-  def test_simple
-    separators = %w{ = : }
-    leading_spaces = [ "", " ", "  " ]
-    trailing_spaces = leading_spaces.dup
-    comments = [ "", "# a comment" ]
-    
-    num = 0
-    tempfile = Tempfile.open("rcfile_test") do |tf|
-      tf.puts "# this is a comment"
-      tf.puts ""
-      
-      separators.each do |sep|
-        leading_spaces.each do |lsp|
-          trailing_spaces.each do |tsp|
-            comments.each do |cmt|
-              tf.puts "#{lsp}name#{num}#{sep}value#{num}#{tsp}#{cmt}"
-              num += 1
-            end
-          end
-        end
+  include Paramesan
+
+  def self.build_params
+    kv = [ "k", "v" ]
+    kvary = [ kv ]
+
+    Array.new.tap do |params|
+      params << [ Array.new, Array.new ]
+      params << [ Array.new, [ "" ] ]
+      [ "k:v", "k: v", "k :v", "k=v", "k= v", "k =v", "k:v ", " k:v" ].each do |line|
+        params << [ kvary, [ line ] ]
       end
+      params << [ kvary, [ "", "k:v" ] ]
+      params << [ kvary, [ "# comment", "k:v" ] ]
+      params << [ kvary, [ "  # comment", "k:v" ] ]
+      params << [ Array.new, [ "k:#v" ] ]
+      params << [ [ [ "k", "v" ] ], [ "k:v#x" ] ]
+      params << [ [ [ "k", "v" ], [ "k2", "v2" ] ], [ "k:v", "k2:v2" ] ]
     end
-      
-    rc = RCFile.new tempfile
-    (0 ... num).each do |i|
-      assert_not_nil rc.settings[i]
-      assert_equal [ "name#{i}", "value#{i}" ], rc.settings[i]
+  end
+
+  param_test build_params do |exp, lines|
+    rc = RCFile.new lines: lines
+    assert_equal exp, rc.settings, "lines: #{lines}"
+  end
+
+  def test_block
+    called = Array.new
+    RCFile.new(lines: [ "k:v" ]) do |key, value|
+      called << [ key, value ]
     end
+    assert_equal [ [ "k", "v" ] ], called
   end
 end

data/test/riel/regexp_test.rb

@@ -22,7 +22,7 @@ class RegexpTestCase < Test::Unit::TestCase
   
   def test_invalid_whole_word
     assert_raises(RuntimeError) do
-      re = Regexp.create ':abc', wholewords: true
+      Regexp.create ':abc', wholewords: true
     end
   end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: riel
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: paramesan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library extends the core Ruby libraries.
 email: jeugenepace@gmail.com
 executables: []
@@ -31,6 +45,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- README.md
 - lib/riel.rb
 - lib/riel/command.rb
 - lib/riel/date.rb
@@ -71,8 +86,7 @@ files:
 - test/riel/string_test.rb
 - test/riel/tempfile_test.rb
 - test/riel/timer_test.rb
-- README.md
-homepage: http://www.incava.org/projects/riel
+homepage: http://www.github.com/jpace/riel
 licenses: []
 metadata: {}
 post_install_message: 
@@ -81,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Extensions to core Ruby code.