props 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c63a383991a49afc70efa89d982e2855eb99cfc
-  data.tar.gz: 716a1d2d01d3b8d2eb071883e2b2dbd1bbb64b3f
+  metadata.gz: b88d1e58bc4160d79848f192186a8cc375d4a82d
+  data.tar.gz: 9edc188d3a49723dd51167359a772a8e66768531
 SHA512:
-  metadata.gz: 0565dc3e9df6e002ec7d92c4ae6f31421e150481123dc98acc0030cb19ab746cf529464d805090c06d38d27d64ddbc092e21f7e46494d3583b6a25d90638e524
-  data.tar.gz: 6ea4e12bc301929f8664f9b0ef703764c86cd53a3e6e045a6b7b7562a0359313b2fb2886235062b777a188147afe87eb98c266cf7e12d402dec13350552f9260
+  metadata.gz: 1fa51b77c8226beab7f8ca48577f16eb8fdd4a3de1d2a956999471051a26c679eee5a1a387513e6d5f123ac47300368529b64c3dfab4ae25310ad60886d52053
+  data.tar.gz: 8843e8df31d1cd0ec492804a0d4572883cd2f6f9d85f95d99056dbf774ab4588e028b1ca03532ab8a2e35ea46e97fcc3e02d256c5cbe68c835df1385aebe5a80

data/Manifest.txt

@@ -1,11 +1,10 @@
-HISTORY.md
-Manifest.txt
-README.md
-Rakefile
-lib/props.rb
-lib/props/env.rb
-lib/props/ini.rb
-lib/props/props.rb
-lib/props/version.rb
-test/helper.rb
-test/test_ini.rb
+HISTORY.md
+Manifest.txt
+README.md
+Rakefile
+lib/props.rb
+lib/props/env.rb
+lib/props/props.rb
+lib/props/version.rb
+test/helper.rb
+test/test_version.rb

data/README.md

@@ -12,7 +12,7 @@
 
 Example:
 
-~~~
+``` ruby
 class Config
 
   DEFAULTS = { 'libs' => [ 'kramdown' ],
@@ -44,9 +44,9 @@ class Config
       puts "Loading settings from '#{props_home_file}'..."
       @props = @props_home = Props.load_file( props_home_file, @props )
     end
-      
+
     # check for user settings (markdown.yml) in working folder
-    
+
     props_work_file = File.join( '.', 'markdown.yml' )
     if File.exists?( props_work_file )
       puts "Loading settings from '#{props_work_file}'..."
@@ -59,23 +59,23 @@ class Config
   end
 
   ...
-  
+
 end # class Config
-~~~
+```
 
 
 ### Environment
 
 Example:
 
-~~~
->> Env.home
+``` ruby
+puts Env.home
 # => '/home/gerald'
-~~~
+```
 
 Backstage the `Env.home` code looks something like:
 
-~~~
+``` ruby
 path = if( ENV['HOME'] || ENV['USERPROFILE'] )
          ENV['HOME'] || ENV['USERPROFILE']
        elsif( ENV['HOMEDRIVE'] && ENV['HOMEPATH'] )
@@ -91,42 +91,20 @@ path = if( ENV['HOME'] || ENV['USERPROFILE'] )
             end
          end
        end
-~~~
+```
 
 
 `Env.path` returns `ENV[ 'PATH' ]` - splits all path entries
  w/ file separator (e.g. `;` or `:`) and returns string array
 
-~~~
->> Env.path
+``` ruby
+puts Env.path
 # => ['/usr/local/sbin',
-      '/usr/local/bin',
-      '/usr/sbin',
-      ...
-     ]
-~~~
-
-
-### INI
-
-Example:
-
-~~~
-config_path = './ruby.ini'
-~~~
-
-Opt 1) `INI.load` - load from string. Example:
-
-~~~
-text   = File.read( config_path )
-config = INI.load( text )
-~~~
-
-Opt 2) `INI.load_file` - load from file (shortcut). Example:
-
-~~~
-config = INI.load_file( config_path )
-~~~
+#      '/usr/local/bin',
+#      '/usr/sbin',
+#      ...
+#     ]
+```
 
 
 
