worlddb 1.2.0 → 1.3.0

data/README.md

@@ -1,8 +1,10 @@
-# worlddb
+# worlddb - world.db Command Line Tool in Ruby
 
-world.db Command Line Tool in Ruby
-
-* [geraldb.github.com/world.db](http://geraldb.github.com/world.db)
+* home  :: [github.com/geraldb/world.db.ruby](https://github.com/geraldb/world.db.ruby)
+* bugs  :: [github.com/geraldb/world.db.ruby/issues](https://github.com/geraldb/world.db.ruby/issues)
+* gem   :: [rubygems.org/gems/worldb](https://rubygems.org/gems/worlddb)
+* rdoc  :: [rubydoc.info/gems/wrolddb](http://rubydoc.info/gems/worlddb)
+* forum :: [groups.google.com/group/opensport](https://groups.google.com/group/opensport)
 
 
 ## Usage

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.spec 'worlddb' do
   self.email   = 'opensport@googlegroups.com'
   
   self.extra_deps = [
-    ['textutils', '~> 0.4.0'],
+    ['textutils', '>= 0.5.0'],
     ['commander', '~> 4.1.3'],
     ['activerecord', '~> 3.2']  # NB: will include activesupport,etc.
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
@@ -58,6 +58,8 @@ namespace :dev do
   task :env => BUILD_DIR do
     require './lib/worlddb.rb'
 
+    LogUtils::Logger.root.level = :info
+
     pp DB_CONFIG
     ActiveRecord::Base.establish_connection( DB_CONFIG )
   end
@@ -67,7 +69,7 @@ namespace :dev do
   end
   
   task :import => :env do
-    WorldDB.read_all  # populate world tables
+    WorldDB.read_all( '../world.db' )  # populate world tables
     WorldDB.stats
   end
 

data/lib/worlddb/cli/main.rb

@@ -5,6 +5,7 @@ require 'commander/import'
 require 'logutils/db'   # add support for logging to db
 require 'worlddb/cli/opts'
 
+LogUtils::Logger.root.level = :info   # set logging level to info 
 
 
 program :name,  'worlddb'
@@ -44,6 +45,10 @@ global_option '-i', '--include PATH', String, "Data path (default is #{myopts.da
 global_option '-d', '--dbpath PATH', String, "Database path (default is #{myopts.db_path})"
 global_option '-n', '--dbname NAME', String, "Database name (datault is #{myopts.db_name})"
 
+global_option '-q', '--quiet', "Only show warnings, errors and fatal messages"
+### todo/fix: just want --debug/--verbose flag (no single letter option wanted) - fix
+global_option '-w', '--verbose', "Show debug messages"
+
 
 def connect_to_db( options )
   puts WorldDB.banner
@@ -68,6 +73,10 @@ command :create do |c|
   c.syntax = 'worlddb create [options]'
   c.description = 'Create DB schema'
   c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts )
     
@@ -84,6 +93,10 @@ command :setup do |c|
   c.option '--delete', 'Delete all records'
 
   c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts )
 
@@ -115,6 +128,10 @@ command :load do |c|
   c.option '--delete', 'Delete all records'
 
   c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts )
     
@@ -147,16 +164,59 @@ command :stats do |c|
   c.syntax = 'worlddb stats [options]'
   c.description = 'Show stats'
   c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts ) 
     
-    WorldDB.stats
+    WorldDB.tables
     
     puts 'Done.'
   end
 end
 
 
+command :props do |c|
+  c.syntax = 'worlddb props [options]'
+  c.description = 'Show props'
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts ) 
+    
+    WorldDB.props
+    
+    puts 'Done.'
+  end
+end
+
+
+command :logs do |c|
+  c.syntax = 'worlddb logs [options]'
+  c.description = 'Show logs'
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts ) 
+    
+    LogDB::Models::Log.all.each do |log|
+      puts "[#{log.level}] -- #{log.msg}"
+    end
+    
+    puts 'Done.'
+  end
+end
+
+
+
 command :test do |c|
   c.syntax = 'worlddb test [options]'
   c.description = 'Debug/test command suite'

data/lib/worlddb/reader.rb

@@ -2,9 +2,7 @@ module WorldDB
 
 class Reader
 
-  def logger
-    @logger ||= LogUtils[ self ]
-  end
+  include LogUtils::Logging
 
 ## make models available in sportdb module by default with namespace
 #  e.g. lets you use City instead of Models::City

data/lib/worlddb/version.rb

@@ -1,4 +1,4 @@
 
 module WorldDB
-  VERSION = '1.2.0'  # sync version w/ sport.db - why? why not?
+  VERSION = '1.3.0'  # sync version w/ sport.db - why? why not?
 end

metadata

@@ -1,108 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: worlddb
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: textutils
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &73677590 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: commander
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *73677590
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: &73677370 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 4
-        - 1
-        - 3
+      - !ruby/object:Gem::Version
         version: 4.1.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *73677370
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &73677160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        version: "3.2"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *73677160
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &73676940 !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: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *73676940
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &73676720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 3
-        version: "3.3"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *73676720
 description: worlddb - world.db command line tool
 email: opensport@googlegroups.com
-executables: 
+executables:
 - worlddb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
-files: 
+files:
 - History.md
 - Manifest.txt
 - README.md
@@ -128,40 +99,30 @@ files:
 - lib/worlddb/utils.rb
 - lib/worlddb/version.rb
 homepage: https://github.com/geraldb/world.db.ruby
-licenses: 
+licenses:
 - Public Domain
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+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: 55
-      segments: 
-      - 1
-      - 9
-      - 2
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+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: worlddb
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: worlddb - world.db command line tool
 test_files: []
-