props 1.0.3 → 1.1.0

data/Manifest.txt

@@ -1,10 +1,9 @@
-History.md
+HISTORY.md
 Manifest.txt
 README.md
 Rakefile
 lib/props.rb
 lib/props/db.rb
-lib/props/db/deleter.rb
 lib/props/db/models.rb
 lib/props/db/schema.rb
 lib/props/env.rb

data/Rakefile

@@ -15,7 +15,7 @@ Hoe.spec 'props' do
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
-  self.history_file = 'History.md'
+  self.history_file = 'HISTORY.md'
 
   self.licenses = ['Public Domain']
 
@@ -23,4 +23,4 @@ Hoe.spec 'props' do
    :required_ruby_version => '>= 1.9.2'
   }
 
-end
+end

data/lib/props.rb

@@ -41,11 +41,9 @@ module ConfUtils
     "props/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
-=begin
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
   end
-=end
   
 end  # module ConfUtils
 

data/lib/props/db.rb

@@ -8,9 +8,8 @@ require 'active_record'   ## todo: add sqlite3? etc.
 
 # our own code
 
-require 'props/db/models'
 require 'props/db/schema'
-require 'props/db/deleter'
+require 'props/db/models'
 
 
 module ConfDb
@@ -24,19 +23,23 @@ module ConfDb
     CreateDb.new.up
   end
 
+
   # delete ALL records (use with care!)
   def self.delete!
     puts '*** deleting props table records/data...'
-    Deleter.new.run
+    Model::Prop.delete_all
   end # method delete!
 
-  def self.stats
-    # to be done
-  end
+##  def self.stats   ## remove ? -- duplicate - use tables - why?? why not????
+##    puts "#{Model::Prop} props"
+##  end
 
+  def self.tables
+    puts "#{Model::Prop} props"
+  end
 
 end # module ConfDb
 
 
 
-puts ConfDb.banner    if $DEBUG    # say hello
+puts ConfDb.banner    # say hello

data/lib/props/db/models.rb

@@ -1,13 +1,16 @@
 # encoding: utf-8
 
 module ConfDb
-  module Models
+  module Model
 
 
 class Prop < ActiveRecord::Base
-  
+  ## some code here
 end # class Prop
 
+  end # module Model
+
+  ##### add convenience module alias in plural e.g. lets you use include ConfDb::Models
+  Models = Model
 
-  end # module Models
 end # module ConfDb

data/lib/props/db/schema.rb

@@ -6,8 +6,8 @@ class CreateDb < ActiveRecord::Migration
   def up
 
 create_table :props do |t|
-  t.string :key,   :null => false
-  t.string :value, :null => false
+  t.string :key,   null: false
+  t.string :value, null: false
   t.string :kind     # e.g. version|user|sys(tem)|db etc. # note: can NOT use type - already used by ActiveRecord
   t.timestamps
 end

data/lib/props/version.rb

@@ -1,4 +1,4 @@
 
 module ConfUtils
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/test/test_ini.rb

@@ -1,8 +1,3 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_ini.rb
-#  or better
-#     rake test
 
 require 'helper'
 
@@ -36,15 +31,15 @@ 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'] )
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: props
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &82474830 !ruby/object:Gem::Requirement
+  requirement: &71776850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *82474830
+  version_requirements: *71776850
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &82474420 !ruby/object:Gem::Requirement
+  requirement: &71916910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *82474420
+  version_requirements: *71916910
 description: props - Manage Settings Hierachies (Commandline, User, Home, Defaults,
   etc.)
 email: webslideshow@googlegroups.com
@@ -41,13 +41,12 @@ extensions: []
 extra_rdoc_files:
 - Manifest.txt
 files:
-- History.md
+- HISTORY.md
 - Manifest.txt
 - README.md
 - Rakefile
 - lib/props.rb
 - lib/props/db.rb
-- lib/props/db/deleter.rb
 - lib/props/db/models.rb
 - lib/props/db/schema.rb
 - lib/props/env.rb

data/lib/props/db/deleter.rb

@@ -1,15 +0,0 @@
-
-module ConfDb
-
-  class Deleter
-    include ConfDb::Models
-
-    def run
-      # for now delete all tables
-      
-      Prop.delete_all
-    end
-    
-  end # class Deleter
-  
-end # module ConfDb