@@ -144,7 +122,7 @@ The [`slideshow`](http://slideshow-s9.github.io) gem (also known as Slide Show (
 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 [`pluto`](http://feedreader.github.io) gem 
+The [`pluto`](http://feedreader.github.io) gem
 that lets you auto-build web pages from web feeds.
 
 The [`markdown`](https://github.com/rubylibs/markdown) gem that lets you use your markdown library
@@ -152,20 +130,14 @@ of choice.
 
 
 
-## Alternatives
-
-### Config / Settings
-
-* [`configtoolkit`](http://configtoolkit.rubyforge.org) gem
-
-### Environment / Env
+## License
 
-* [`env`](https://github.com/postmodern/env) gem
+![](https://publicdomainworks.github.io/buttons/zero88x31.png)
 
-### Ini
+The `props` scripts are dedicated to the public domain.
+Use it as you please with no restrictions whatsoever.
 
 
-## License
+## Questions? Comments?
 
-The `props` scripts are dedicated to the public domain.
-Use it as you please with no restrictions whatsoever.
+Post them to the [wwwmake forum](http://groups.google.com/group/wwwmake). Thanks!

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'props' do
   self.urls    = ['https://github.com/rubylibs/props']
 
   self.author  = 'Gerald Bauer'
-  self.email   = 'webslideshow@googlegroups.com'
+  self.email   = 'wwwmake@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
@@ -19,6 +19,10 @@ Hoe.spec 'props' do
 
   self.licenses = ['Public Domain']
 
+  self.extra_deps = [
+      ['iniparser', '>=0.1.0'],
+    ]
+
   self.spec_extras = {
     required_ruby_version: '>= 1.9.2'
   }

data/lib/props.rb

@@ -8,11 +8,14 @@ require 'fileutils'
 require 'erb'
 
 
+# 3rd party
+require 'iniparser'    # (auto-)include INI.load for now (was part of props - now its own gem)
+
+
 # our own code
 
 require 'props/version'   # version always goes first
 require 'props/env'
-require 'props/ini'
 require 'props/props'
 
 
@@ -23,16 +26,6 @@ Env   = ConfUtils::Env
 Props = ConfUtils::Props
 
 
-module INI
-
-  # returns a nested hash
-  #  (compatible structure - works like YAML.load_file)
-
-  def self.load_file( path  )   ConfUtils::IniFile.load_file( path );  end
-  def self.load( text )         ConfUtils::IniFile.load( text );   end
-
-end  # module INI
-
 
 
 puts ConfUtils.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)   # say hello

data/lib/props/version.rb

@@ -3,8 +3,8 @@
 module ConfUtils
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 1
-  PATCH = 2
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -21,4 +21,3 @@ module ConfUtils
   end
 
 end # module ConfUtils
-

data/test/test_version.rb

@@ -0,0 +1,14 @@
+
+require 'helper'
+
+
+class TestVersion < MiniTest::Test
+
+  def test_version
+
+   puts ConfUtils::VERSION
+
+   assert true
+  end
+
+end # class test_version

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: props
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: iniparser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -30,17 +44,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
 description: props - Manage Settings Hierachies (Commandline, User, Home, Defaults,
   etc.)
-email: webslideshow@googlegroups.com
+email: wwwmake@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -48,18 +62,16 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
 - Rakefile
 - lib/props.rb
 - lib/props/env.rb
-- lib/props/ini.rb
 - lib/props/props.rb
 - lib/props/version.rb
 - test/helper.rb
-- test/test_ini.rb
+- test/test_version.rb
 homepage: https://github.com/rubylibs/props
 licenses:
 - Public Domain
@@ -82,9 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: props - Manage Settings Hierachies (Commandline, User, Home, Defaults, etc.)
-test_files:
-- test/test_ini.rb
+test_files: []

data/lib/props/ini.rb

@@ -1,84 +0,0 @@
-
-module ConfUtils
-
-
-class IniFile
-
-  # returns a nested hash
-  #  (compatible structure - works like YAML.load_file)
-
-  def self.load_file( path )
-    text = File.open( path, 'r:bom|utf-8' ).read
-    self.load( text )
-  end
-
-  def self.load( text )
-    IniFile.new( text ).parse
-  end
-
-
-  def initialize( text )
-    @text = text
-  end
-
-  def parse
-    hash = top_hash = Hash.new
-
-    text = @text
-    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
-  
-end # class IniReader
-
-end # module ConfUtils

data/test/test_ini.rb

@@ -1,45 +0,0 @@
-
-require 'helper'
-
-
-class TestIni < MiniTest::Test
-
-  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_equal 'hello', hash['key1']
-    assert_equal 'hi!',   hash['key2']
-    assert_equal 'salut', hash['section1']['key3']
-    assert_equal 'hola',  hash['section2']['key4']
-    assert_equal '',      hash['section2']['blank']
-    assert_equal '',      hash['section2']['blank2']
-    assert_equal 'A rose is a rose is a rose, eh?', hash['http://example.com']['title']
-    assert_equal 'A rose is a rose is a rose, eh?', hash['http://example.com']['title2']
-    assert_equal 'A rose is a rose is a rose, eh?', hash['http://example.com']['title3']
-  end
-
-end