sportdb 1.9.16 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f652191b23c1c3acab00a7b950f7b93ec6bce4f4
-  data.tar.gz: 85fe028e22fa00c0ee763ba6f472c0d23016009e
+  metadata.gz: 6d9324898363df6c12153669aecc98373b2fa3b0
+  data.tar.gz: 979905b01383585177295b1c8a2ff26fe28210a8
 SHA512:
-  metadata.gz: e175cc5dbd766ef735bb4c00a7d2afd47466c1aa3543fe2911a26b696b80b2b18a832ad85e2dc9f9575804a441b6c2471daa2779c1bfec8cbdd2452bbd202877
-  data.tar.gz: 21136016a7ea1294f86f1064bc9f604613936d6f8e016fd53144337f1894fa5b7ee8e4453bb3aa83cb5a82e556764509e7d0befd4793fe6583b7c200ad5b5c27
+  metadata.gz: 1a20a2993f5057c30a2bfc2c0fc81789660eb1d32463a383eee9dea686de8712d7cd6e9c1401e519c9f1142e7bf1fcb7439d0434a4244a2afed914460f6cd431
+  data.tar.gz: 5a7502b43a15715de568c126f3710795d911a0ff55fecc0101cdb09a7b7035e48ecae1a62248dd4869103fda76850a0594dcb8de1f6dbbb24bd65869eee567e5

data/HISTORY.md

@@ -1,21 +1,4 @@
-### 0.4.0 / 2012-10-16
 
-* Add plain text fixture reader/loader
-* Add --generate/g option for generating fixtures from the DB using templates 
+### 0.1.0 / 2014-12-05
 
-### 0.3.1 / 2012-10-14
-
-* Move models into its own namespace, that is, SportDB::Models
-* Add ActiveRecord logging for --verbose option
-
-### 0.3.0 / 2012-10-07
-
-* Add --delete option to delete all records
-
-### 0.2.0 / 2012-10-06
-
-* Add --load option for builtin fixtures
-
-### 0.1.0 / 2012-10-06
-
-* Everything is new. First release
+* Everything is new. First release

data/Manifest.txt

@@ -3,143 +3,7 @@ Manifest.txt
 README.md
 Rakefile
 bin/sportdb
-config/fixtures/de.yml
-config/fixtures/en.yml
-config/fixtures/es.yml
-config/fixtures/fr.yml
-config/fixtures/it.yml
-config/fixtures/pt.yml
-config/fixtures/ro.yml
-data/seasons.txt
-data/setups/all.txt
 lib/sportdb.rb
-lib/sportdb/calc.rb
 lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
-lib/sportdb/deleter.rb
-lib/sportdb/finders/date.rb
-lib/sportdb/finders/goals.rb
-lib/sportdb/finders/scores.rb
-lib/sportdb/lang.rb
-lib/sportdb/matcher.rb
-lib/sportdb/models/assoc.rb
-lib/sportdb/models/assoc_assoc.rb
-lib/sportdb/models/badge.rb
-lib/sportdb/models/event.rb
-lib/sportdb/models/event_ground.rb
-lib/sportdb/models/event_team.rb
-lib/sportdb/models/forward.rb
-lib/sportdb/models/game.rb
-lib/sportdb/models/goal.rb
-lib/sportdb/models/ground.rb
-lib/sportdb/models/group.rb
-lib/sportdb/models/group_team.rb
-lib/sportdb/models/league.rb
-lib/sportdb/models/person.rb
-lib/sportdb/models/roster.rb
-lib/sportdb/models/round.rb
-lib/sportdb/models/season.rb
-lib/sportdb/models/stats/alltime_standing.rb
-lib/sportdb/models/stats/alltime_standing_entry.rb
-lib/sportdb/models/stats/event_standing.rb
-lib/sportdb/models/stats/event_standing_entry.rb
-lib/sportdb/models/stats/group_standing.rb
-lib/sportdb/models/stats/group_standing_entry.rb
-lib/sportdb/models/team.rb
-lib/sportdb/models/team_comp.rb
-lib/sportdb/models/utils.rb
-lib/sportdb/models/world/city.rb
-lib/sportdb/models/world/continent.rb
-lib/sportdb/models/world/country.rb
-lib/sportdb/models/world/region.rb
-lib/sportdb/patterns.rb
-lib/sportdb/reader.rb
-lib/sportdb/reader_file.rb
-lib/sportdb/reader_zip.rb
-lib/sportdb/readers/assoc.rb
-lib/sportdb/readers/event.rb
-lib/sportdb/readers/game.rb
-lib/sportdb/readers/ground.rb
-lib/sportdb/readers/league.rb
-lib/sportdb/readers/season.rb
-lib/sportdb/readers/squad_club.rb
-lib/sportdb/readers/squad_national_team.rb
-lib/sportdb/readers/team.rb
-lib/sportdb/schema.rb
-lib/sportdb/standings.rb
-lib/sportdb/stats.rb
-lib/sportdb/utils.rb
-lib/sportdb/utils_date.rb
-lib/sportdb/utils_goals.rb
-lib/sportdb/utils_group.rb
-lib/sportdb/utils_map.rb
-lib/sportdb/utils_round.rb
-lib/sportdb/utils_scores.rb
-lib/sportdb/utils_teams.rb
-lib/sportdb/version.rb
-test/data/at-austria/2013_14/bl.txt
-test/data/at-austria/2013_14/bl.yml
-test/data/at-austria/2013_14/bl_ii.txt
-test/data/at-austria/2013_14/el.txt
-test/data/at-austria/2013_14/el.yml
-test/data/at-austria/2013_14/squads/austria.txt
-test/data/at-austria/2013_14/squads/salzburg.txt
-test/data/at-austria/leagues.txt
-test/data/at-austria/teams.txt
-test/data/at-austria/teams_2.txt
-test/data/national-teams/assocs.txt
-test/data/national-teams/europe/assocs.txt
-test/data/national-teams/europe/teams.txt
-test/data/national-teams/north-america/assocs.txt
-test/data/national-teams/north-america/teams.txt
-test/data/national-teams/teams.txt
-test/data/players/europe/at-austria/players.txt
-test/data/players/europe/de-deutschland/players.txt
-test/data/players/south-america/br-brazil/players.txt
-test/data/world-cup/1930/cup.txt
-test/data/world-cup/1930/cup.yml
-test/data/world-cup/1930/cup_goals.txt
-test/data/world-cup/1930/cup_goals.yml
-test/data/world-cup/1954/cup.txt
-test/data/world-cup/1954/cup.yml
-test/data/world-cup/1962/cup.txt
-test/data/world-cup/1962/cup.yml
-test/data/world-cup/1974/cup.yml
-test/data/world-cup/1974/cup_finals.txt
-test/data/world-cup/1974/cup_i.txt
-test/data/world-cup/1974/cup_ii.txt
-test/data/world-cup/2014/cup.txt
-test/data/world-cup/2014/cup.yml
-test/data/world-cup/2014/squads/br-brazil.txt
-test/data/world-cup/2014/squads/de-deutschland.txt
-test/data/world-cup/2014/squads/jp-japan.txt
-test/data/world-cup/2014/squads/uy-uruguay.txt
-test/data/world-cup/leagues.txt
-test/data/world-cup/seasons_1930.txt
-test/data/world-cup/seasons_1954.txt
-test/data/world-cup/seasons_1962.txt
-test/data/world-cup/seasons_1974.txt
-test/data/world-cup/teams_1930.txt
-test/data/world-cup/teams_1954.txt
-test/data/world-cup/teams_1962.txt
-test/data/world-cup/teams_1974.txt
-test/helper.rb
-test/test_assoc_reader.rb
-test/test_changes.rb
-test/test_cursor.rb
-test/test_date.rb
-test/test_goals.rb
-test/test_lang.rb
-test/test_load.rb
-test/test_reader.rb
-test/test_reader_from_string.rb
-test/test_round_auto.rb
-test/test_round_def.rb
-test/test_round_header.rb
-test/test_scores.rb
-test/test_squad_club_reader.rb
-test/test_squad_national_team_reader.rb
-test/test_standings.rb
-test/test_standings_ii.rb
-test/test_utils.rb
-test/test_winner.rb
+lib/sportdb/cli/version.rb

