sportdb 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462f64e48cea18e67436574ea602fb33b00c233f
-  data.tar.gz: 547a07bb677135cbc245e317ddc2c30d619e5346
+  metadata.gz: f1db9521b6f1a63e9cfc9c1419561b9cbf40c109
+  data.tar.gz: 88f8af72961ab1b4eda1a7becf17eb45c8e60398
 SHA512:
-  metadata.gz: 2640177ec4c7f3c9ff4743f365755adddaf915cb4b05772b2885e5c878c3a2fc70e375ba328226581c664efa0ee26cfcd4c4df05ada239a2608166337da8c440
-  data.tar.gz: 4874fa7df01d41799af5ac192ba362f3136712e5ff594b2c0601fbf68d5bb4348f49e79c7842972d7d3f90d667b071f9eb554f32b433d148e5ef8b57b3582a20
+  metadata.gz: 172cf0501bf06b29023f227afc720d38b2f8af90b7b4152dc24f3a3011568f0f11f012a8f36583c00c5f5c67aeb1f45e242d7f81dc67464d3afcec6b0fa63a59
+  data.tar.gz: c6a30d0fb6a5bada0ed94c769c30dd2bebacaf1ebf52053638420e02bdcfceeeed0d76ab40541938bdfd79fb5d334465f6bb9a90e98484031075d121f0a75b0a

data/Manifest.txt

@@ -8,3 +8,5 @@ lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
 lib/sportdb/cli/version.rb
 lib/sportdb/console.rb
+test/helper.rb
+test/test_commands.rb

data/lib/sportdb.rb

@@ -19,10 +19,11 @@ require 'sportdb/cli/opts'
 require 'sportdb/cli/main'
 
 
+
 module SportDb
 
-  def self.main
-    Tool.new.run(ARGV)
+  def self.main( args=ARGV )
+    Tool.new.run( args )
   end
 
 end  # module SportDb
@@ -33,10 +34,11 @@ end  # module SportDb
 
 ## puts 'before auto-load (require) sportdb addons'
 ## puts '  before sportdb/update'
-require 'sportdb/update'
-## puts '  before sportdb/service'
+## require 'sportdb/update'
+
+puts '  before sportdb/service'
 require 'sportdb/service'
-## puts 'after auto-load (require) sportdb addons'
+puts 'after auto-load (require) sportdb addons'
 
 
 SportDb.main   if __FILE__ == $0

data/lib/sportdb/cli/main.rb

@@ -60,6 +60,12 @@ arg_name 'NAME'
 default_value opts.db_name
 flag [:n, :dbname]
 
+desc 'Datafile'
+arg_name 'FILE'
+default_value opts.datafile
+flag [:f, :datafile]
+
+
 desc '(Debug) Show debug messages'
 switch [:verbose], negatable: false    ## todo: use -w for short form? check ruby interpreter if in use too?
 
@@ -87,8 +93,8 @@ command [:build,:b] do |c|
   c.action do |g,o,args|
 
     ## check if datafile exists, if NOT assume working dir (./) is a package
-    if File.file?( './Datafile' )   ## note use file? (exist? will also check for directory/folder!!)
-      datafile = Datafile::Datafile.load_file( './Datafile' )
+    if File.file?( opts.datafile )   ## note use file? (exist? will also check for directory/folder!!)
+      datafile = Datafile::Datafile.load_file( opts.datafile )
       datafile.download  # datafile step 1 - download all datasets/zips
 
       connect_to_db( opts )
@@ -97,7 +103,7 @@ command [:build,:b] do |c|
 
       datafile.read  # datafile step 2 - read all datasets
     else
-      puts "no ./Datafile found; try local build in >#{Dir.pwd}<"
+      puts "no datafile >#{opts.datafile}< found; trying local build in >#{Dir.pwd}<"
 
       connect_to_db( opts )
 
@@ -117,13 +123,13 @@ command [:read,:r] do |c|
   c.action do |g,o,args|
 
     ## check if datafile exists, if NOT assume working dir (./) is a package
-    if File.file?( './Datafile' )   ## note use file? (exist? will also check for directory/folder!!)
+    if File.file?( opts.datafile )   ## note use file? (exist? will also check for directory/folder!!)
       connect_to_db( opts )
 
-      datafile = Datafile::Datafile.load_file( './Datafile' )
+      datafile = Datafile::Datafile.load_file( opts.datafile )
       datafile.read
     else
-      puts "no ./Datafile found; try local read in >#{Dir.pwd}<"
+      puts "no datafile >#{opts.datafile}< found; trying local read in >#{Dir.pwd}<"
 
       connect_to_db( opts )
 
@@ -143,7 +149,7 @@ command [:download,:dl] do |c|
 
     # note: no database connection needed (check - needed for logs?? - not setup by default???)
 
-    datafile = Datafile::Datafile.load_file( './Datafile' )
+    datafile = Datafile::Datafile.load_file( opts.datafile )
     datafile.download
 
     puts 'Done.'
@@ -163,6 +169,8 @@ command [:new,:n] do |c|
     worker = Fetcher::Worker.new
     worker.copy( "https://github.com/openfootball/datafile/raw/master/#{setup}.rb", './Datafile' )
 
+    ## todo/check: use custom datafile (opts.datafile) if present? why? why not?
+
     ## step 2: same as command build (todo - reuse code)
     datafile = Datafile::Datafile.load_file( './Datafile' )
     datafile.download  # datafile step 1 - download all datasets/zips

data/lib/sportdb/cli/opts.rb

@@ -5,8 +5,9 @@ module SportDb
 class Opts
 
   def merge_gli_options!( options = {} )
-    @db_path   = options[:dbpath]  if options[:dbpath].present?
-    @db_name   = options[:dbname]  if options[:dbname].present?
+    @db_path   = options[:dbpath]    if options[:dbpath].present?
+    @db_name   = options[:dbname]    if options[:dbname].present?
+    @datafile  = options[:datafile]  if options[:datafile].present?
 
     @verbose = true     if options[:verbose] == true
   end
@@ -22,13 +23,11 @@ class Opts
   end
 
 
-  def db_path
-    @db_path || '.'
-  end
+  def db_path()   @db_path || '.';         end
+  def db_name()   @db_name || 'sport.db';  end
 
-  def db_name
-    @db_name || 'sport.db'
-  end
+  def datafile()  @datafile || './Datafile';  end
+  def datafile?() @datafile;  end    ## note: let's you check if datafile is set (or "untouched")
 end # class Opts
 
 end # module SportDb

data/lib/sportdb/cli/version.rb

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

data/test/helper.rb

@@ -0,0 +1,9 @@
+## $:.unshift(File.dirname(__FILE__))
+
+## minitest setup
+
+require 'minitest/autorun'
+
+
+## our own code
+require 'sportdb'

data/test/test_commands.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_commands.rb
+
+
+require 'helper'
+
+class TestCommands < MiniTest::Test
+
+  def test_help
+     args = ['help']
+     SportDb.main( args )
+  end
+
+end # class TestCommands

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-models
@@ -184,6 +184,8 @@ files:
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/cli/version.rb
 - lib/sportdb/console.rb
+- test/helper.rb
+- test/test_commands.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain