props 1.0.0 → 1.0.1

data/Manifest.txt

@@ -1,5 +1,7 @@
-History.markdown
+History.md
 Manifest.txt
-README.markdown
+README.md
 Rakefile
 lib/props.rb
+test/helper.rb
+test/test_ini.rb

data/{README.markdown → README.md}

@@ -69,11 +69,11 @@ Just install the gem:
 
 ## Real World Usage
 
-The [`slideshow`](http://slideshow.rubyforge.org) gem (also known as Slide Show (S9))
+The [`slideshow`](http://slideshow-s9.github.io) gem (also known as Slide Show (S9))
 that lets you create slide shows
 and author slides in plain text using a wiki-style markup language that's easy-to-write and easy-to-read.
 
-The [`markdown`](http://geraldb.github.com/markdown) gem that lets you use your markdown library
+The [`markdown`](https://github.com/rubylibs/markdown) gem that lets you use your markdown library
 of choice.
 
 ## Alternatives

data/Rakefile

@@ -2,19 +2,25 @@ require 'hoe'
 require './lib/props.rb'
 
 Hoe.spec 'props' do
-  
+
   self.version = Props::VERSION
   
   self.summary = 'props - Manage Settings Hierachies (Commandline, User, Home, Defaults, etc.)'
   self.description = summary
 
-  self.urls    = ['http://geraldb.github.com/props']
-  
+  self.urls    = ['https://github.com/rubylibs/props']
+
   self.author  = 'Gerald Bauer'
   self.email   = 'webslideshow@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
-  self.readme_file  = 'README.markdown'
-  self.history_file = 'History.markdown'
-  
+  self.readme_file  = 'README.md'
+  self.history_file = 'History.md'
+
+  self.licenses = ['Public Domain']
+
+  self.spec_extras = {
+   :required_ruby_version => '>= 1.9.2'
+  }
+
 end

data/lib/props.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 # core and stlibs
 
@@ -24,8 +25,8 @@ class Env
                 else
                    '/'
                 end
-              end
-            end
+             end
+           end
      
     # todo: use logger - how?
     ## puts "env home=>#{path}<"
@@ -36,9 +37,82 @@ class Env
 end # class Env
 
 
+module INI
+
+  def self.load_file( path )
+    # returns a nested hash
+    #  (compatible structure - works like YAML.load_file)
+
+    text = File.open( path, 'r:bom|utf-8' ).read
+    self.load( text )
+  end
+
+
+  def self.load( text )
+    hash = top_hash = Hash.new
+
+    text = text.gsub( "\t", ' ' )   # replace all tabs w/ spaces
+
+    text.each_line do |line|
+
+      ### skip comments
+      #  e.g.   # this is a comment line
+      #  or     ; this too
+      #  or     --  haskell style
+      #  or     %   text style
+
+      if line =~ /^\s*#/ || line =~ /^\s*;/ || line =~ /^\s*--/ || line =~ /^\s*%/
+        ## logger.debug 'skipping comment line'
+        next
+      end
+
+      ### skip blank lines
+      if line =~ /^\s*$/ 
+        ## logger.debug 'skipping blank line'
+        next
+      end
+
+      # pass 1) remove possible trailing eol comment
+      ##  e.g    -> New York   # Sample EOL Comment Here (with or without commas,,,,)
+      ## becomes -> New York
+
+      line = line.sub( /\s+#.*$/, '' )
+
+      # pass 2) remove leading and trailing whitespace
+      
+      line = line.strip
+ 
+      ## check for new section e.g.  [planet012-xxx_bc]
+
+      ### todo: allow _ or - in strict section key? why? why not??
+      ###   allow _ or - in value key? why why not??
+      if line =~ /^\s*\[\s*([a-z0-9_\-]+)\s*\]\s*$/   # strict section
+        key = $1.to_s.dup
+        hash = top_hash[ key ] = Hash.new
+      elsif line =~ /^\s*\[\s*([^ \]]+)\s*\]\s*$/     # liberal section; allow everything in key
+        key = $1.to_s.dup
+        hash = top_hash[ key ] = Hash.new
+      elsif line =~ /^\s*([a-z0-9_\-]+)\s*[:=](.*)$/
+        key   = $1.to_s.dup
+        value = $2.to_s.strip.dup   # check if it can be nil? if yes use blank string e.g. ''
+        ### todo:  strip quotes from value??? why? why not?
+        hash[ key ] = value
+      else
+        puts "*** warn: skipping unknown line type in ini >#{line}<"
+      end
+    end # each lines
+
+    top_hash
+  end # method load
+
+
+end  # module INI
+
+
+
 class Props
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   attr_reader :path
   attr_reader :parent

data/test/helper.rb

@@ -0,0 +1,13 @@
+## $:.unshift(File.dirname(__FILE__))
+
+## minitest setup
+
+# require 'minitest/unit'
+require 'minitest/autorun'
+
+# include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
+
+
+## our own code
+
+require 'props'

data/test/test_ini.rb

@@ -0,0 +1,50 @@
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_ini.rb
+#  or better
+#     rake test
+
+require 'helper'
+
+class TestIni < MiniTest::Unit::TestCase
+
+
+  def test_load
+
+    text = <<EOS
+  # comment
+  ; another comment
+  
+   key1 = hello
+   key2 : hi!
+   
+   [section1]
+   key3 = salut   # end of line comment here
+   
+   [section2]
+   key4: hola
+   blank =
+   blank2:
+   
+   [ http://example.com ]
+   title =  A rose is a rose is a rose, eh?
+   title2:  A rose is a rose is a rose, eh?   # comment here
+   ; another one here
+   title3 = A rose is a rose is a rose, eh?
+EOS
+
+    hash = INI.load( text )
+    pp hash
+
+    assert( hash['key1'] == 'hello' )
+    assert( hash['key2'] == 'hi!' )
+    assert( hash['section1']['key3'] == 'salut' )
+    assert( hash['section2']['key4'] == 'hola' )
+    assert( hash['section2']['blank'] == '' )
+    assert( hash['section2']['blank2'] == '' )
+    assert( hash['http://example.com']['title'] == 'A rose is a rose is a rose, eh?' )
+    assert( hash['http://example.com']['title2'] == 'A rose is a rose is a rose, eh?' )
+    assert( hash['http://example.com']['title3'] == 'A rose is a rose is a rose, eh?' )
+  end
+
+end

metadata

@@ -1,99 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: props
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &83434100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *83434100
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &83477370 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
-  version_requirements: *id002
-description: props - Manage Settings Hierachies (Commandline, User, Home, Defaults, etc.)
+  prerelease: false
+  version_requirements: *83477370
+description: props - Manage Settings Hierachies (Commandline, User, Home, Defaults,
+  etc.)
 email: webslideshow@googlegroups.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
-files: 
-- History.markdown
+files:
+- History.md
 - Manifest.txt
-- README.markdown
+- README.md
 - Rakefile
 - lib/props.rb
-homepage: http://geraldb.github.com/props
-licenses: []
-
+- test/helper.rb
+- test/test_ini.rb
+- .gemtest
+homepage: https://github.com/rubylibs/props
+licenses:
+- Public Domain
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-- README.markdown
-require_paths: 
+- README.md
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: props
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: props - Manage Settings Hierachies (Commandline, User, Home, Defaults, etc.)
-test_files: []
-
+test_files:
+- test/test_ini.rb