data/README.md

@@ -14,7 +14,7 @@
 
 ## Usage
 
-The sportdb gem lets you load fixtures in plain text into your sports database (also includes schema & models for easy reuse) 
+The sportdb gem lets you load fixtures in plain text into your sports database
 
 ~~~
 SYNOPSIS
@@ -128,26 +128,6 @@ EXAMPLES
 ~~~
 
 
-## Usage in Ruby (Console / Interactive Shell)
-
-
-Try the built-in console script. In your interactive Ruby shell type:
-
-    >> require 'sportdb/console'
-    # => Welcome to sport.db, version 1.9.7 (world.db, version 1.9.3)!
-
-This will try to connect to the `sport.db` SQLite database in your working folder.
-To get started try some queries, for example:
-
-    >> Team.count
-    # => 157
-    >> t = Team.find_by_key( 'barcelona' )
-    # => ...
-
-and so on.
-
-
-
 ## Install
 
 Just install the gem:
@@ -174,3 +154,4 @@ Use it as you please with no restrictions whatsoever.
 Send them along to the
 [Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
 Thanks!
+

data/Rakefile

@@ -1,15 +1,12 @@
 require 'hoe'
-require './lib/sportdb/version.rb'
-
-## NB: plugin (hoe-manifest) not required; just used for future testing/development
-## Hoe::plugin :manifest   # more options for manifests (in the future; not yet)
+require './lib/sportdb/cli/version.rb'
 
 
 Hoe.spec 'sportdb' do
-  
-  self.version = SportDb::VERSION
-  
-  self.summary = 'sportdb - sport.db command line tool'
+
+  self.version = SportDbCli::VERSION
+
+  self.summary = 'sportdb - sport.db Command Line Tool'
   self.description = summary
 
   self.urls    = ['https://github.com/sportdb/sport.db.ruby']
@@ -18,40 +15,33 @@ Hoe.spec 'sportdb' do
   self.email   = 'opensport@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
-  #  -- NB: auto-changed when included in manifest
+  #  -- Note: auto-changed when included in manifest
   self.readme_file  = 'README.md'
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['props' ],
-    ['logutils'],
-    ['textutils', '>= 0.9.10'],
-    ['worlddb', '>= 2.0.8'],  # NB: worlddb already includes
-                               #         - logutils
-                               #         - textutils
-    ['tagutils'],     # tags n tagging tables
-    ['persondb'],     # persons (people) table
-    ['activerecord-utils'],   # extras e.g. rnd, find_by! for 3.x etc.
-    ['fetcher', '>= 0.4.4'],
+    ['sportdb-models', '>= 1.10.0'],
+
+    ['fetcher', '>= 0.4.4'],    ## check if included already in datafil ??
     ['datafile', '>= 0.1.1'],
 
     ### sportdb addons
-    ['sportdb-keys'],
-    ['sportdb-console'],
+    ## ['sportdb-keys'],
+    ## ['sportdb-console'],
     ['sportdb-update'],
     ['sportdb-service'],
 
     ## 3rd party
     ['gli', '>= 2.12.2'],
 
-    ['activerecord']  # NB: will include activesupport,etc.
-    ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
+    ## ['activerecord'],  # Note: will include activesupport,etc.
+    ['sqlite3']
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+    required_ruby_version: '>= 1.9.2'
   }
 
   self.post_install_message =<<EOS
@@ -64,4 +54,3 @@ https://groups.google.com/group/opensport
 EOS
   
 end
-

data/lib/sportdb.rb

@@ -1,276 +1,30 @@
 # encoding: utf-8
 
-###
-# NB: for local testing run like:
-#
-# 1.9.x: ruby -Ilib lib/sportdb.rb
-
-# core and stlibs  (note: get included via worlddb gem; see worlddb gem/lib)
-
-
-require 'fileutils'
-
-
-# rubygems  / 3rd party libs
-
-require 'active_record'
-require 'activerecord/utils' # check - if dependency on logutils? or props? etc let others go first
-# fix: move activerecord/utils to world db - no need to require here again
-
-require 'worlddb'
-require 'persondb'
-
-require 'logutils/db'   # NB: explict require required for LogDb (NOT automatic)
-# fix: move to world db  -- no need to require here
 
+require 'sportdb/models'
 
+## check if already included in datafile gem ??
 require 'fetcher'   # for fetching/downloading fixtures via HTTP/HTTPS etc.
+require 'datafile'   ## lets us use Datafile::Builder,Datafile etc.
 
-# our own code
-
-require 'sportdb/version'    # let version always go first
-
-require 'sportdb/patterns'
-require 'sportdb/models/forward'
-require 'sportdb/models/world/city'
-require 'sportdb/models/world/country'
-require 'sportdb/models/world/continent'
-require 'sportdb/models/world/region'
-require 'sportdb/models/assoc'
-require 'sportdb/models/assoc_assoc'
-require 'sportdb/models/badge'
-require 'sportdb/models/event'
-require 'sportdb/models/event_ground'
-require 'sportdb/models/event_team'
-require 'sportdb/models/game'
-require 'sportdb/models/goal'
-require 'sportdb/models/ground'
-require 'sportdb/models/group'
-require 'sportdb/models/group_team'
-require 'sportdb/models/league'
-require 'sportdb/models/person'
-require 'sportdb/models/roster'
-require 'sportdb/models/round'
-require 'sportdb/models/season'
-require 'sportdb/models/team'
-require 'sportdb/models/team_comp'
-
-
-require 'sportdb/models/stats/alltime_standing'
-require 'sportdb/models/stats/alltime_standing_entry'
-require 'sportdb/models/stats/event_standing'
-require 'sportdb/models/stats/event_standing_entry'
-require 'sportdb/models/stats/group_standing'
-require 'sportdb/models/stats/group_standing_entry'
-
-require 'sportdb/models/utils'   # e.g. GameCursor
-
-
-require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
-
-require 'sportdb/finders/date'
-require 'sportdb/finders/scores'
-
-require 'sportdb/utils'
-require 'sportdb/utils_date'
-require 'sportdb/utils_group'
-require 'sportdb/utils_map'
-require 'sportdb/utils_round'
-require 'sportdb/utils_scores'
-require 'sportdb/utils_teams'
-require 'sportdb/utils_goals'
-require 'sportdb/matcher'
-require 'sportdb/calc'       # fix/todo: obsolete - replace w/ standings
-require 'sportdb/standings'
-
-
-require 'sportdb/finders/goals'   # no: requires FixturesHelpers
-
-require 'sportdb/readers/assoc'
-require 'sportdb/readers/event'
-require 'sportdb/readers/game'
-require 'sportdb/readers/ground'
-require 'sportdb/readers/league'
-require 'sportdb/readers/season'
-require 'sportdb/readers/squad_club'    # roster
-require 'sportdb/readers/squad_national_team'
-require 'sportdb/readers/team'
-require 'sportdb/reader'
-require 'sportdb/reader_file'
-require 'sportdb/reader_zip'
+require 'gli'
 
+# our own code
 
+require 'sportdb/cli/version'    # let version always go first
 
-require 'sportdb/lang'
+# additional for cli only
+require 'sportdb/cli/opts'
 
-require 'sportdb/deleter'
-require 'sportdb/stats'
 
 
 module SportDb
 
-  def self.config_path
-    "#{root}/config"
-  end
-
-  def self.data_path
-    "#{root}/data"
-  end
-
-  def self.test_data_path
-    "#{root}/test/data"
-  end
-
-
-  def self.lang
-    # todo/fix: find a better way for single instance ??
-    #  will get us ruby warning:  instance variable @lang not initialized   => find a better way!!!
-    #   just use @lang w/o .nil?  e.g.
-    #  @lang =|| Lang.new   why? why not??  or better use @@lang =|| Lang.new  for class variable!!!
-     if @lang.nil?
-       @lang = Lang.new
-     end
-     @lang
-  end
-
-
   def self.main
     ## Runner.new.run(ARGV) - old code
     require 'sportdb/cli/main'
   end
 
