sportdb 1.2.0 → 1.3.0

data/README.md

@@ -1,8 +1,12 @@
-# sportdb
+# sportdb - sport.db Command Line Tool in Ruby
 
-sport.db Command Line Tool in Ruby
+[![Build Status](https://secure.travis-ci.org/geraldb/sport.db.ruby.png?branch=master)](http://travis-ci.org/geraldb/sport.db.ruby)
 
-* [geraldb.github.com/sport.db](http://geraldb.github.com/sport.db)
+* home  :: [github.com/geraldb/sport.db.ruby](https://github.com/geraldb/sport.db.ruby)
+* bugs  :: [github.com/geraldb/sport.db.ruby/issues](https://github.com/geraldb/sport.db.ruby/issues)
+* gem   :: [rubygems.org/gems/sportdb](https://rubygems.org/gems/sportdb)
+* rdoc  :: [rubydoc.info/gems/sportdb](http://rubydoc.info/gems/sportdb)
+* forum :: [groups.google.com/group/opensport](https://groups.google.com/group/opensport)
 
 
 ## Usage

data/Rakefile

@@ -23,7 +23,7 @@ Hoe.spec 'sportdb' do
   # self.history_file = 'History.md'
   
   self.extra_deps = [
-    ['worlddb', '~> 1.2.0'],  # NB: worlddb already includes
+    ['worlddb', '~> 1.3.0'],  # NB: worlddb already includes
                                #         - commander
                                #         - logutils
                                #         - textutils

data/lib/sportdb/cli/main.rb

@@ -1,5 +1,14 @@
 # encoding: utf-8
 
+##############
+# nb: for local testing use:
+#    
+#  ruby -I ../../github/sport.db.ruby/lib
+#        ../../github/sport.db.ruby/lib/sportdb.rb
+#        setup --delete --sport
+#        --include ../../github/football.db
+
+
 require 'commander/import'
 
 # our own code / additional for cli only
@@ -7,6 +16,7 @@ require 'commander/import'
 require 'logutils/db'
 require 'sportdb/cli/opts'
 
+LogUtils::Logger.root.level = :info   # set logging level to info 
 
 program :name,  'sportdb'
 program :version, SportDB::VERSION
@@ -46,6 +56,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 SportDB.banner
@@ -70,6 +84,10 @@ command :create do |c|
   c.syntax = 'sportdb 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 )
     
@@ -92,6 +110,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 )
     
@@ -134,6 +156,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 )
     
@@ -160,14 +186,56 @@ command :load do |c|
 end # command load
 
 
+command :logs do |c|
+  c.syntax = 'sportdb 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 :stats do |c|
   c.syntax = 'sportdb 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 ) 
+    
+    SportDB.tables
+    
+    puts 'Done.'
+  end
+end
+
+
+command :props do |c|
+  c.syntax = 'sportdb 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 ) 
     
-    SportDB.stats
+    SportDB.props
     
     puts 'Done.'
   end
@@ -178,6 +246,10 @@ command :test do |c|
   c.syntax = 'sportdb test [options]'
   c.description = 'Debug/test command suite'
   c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
     puts "hello from test command"
     puts "args (#{args.class.name}):"
     pp args
@@ -185,6 +257,11 @@ command :test do |c|
     pp options
     puts "options.__hash__:"
     pp options.__hash__
+    
+    LogUtils::Logger.root.debug 'test debug msg'
+    LogUtils::Logger.root.info 'test info msg'
+    LogUtils::Logger.root.warn 'test warn msg'
+    
     puts 'Done.'
   end
 end

data/lib/sportdb/lang.rb

@@ -4,9 +4,7 @@ module SportDB
 
 class Lang
 
-  def logger
-    @logger ||= LogUtils[ self ]
-  end
+  include LogUtils::Logging
 
   def initialize
 
@@ -29,9 +27,9 @@ class Lang
     @words_de = fixtures_hash_to_words_ary( @fixtures_de )
     @words_es = fixtures_hash_to_words_ary( @fixtures_es )
     
-    puts "en - #{@words_en.size} words: #{@words_en}"
-    puts "de - #{@words_de.size} words: #{@words_de}"
-    puts "es - #{@words_es.size} words: #{@words_es}"
+    logger.debug "en - #{@words_en.size} words: #{@words_en}"
+    logger.debug "de - #{@words_de.size} words: #{@words_de}"
+    logger.debug "es - #{@words_es.size} words: #{@words_es}"
     
   end
 
@@ -200,9 +198,7 @@ end # class Lang
 
 class LangChecker
 
-  def logger
-    @logger ||= LogUtils[ self ]
-  end
+  include LogUtils::Logging
   
   def initialize
   end
@@ -234,13 +230,15 @@ class LangChecker
     
     # dump stats
     
-    logger.info "****************************************"
+    logger.debug "lang checker:"
     lang_counts.each_with_index do |item,index|
       ## e.g. 1. en: 20 words
       ##      2. de: 2 words
-      logger.info "#{index+1}. #{item[0]}: #{item[1]}"
+      logger.debug " #{index+1}. #{item[0]}: #{item[1]}"
     end
     
+    logger.info "lang checker - using lang >>#{lang_counts[0][0]}<<"
+    
     ## return lang code w/ highest count
     lang_counts[0][0]
   end

data/lib/sportdb/models/event.rb

@@ -68,7 +68,10 @@ class Event < ActiveRecord::Base
             
       known_teams << [ team.key, titles ]
       
-      puts "  Team[#{index+1}] #{team.key} >#{titles.join('|')}<"
+      ### fix:
+      ## plain logger
+      
+      LogUtils::Logger.root.debug "  Team[#{index+1}] #{team.key} >#{titles.join('|')}<"
     end
     
     known_teams

data/lib/sportdb/reader.rb

@@ -4,9 +4,7 @@ module SportDB
 
 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 Team instead of Models::Team 
@@ -64,8 +62,8 @@ class Reader
     
     end
     
-    puts "[debug] fixture setup:"
-    pp ary
+    logger.debug "fixture setup:"
+    logger.debug ary.to_json
     
     ary
       
@@ -74,8 +72,8 @@ class Reader
 
   def load( ary, include_path )   # convenience helper for all-in-one reader
     
-    puts "[debug] enter load(include_path=>>#{include_path}<<):"
-    pp ary
+    logger.debug "enter load(include_path=>>#{include_path}<<):"
+    logger.debug ary.to_json
     
     ary.each do |rec|
       if rec.kind_of?( String )
@@ -141,8 +139,7 @@ class Reader
 
     load_leagues_worker( reader )
     
-    ### todo/fix: add prop
-    ### Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
+    Prop.create_from_fixture!( name, path )
      
   end # load_leagues
 
@@ -160,7 +157,7 @@ class Reader
 
       if key == 'seasons'
         
-        puts "#{value.class.name}: >>#{value}<<"
+        logger.debug "#{value.class.name}: >>#{value}<<"
         
         ## nb: assume value is an array
         value.each do |item|
@@ -190,8 +187,7 @@ class Reader
   
     end # each key,value
     
-    ### todo/fix: add prop
-    ### Prop.create_from_sportdb_fixture!( name, path )
+    Prop.create_from_fixture!( name, path )
   
   end  # load_seasons
 
@@ -279,7 +275,7 @@ class Reader
     
     event.update_attributes!( event_attribs )
     
-    ### todo/fix: add prop
+    Prop.create_from_fixture!( name, path )
   
   end  # load_event
 
@@ -307,8 +303,7 @@ class Reader
     
     load_fixtures_worker( event_key, reader )
 
-    ## fix add prop
-    ## Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
+    Prop.create_from_fixture!( name, path )
   end
 
 
@@ -321,8 +316,7 @@ class Reader
 
     load_teams_worker( reader )
     
-    ## todo/fix: add prop
-    ## Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.txt.#{SportDB::VERSION}" )    
+    Prop.create_from_fixture!( name, path )
   end # load_teams
 
 private
@@ -357,7 +351,7 @@ private
         rec = League.new
       end
       
-      puts attribs.to_json
+      logger.debug attribs.to_json
    
       rec.update_attributes!( attribs )
 
@@ -402,7 +396,7 @@ private
         rec = Team.new
       end
       
-      puts attribs.to_json
+      logger.debug attribs.to_json
    
       rec.update_attributes!( attribs )
 
@@ -422,7 +416,7 @@ private
     
     @event = Event.find_by_key!( event_key )
     
-    logger.info "Event #{@event.key} >#{@event.title}<"
+    logger.debug "Event #{@event.key} >#{@event.title}<"
     
     @known_teams = @event.known_teams_table
     

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,93 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sportdb
-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: worlddb
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &75587880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: commander
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *75587880
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: &75587650 !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: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *75587650
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &75587420 !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: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *75587420
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &75587190 !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: *id004
+  prerelease: false
+  version_requirements: *75587190
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
-executables: 
+executables:
 - sportdb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
-files: 
+files:
 - History.md
 - Manifest.txt
 - README.md
@@ -128,47 +103,40 @@ files:
 - lib/sportdb/version.rb
 - tasks/test.rb
 homepage: https://github.com/geraldb/sport.db.ruby
-licenses: 
+licenses:
 - Public Domain
-post_install_message: |
-  ******************************************************************************
-  
+post_install_message: ! '******************************************************************************
+
+
   Questions? Comments? Send them along to the mailing list.
+
   https://groups.google.com/group/opensport
-  
+
+
   ******************************************************************************
 
-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: sportdb
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: sportdb - sport.db command line tool
 test_files: []
-