sportdb 1.9.16 → 1.10.0

data/lib/sportdb/cli/main.rb

@@ -8,22 +8,13 @@
 #        setup --delete --sport
 #        --include ../../github/football.db
 
-
-require 'gli'
  
 include GLI::App
 
-# our own code / additional for cli only
-
-require 'logutils/db'
-require 'sportdb/cli/opts'
-
-require 'datafile'   ## lets us use Datafile::Builder,Datafile etc.
-
 
 program_desc 'sport.db command line tool'
 
-version SportDb::VERSION
+version SportDbCli::VERSION
 
 
 LogUtils::Logger.root.level = :info   # set logging level to info 
@@ -72,7 +63,7 @@ switch [:q, :quiet], negatable: false
 
 
 def connect_to_db( options )
-  puts SportDb.banner
+  puts SportDbCli.banner
 
   puts "working directory: #{Dir.pwd}"
 
@@ -330,7 +321,7 @@ command :logs do |c|
 
     connect_to_db( opts ) 
     
-    LogDb::Models::Log.all.each do |log|
+    LogDb::Model::Log.all.each do |log|
       puts "[#{log.level}] -- #{log.msg}"
     end
     
@@ -394,7 +385,7 @@ pre do |g,c,o,args|
   opts.merge_gli_options!( g )
   opts.merge_gli_options!( o )
 
-  puts SportDb.banner
+  puts SportDbCli.banner
 
   if opts.verbose?
     LogUtils::Logger.root.level = :debug
@@ -422,4 +413,4 @@ on_error do |e|
 end
 
 
-exit run(ARGV)
+exit run(ARGV)

data/lib/sportdb/cli/opts.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module SportDb
 
 class Opts

data/lib/sportdb/cli/version.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+# Note: SportDb::VERSION gets used by core, that is, sportdb-models
+
+
+module SportDbCli    # todo/check - rename to SportDbTool or SportDbCommands or SportDbShell ??
+
+  MAJOR = 1 ## todo: namespace inside version or something - why? why not??
+  MINOR = 10
+  PATCH = 0
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+  def self.banner
+    "sportdb/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  end
+
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
+  end
+
+end # module SportDbCli
+

metadata

@@ -1,113 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.16
+  version: 1.10.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: props
+  name: sportdb-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: textutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-- !ruby/object:Gem::Dependency
-  name: worlddb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.8
-- !ruby/object:Gem::Dependency
-  name: tagutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: persondb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: fetcher
   requirement: !ruby/object:Gem::Requirement
@@ -136,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: sportdb-keys
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sportdb-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sportdb-update
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.12.2
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -248,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
-description: sportdb - sport.db command line tool
+description: sportdb - sport.db Command Line Tool
 email: opensport@googlegroups.com
 executables:
 - sportdb
@@ -258,152 +146,15 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - HISTORY.md
 - 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
 homepage: https://github.com/sportdb/sport.db.ruby
 licenses:
 - Public Domain
@@ -435,24 +186,5 @@ rubyforge_project:
 rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
-summary: sportdb - sport.db command line tool
-test_files:
-- test/test_date.rb
-- test/test_lang.rb
-- test/test_load.rb
-- test/test_cursor.rb
-- test/test_standings.rb
-- test/test_squad_club_reader.rb
-- test/test_scores.rb
-- test/test_winner.rb
-- test/test_standings_ii.rb
-- test/test_round_def.rb
-- test/test_utils.rb
-- test/test_reader_from_string.rb
-- test/test_round_header.rb
-- test/test_round_auto.rb
-- test/test_goals.rb
-- test/test_squad_national_team_reader.rb
-- test/test_reader.rb
-- test/test_assoc_reader.rb
-- test/test_changes.rb
+summary: sportdb - sport.db Command Line Tool
+test_files: []

data/config/fixtures/de.yml

@@ -1,46 +0,0 @@
-###########################
-# known keywords for fixtures
-
-
-group:      Gruppe
-
-round:   Spieltag|Runde
-
-
-stage:      Gruppenphase|Qualifikation|Play-off|Finalrunde|K.-o.-Phase
-
-
-### Knock out rounds
-
-## fix: add playoffs:
-round32:        Sechzehntelfinale|1/16 Finale
-round16:        Achtelfinale|1/8 Finale
-quarterfinals:  Viertelfinale|1/4 Finale
-semifinals:     Halbfinale|Semifinale|1/2 Finale
-fifthplace:     Spiel um Platz 5
-thirdplace:     Spiel um Platz 3
-final:          Finale|Endspiel
-
-### Pair matches/games if marked with leg1 n leg2
-
-leg1:  Hin|Hinspiel|Hinspiele
-leg2:  Rück|Rückspiel|Rückspiele
-
-
-#######################
-# months of year
-
-january:   Jänner|Januar
-february:  Feber|Februar
-march:     März
-april:     April
-may:       Mai
-june:      Juni
-july:      Juli
-august:    August
-september: September
-october:   Oktober
-november:  November
-december:  Dezember
-
-