-  def self.create
-    CreateDb.new.up
-    ConfDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
-  end
-
-  def self.create_all
-    ## build schema - convenience helper
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
-    PersonDb.create
-    SportDb.create
-  end
-
-
-  def self.read_setup( setup, include_path )
-    reader = Reader.new( include_path )
-    reader.load_setup( setup )
-  end
-
-  def self.read_setup_from_zip( zip_name, setup, include_path, opts={} ) ## todo/check - use a better (shorter) name ??
-    reader = ZipReader.new( zip_name, include_path, opts )
-    reader.load_setup( setup )
-    reader.close
-  end
-
-  def self.read_all( include_path )   # convenience helper
-    read_setup( 'setups/all', include_path )
-  end
-
-  def self.read_builtin
-    read_setup( 'setups/all', data_path )
-  end
-
-
-  # load built-in (that is, bundled within the gem) named plain text seeds
-  # - pass in an array of pairs of event/seed names e.g.
-  #   [['at.2012/13', 'at/2012_13/bl'],
-  #    ['cl.2012/13', 'cl/2012_13/cl']] etc.
-
-  def self.read( ary, include_path )
-    reader = Reader.new( include_path )
-    ## todo: check kind_of?( Array ) or kind_of?(String) to support array or string
-    ary.each do |name|
-      reader.load( name )
-    end
-  end
-
-
-  # delete ALL records (use with care!)
-  def self.delete!
-    puts '*** deleting sport table records/data...'
-    Deleter.new.run
-  end # method delete!
-
-  def self.update!
-    puts '*** update event fixtures...'
-    Updater.new.run
-  end
-
-
-  def self.stats
-    Stats.new.tables   # NOTE: same as tables (remove??? why? why not??)
-  end
-
-  def self.tables
-    Stats.new.tables
-  end
-
-
-  def self.connect( db_config={} )
-
-    if db_config.empty?
-      puts "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
-
-      ### change default to ./sport.db ?? why? why not?
-      db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///sport.db' )
-
-      if db.scheme == 'postgres'
-        config = {
-          adapter: 'postgresql',
-          host: db.host,
-          port: db.port,
-          username: db.user,
-          password: db.password,
-          database: db.path[1..-1],
-          encoding: 'utf8'
-        }
-      else # assume sqlite3
-       config = {
-         adapter: db.scheme, # sqlite3
-         database: db.path[1..-1] # sport.db (NB: cut off leading /, thus 1..-1)
-      }
-      end
-    else
-      config = db_config  # use passed in config hash
-    end
-
-    ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
-    if RUBY_PLATFORM =~ /java/ && config[:adapter] == 'sqlite3' 
-      # quick hack for JRuby sqlite3 support via jdbc
-      puts "jruby quick hack - adding jdbc libs for jruby sqlite3 database support"
-      require 'jdbc/sqlite3'
-      require 'active_record/connection_adapters/jdbc_adapter'
-      require 'active_record/connection_adapters/jdbcsqlite3_adapter'
-    end
-
-    puts "Connecting to db using settings: "
-    pp config
-    ActiveRecord::Base.establish_connection( config )
-    # ActiveRecord::Base.logger = Logger.new( STDOUT )
-  end
-
-
-  def self.setup_in_memory_db
-
-    # Database Setup & Config
-    ActiveRecord::Base.logger = Logger.new( STDOUT )
-    ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
-
-    self.connect( adapter:  'sqlite3',
-                  database: ':memory:' )
-
-    ## build schema
-    SportDb.create_all
-
-    ## read builtins - why? why not?
-    SportDb.read_builtin
-  end # setup_in_memory_db (using SQLite :memory:)
-
-
 end  # module SportDb
 
 
@@ -285,10 +39,5 @@ require 'sportdb/service'
 ## puts 'after auto-load (require) sportdb addons'
 
 
+SportDb.main   if __FILE__ == $0
 
-if __FILE__ == $0
-  SportDb.main
-else
-   ## say hello
-  puts SportDb.banner
-end