sportdb 1.9.14 → 1.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2db12336a3fae247a22d4efee7d6c180b28d942
-  data.tar.gz: 26987264b067348f1e273e9f2ad37ccc90184de2
+  metadata.gz: 3c5d5f460f4f9a47f7972f979e24a3c5652e07a8
+  data.tar.gz: a703aeb762e8fedefdf6e91e4f92bad6c59c1bd4
 SHA512:
-  metadata.gz: db796999c6b36d8cda1ab638a3e271cfebe6bdb3872632a2d6d0185a0a0761859a4d84d552a20e781c5e7cb6585eb6757d22ee72bdf76f1e25929a96c031a551
-  data.tar.gz: d16a231df7b59e3916e8aab32732b082784406adb78b36b91cc62515d3c65d94360534532b2a93210f02da3371a7042907980e97a28a97baaf698a64be5ef184
+  metadata.gz: 059df898468b056c66c0a1a08cbcac20ce4b55519069d5cd90251e7c00db9d96de01fba73d6a3a2695c0f5f62e1d90c23f08a28ebe92d7d5b49d2a672d4fd4f8
+  data.tar.gz: 84e24316d647343aa7cebc1872bb07728984df9b9d2942ecc6431ab20e1bfca1b2848cd9c7c3b3c49b70992ce26f8594adc250d091ef69dc45600b7d08e4764d

data/Rakefile

@@ -25,15 +25,15 @@ Hoe.spec 'sportdb' do
   self.extra_deps = [
     ['props' ],
     ['logutils'],
-    ['textutils'],
-    ['worlddb', '>= 2.0.2'],  # NB: worlddb already includes
+    ['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.3'],
-    ['datafile'],
+    ['fetcher', '>= 0.4.4'],
+    ['datafile', '>= 0.1.1'],
 
     ### sportdb addons
     ['sportdb-keys'],
@@ -42,7 +42,7 @@ Hoe.spec 'sportdb' do
     ['sportdb-service'],
 
     ## 3rd party
-    ['gli', '>= 2.5.6'],
+    ['gli', '>= 2.12.2'],
 
     ['activerecord']  # NB: will include activesupport,etc.
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency

data/lib/sportdb/cli/main.rb

@@ -84,8 +84,10 @@ def connect_to_db( options )
   ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
   if RUBY_PLATFORM =~ /java/ && db_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'
-    ## todo: check if require for activerecord jdbc adapter for sqlite is required to
+    require 'active_record/connection_adapters/jdbc_adapter'
+    require 'active_record/connection_adapters/jdbcsqlite3_adapter'
   end
 
 
@@ -123,8 +125,7 @@ command [:build,:b] do |c|
 
   c.action do |g,o,args|
 
-    builder = Datafile::Builder.load_file( './Datafile' )
-    datafile = builder.datafile
+    datafile = Datafile::Datafile.load_file( './Datafile' )
     datafile.download  # datafile step 1 - download all datasets/zips 
 
     connect_to_db( opts )
@@ -152,8 +153,7 @@ command [:read,:r] do |c|
 
     connect_to_db( opts )
 
-    builder = Datafile::Builder.load_file( './Datafile' )
-    datafile = builder.datafile
+    datafile = Datafile::Datafile.load_file( './Datafile' )
     datafile.read
 
     puts 'Done.'
@@ -167,8 +167,7 @@ command [:download,:dl] do |c|
 
     # note: no database connection needed (check - needed for logs?? - not setup by default???)
 
-    builder = Datafile::Builder.load_file( './Datafile' )
-    datafile = builder.datafile
+    datafile = Datafile::Datafile.load_file( './Datafile' )
     datafile.download
 
     puts 'Done.'
@@ -186,11 +185,11 @@ command [:new,:n] do |c|
     setup = args[0] || 'worldcup2014'
 
     worker = Fetcher::Worker.new
-    worker.copy( "https://github.com/openfootball/datafile/raw/master/#{setup}.rb", './Datafile' )
+    ## note: lets use http:// instead of https:// for now - lets us use person proxy (NOT working w/ https for now)
+    worker.copy( "http://github.com/openfootball/datafile/raw/master/#{setup}.rb", './Datafile' )
 
     ## step 2: same as command build (todo - reuse code)
-    builder = Datafile::Builder.load_file( './Datafile' )
-    datafile = builder.datafile
+    datafile = Datafile::Datafile.load_file( './Datafile' )
     datafile.download  # datafile step 1 - download all datasets/zips 
 
     connect_to_db( opts )  ### todo: check let connect go first?? - for logging (logs) to db  ???

data/lib/sportdb/version.rb

@@ -3,7 +3,7 @@ module SportDb
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 14
+  PATCH = 15
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.9.15
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: worlddb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: tagutils
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: datafile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: sportdb-keys
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: 2.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement