sportdb 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 361055fb9718783a779306c140fbc121d50bf73a
-  data.tar.gz: 5f1a213576e4feb35f10661ef8f749c2b40240d6
+  metadata.gz: 4043964e61723b11820a2ee716fef6a2f16d37c5
+  data.tar.gz: 1d33700d72c60a7957af3b92ca5f8ac6d9715959
 SHA512:
-  metadata.gz: d8cd365310ffe83f1c72c10bee222240f51b360dfcab600359cf200f386fdcdf1fa3525c8a6506c2535ad5dd7b0268c98556bebd29b0e5674656ca2987140e5a
-  data.tar.gz: dd00d26a52350767c988ed9b3a6eb95fddd1136a778e756a2aaa122c5148b3201579d2ef380b8583fae3174fd4452f165c4495757e4d420cac09dc84b4775441
+  metadata.gz: b7aa02a5bd39c62067be9212879e8deb3ad617929c086a7ac4b8724389a27e02f885015b23272ef95280fb265875ecafb839569c51ec61c2c3e14e9a7ce1bb09
+  data.tar.gz: 172eda351be265567fa379c01a5e7477a2c5573a768188d125663d1c743e24969719efc5edb9dccd05a7bc376acd37a6b0e9756a9d9753bb792ab761d2687466

data/Manifest.txt

@@ -7,3 +7,4 @@ lib/sportdb.rb
 lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
 lib/sportdb/cli/version.rb
+lib/sportdb/console.rb

data/Rakefile

@@ -20,14 +20,13 @@ Hoe.spec 'sportdb' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['sportdb-models', '>= 1.10.0'],
+    ['sportdb-models', '>= 1.10.1'],
 
     ['fetcher', '>= 0.4.4'],    ## check if included already in datafil ??
     ['datafile', '>= 0.1.1'],
 
     ### sportdb addons
     ## ['sportdb-keys'],
-    ## ['sportdb-console'],
     ['sportdb-update'],
     ['sportdb-service'],
 

data/lib/sportdb.rb

@@ -14,17 +14,14 @@ require 'gli'
 # our own code
 
 require 'sportdb/cli/version'    # let version always go first
-
-# additional for cli only
 require 'sportdb/cli/opts'
-
+require 'sportdb/cli/main'
 
 
 module SportDb
 
   def self.main
-    ## Runner.new.run(ARGV) - old code
-    require 'sportdb/cli/main'
+    Tool.new.run(ARGV)
   end
 
 end  # module SportDb
@@ -42,4 +39,3 @@ require 'sportdb/service'
 
 
 SportDb.main   if __FILE__ == $0
-

data/lib/sportdb/cli/main.rb

@@ -1,24 +1,50 @@
 # 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
+### NOTE: wrap gli config into a class
+##  see github.com/davetron5000/gli/issues/153
 
- 
-include GLI::App
 
+module SportDb
 
-program_desc 'sport.db command line tool'
+  class Tool
+     def initialize
+       LogUtils::Logger.root.level = :info   # set logging level to info 
+     end
 
-version SportDbCli::VERSION
+     def run( args )
+       puts SportDbCli.banner
+       Toolii.run( args )
+     end
+  end
+
+
+  class Toolii
+    extend GLI::App
+
+   def self.logger=(value) @@logger=value; end
+   def self.logger()       @@logger; end
+
+   ## todo: find a better name e.g. change to settings? config? safe_opts? why? why not?
+   def self.opts=(value)  @@opts = value; end
+   def self.opts()        @@opts; end
+
+   def self.connect_to_db( options )
+     puts "working directory: #{Dir.pwd}"
+
+     SportDb.connect( adapter: 'sqlite3',
+                      database: "#{options.db_path}/#{options.db_name}" )
+
+     LogDb.setup  # start logging to db (that is, save logs in logs table in db)
+   end
 
 
-LogUtils::Logger.root.level = :info   # set logging level to info 
 logger = LogUtils::Logger.root
+opts   = WorldDb::Opts.new 
+
+
+program_desc 'sport.db command line tool'
+
+version SportDbCli::VERSION
 
 
 =begin
@@ -37,9 +63,6 @@ Further information:
 =end
 
 
-## todo: find a better name e.g. change to settings? config? safe_opts? why? why not?
-opts = SportDb::Opts.new
-
 ### global option (required)
 ## todo: add check that path is valid?? possible?
 
@@ -62,18 +85,6 @@ switch [:q, :quiet], negatable: false
 
 
 
-def connect_to_db( options )
-  puts SportDbCli.banner
-
-  puts "working directory: #{Dir.pwd}"
-
-  SportDb.connect( adapter: 'sqlite3',
-                   database: "#{options.db_path}/#{options.db_name}" )
-
-  LogDb.setup  # start logging to db (that is, save logs in logs table in db)
-end
-
-
 desc 'Create DB schema'
 command [:create] do |c|
   c.action do |g,o,args|
@@ -413,4 +424,7 @@ on_error do |e|
 end
 
 
-exit run(ARGV)
+### exit run(ARGV)  ## note: use Toolii.run( ARGV ) outside of class
+
+  end  # class Toolii
+end  # module SportDb

data/lib/sportdb/cli/version.rb

@@ -7,7 +7,7 @@ module SportDbCli    # todo/check - rename to SportDbTool or SportDbCommands or
 
   MAJOR = 1 ## todo: namespace inside version or something - why? why not??
   MINOR = 10
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/sportdb/console.rb

@@ -0,0 +1,109 @@
+
+require 'logger'
+require 'sportdb/models'
+
+
+## shortcuts for models
+
+##
+##  todo/fix: just use include SportDb::Models  - why? why not? is it possible/working?
+
+Badge   = SportDb::Model::Badge
+Event   = SportDb::Model::Event
+Game    = SportDb::Model::Game
+Goal    = SportDb::Model::Goal
+Group   = SportDb::Model::Group
+League  = SportDb::Model::League
+Person  = SportDb::Model::Person
+Roster  = SportDb::Model::Roster
+Round   = SportDb::Model::Round
+Season  = SportDb::Model::Season
+Team    = SportDb::Model::Team
+
+
+### todo: check for racing.db extension if present??
+## only add if present
+Race    = SportDb::Model::Race
+Record  = SportDb::Model::Record
+Run     = SportDb::Model::Run
+Track   = SportDb::Model::Track
+
+
+
+Tag       = WorldDb::Model::Tag
+Tagging   = WorldDb::Model::Tagging
+Continent = WorldDb::Model::Continent
+Country   = WorldDb::Model::Country
+Region    = WorldDb::Model::Region
+City      = WorldDb::Model::City
+Prop      = WorldDb::Model::Prop
+
+
+## connect to db
+
+DB_CONFIG = {
+  adapter:  'sqlite3',
+  database: './sport.db'
+}
+
+pp DB_CONFIG
+ActiveRecord::Base.establish_connection( DB_CONFIG )
+
+## test drive
+
+puts "Welcome to sport.db, version #{SportDb::VERSION} (world.db, version #{WorldDb::VERSION})!"
+
+## print tables stats (e.g. no of records)
+puts 'sport.db'
+puts '--------'
+SportDb.tables
+
+puts 'world.db'
+puts '--------'
+WorldDb.tables
+
+puts 'Ready.'
+
+
+## add some predefined shortcuts
+
+##### some countries
+
+AT = Country.find_by_key( 'at' )
+DE = Country.find_by_key( 'de' )
+EN = Country.find_by_key( 'en' )
+
+US = Country.find_by_key( 'us' )
+CA = Country.find_by_key( 'ca' )
+MX = Country.find_by_key( 'mx' )
+
+#### some events
+
+EURO2008 = Event.find_by_key( 'euro.2008' )
+EURO2012 = Event.find_by_key( 'euro.2012' )
+EURO = EURO2012  # add alias
+
+BL = Event.find_by_key( 'de.2013/14' )
+PL = Event.find_by_key( 'en.2013/14' )
+
+### some club teams
+
+BARCA   = Team.find_by_key( 'barcelona' )
+MANU    = Team.find_by_key( 'manunited' )
+MUN = MANUNITED = MANU    # add alias
+BAYERN  = Team.find_by_key( 'bayern' )
+AUSTRIA = Team.find_by_key( 'austria' )
+
+### some national teams (three letter fifa codes)
+
+ESP = Team.find_by_key( 'esp' )
+GER = Team.find_by_key( 'ger' )
+AUT = Team.find_by_key( 'aut' )
+
+MEX = Team.find_by_key( 'mex' )
+ARG = Team.find_by_key( 'arg' )
+
+## turn on activerecord logging to console
+
+ActiveRecord::Base.logger = Logger.new( STDOUT )
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: fetcher
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,7 @@ files:
 - lib/sportdb/cli/main.rb
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/cli/version.rb
+- lib/sportdb/console.rb
 homepage: https://github.com/sportdb/sport.db.ruby
 licenses:
 - Public Domain