sportdb 1.7.3 → 1.7.4

data/README.md

@@ -1,6 +1,9 @@
 # sportdb - 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)
+-->
 
 * 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)
@@ -18,7 +21,7 @@ SYNOPSIS
     sportdb [global options] command [command options] [arguments...]
 
 VERSION
-    1.6
+    1.8
 
 GLOBAL OPTIONS
     -d, --dbpath=PATH - Database path (default: .)
@@ -33,6 +36,8 @@ COMMANDS
     load, l       - Load sports fixtures
     logs          - Show logs
     props         - Show props
+    pull          - Pull (auto-update) event fixtures from upstream sources  
+    serve, server - Start web service (HTTP JSON API)
     stats         - Show stats
     test          - (Debug) Test command suite
     help          - Shows a list of commands or help for one command
@@ -95,6 +100,35 @@ EXAMPLES
 ~~~
 
 
+### `pull` Command
+
+~~~
+NAME
+    pull - Pull (auto-update) event fixtures from upstream sources
+
+SYNOPSIS
+    sportdb [global options] pull
+
+EXAMPLES
+    sportdb pull
+~~~
+
+
+### `serve` Command
+
+~~~
+NAME
+    serve - Start web service (HTTP JSON API)
+
+SYNOPSIS
+    sportdb [global options] serve 
+
+EXAMPLES
+    sportdb serve
+~~~
+
+
+
 ## Install
 
 Just install the gem:
@@ -106,8 +140,14 @@ Just install the gem:
 
 - [`football.db`](https://github.com/openfootball) - free open public domain football (soccer) data for use in any (programming) language
 - [`formula1.db`](https://github.com/geraldb/formula1.db) - free open public domain Formula 1/Formula One data for use in any (programming) language
-- [`sport.db`](https://github.com/geraldb/sport.db) - free open public domain sports data for use in any (programming) language
 - [`ski.db`](https://github.com/geraldb/ski.db) - free open public domain Ski Alpin/Alpine Ski data for use in any (programming) language
+- [`sport.db`](https://github.com/geraldb/sport.db) - free open public domain sports data for use in any (programming) language
+
+
+## License
+
+The `sportdb` scripts are dedicated to the public domain.
+Use it as you please with no restrictions whatsoever.
 
 
 ## Questions? Comments?
@@ -115,8 +155,3 @@ Just install the gem:
 Send them along to the
 [Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
 Thanks!
-
-## License
-
-The `sportdb` scripts are dedicated to the public domain.
-Use it as you please with no restrictions whatsoever.

data/Rakefile

@@ -24,7 +24,6 @@ Hoe.spec 'sportdb' do
   
   self.extra_deps = [
     ['worlddb', '>= 1.7'],  # NB: worlddb already includes
-                               #         - commander
                                #         - logutils
                                #         - textutils
     ['fetcher', '>= 0.3'],
@@ -53,70 +52,3 @@ EOS
   
 end
 
-
-##############################
-## for testing 
-##
-## NB: use rake -I ../world.db.ruby/lib -I ./lib sportdb:build
-
-namespace :sportdb do
-  
-  BUILD_DIR = "./build"
-  
-  SPORT_DB_PATH = "#{BUILD_DIR}/sport.db"
-
-  DB_CONFIG = {
-    :adapter   =>  'sqlite3',
-    :database  =>  SPORT_DB_PATH
-  }
-
-  directory BUILD_DIR
-
-  task :clean do
-    rm SPORT_DB_PATH if File.exists?( SPORT_DB_PATH )
-  end
-
-  task :env => BUILD_DIR do
-    require 'worlddb'   ### NB: for local testing use rake -I ./lib dev:test e.g. do NOT forget to add -I ./lib
-    require 'sportdb'
-    require 'logutils/db'
-
-    LogUtils::Logger.root.level = :info
-
-    pp DB_CONFIG
-    ActiveRecord::Base.establish_connection( DB_CONFIG )
-  end
-
-  task :create => :env do
-    LogDb.create
-    WorldDb.create
-    SportDb.create
-  end
-  
-  task :importworld => :env do
-    WorldDb.read_setup( 'setups/sport.db.admin', '../world.db', skip_tags: true )  # populate world tables
-    # WorldDb.stats
-  end
-
-  task :importsport => :env do
-    SportDb.read_setup( 'setups/all', '../football.db' )
-    # SportDb.stats
-  end
-
-  task :deletesport => :env do
-    SportDb.delete!
-  end
-
-
-
-  desc 'sportdb - build from scratch'
-  task :build => [:clean, :create, :importworld, :importsport] do
-    puts 'Done.'
-  end
-
-  desc 'sportdb - update'
-  task :update => [:deletesport, :importsport] do
-    puts 'Done.'
-  end
-
-end  # namespace :sportdb

data/lib/sportdb/utils.rb

@@ -191,6 +191,9 @@ module SportDb::FixtureHelpers
     # e.g. 14.09.2012  => DD.MM.YYYY w/ implied hours (set to 12:00)
     regex_de3 = /\b(\d{1,2})\.(\d{1,2})\.(\d{4})\b/
 
+    # e.g. 14.09.  => DD.MM. w/ implied year and implied hours (set to 12:00)
+    regex_de4 = /\b(\d{1,2})\.(\d{1,2})\.\s+/
+
 
     month_abbrev_en = "Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec"
 
@@ -247,6 +250,19 @@ module SportDb::FixtureHelpers
       
       line.sub!( regex_de3, '[DATE.DE3]' )
 
+      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
+    elsif line =~ regex_de4
+
+      year = calculate_year( $1.to_i, $2.to_i, opts[:start_at] )
+
+      value = '%d-%02d-%02d 12:00' % [year, $2.to_i, $1.to_i]
+      logger.debug "   date: >#{value}<"
+
+      ## todo: lets you configure year
+      ##  and time zone (e.g. cet, eet, utc, etc.)
+
+      line.sub!( regex_de4, '[DATE.DE4]' )
+
       return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
     elsif line =~ regex_en
       value = '%d-%s-%02d %02d:%02d' % [$3.to_i, $2, $1.to_i, $4.to_i, $5.to_i]

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.7.3'
+  VERSION = '1.7.4'
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &67819850 !ruby/object:Gem::Requirement
+  requirement: &81096580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *67819850
+  version_requirements: *81096580
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &67819580 !ruby/object:Gem::Requirement
+  requirement: &81096200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *67819580
+  version_requirements: *81096200
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &67819240 !ruby/object:Gem::Requirement
+  requirement: &81095680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *67819240
+  version_requirements: *81095680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &67819010 !ruby/object:Gem::Requirement
+  requirement: &81095260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *67819010
+  version_requirements: *81095260
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &67818610 !ruby/object:Gem::Requirement
+  requirement: &81094550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *67818610
+  version_requirements: *81094550
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: