worlddb 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b04e3e102e14c97044c018ad3fdeb210120fcf
-  data.tar.gz: 7500c45d9013183766d9ef85f24d79238b275ade
+  metadata.gz: e0ee622f7795692c31ce82e14cc4f453c42ff5bf
+  data.tar.gz: 41f42c5c60836963f8ccd3cfff5578a3e161d941
 SHA512:
-  metadata.gz: 7f0dce7d75e23232b6807b8098bee330cf3c57292302fc142978ee0e665f8af22f91479bd51899339caf21ace1f977f2e7f7a81f3abbd99d4e6e598d9b23469a
-  data.tar.gz: d933d6e0f68f77e00cda45c1771a840414fe04d0ec41cea704984fe82b64a4af7529d8dbd92f51a0a16f3e7d0a741f3a8f9cc468f168f73915621409977bd1c3
+  metadata.gz: b3b9cb495f1546e9bc2e4731e0eaaacf8ceca539d3fcb0a38fa32a8ef4463ca4fc1f016d72a3010ea8dd872f158cb7d99e97c6f2f0ac785f8a058ee30f9c212d
+  data.tar.gz: 551684e3cce842b078b7daecc1fd4950443ef4d86d29966751f4b3ee07fc228027517a8cc5b31685decee0db23a52507f2e148941361b42df747515a9da839b3

data/lib/worlddb.rb

@@ -4,22 +4,19 @@ require 'worlddb/models'   # NOTE: depends on core (aka worlddb-models)
 
 
 require 'gli'
-require 'logutils/activerecord'     # add support for logging to db
-
 
 # our own code
 
 require 'worlddb/cli/version'   # version always goes first
 
-# additional for cli only
 require 'worlddb/cli/opts'
+require 'worlddb/cli/main'
 
 
 module WorldDb
 
   def self.main
-    require 'worlddb/cli/main'
-    ## Runner.new.run(ARGV) - old code
+    exit Tool.new.run(ARGV)
   end
 
 end  # module WorldDb

data/lib/worlddb/cli/main.rb

@@ -1,17 +1,49 @@
 # encoding: utf-8
 
- 
-include GLI::App
+### NOTE: wrap gli config into a class
+##  see github.com/davetron5000/gli/issues/153
 
 
+module WorldDb
 
-program_desc 'world.db command line tool'
+  class Tool
+     def initialize
+       LogUtils::Logger.root.level = :info   # set logging level to info 
+     end
 
-version WorldDbCli::VERSION
+     def run( args )
+       puts WorldDbCli.banner
+
+       Toolii.logger = LogUtils::Logger.root
+       Toolii.opts   = WorldDb::Opts.new 
+       Toolii.run( args )
+     end
+  end
+
+
+  class Toolii
+    extend GLI::App
 
+   def self.logger=(value) @@logger=value; end
+   def self.logger()       @@logger; end
 
-LogUtils::Logger.root.level = :info   # set logging level to info 
-logger = LogUtils::Logger.root
+   ## todo: find a better name e.g. change to settings? config? safe_opts? why? why not?
+   def self.opts=(value)  @@opts = value; end
+   def self.opts()        @@opts; end
+
+   def self.connect_to_db( options )
+     puts "working directory: #{Dir.pwd}"
+
+     WorldDb.connect( adapter:  'sqlite3',
+                      database: "#{options.db_path}/#{options.db_name}" )
+
+     LogDb.setup  # turn on logging to db (that is, log to logs table in db)
+   end
+
+
+program_desc 'world.db command line tool'
+
+version WorldDbCli::VERSION
 
 =begin
 ### add to help use new sections
@@ -28,11 +60,6 @@ Further information:
 =end
 
 
-
-## todo: find a better name e.g. change to settings? config? safe_opts? why? why not?
-opts = WorldDb::Opts.new
-
-
 ### global option (required)
 ## todo: add check that path is valid?? possible?
 
@@ -54,18 +81,6 @@ switch [:q, :quiet], negatable: false
 
 
 
-def connect_to_db( options )
-  puts WorldDbCli.banner
-
-  puts "working directory: #{Dir.pwd}"
-
-  WorldDb.connect( adapter:  'sqlite3',
-                   database: "#{options.db_path}/#{options.db_name}" )
-
-  LogDb.setup  # turn on logging to db (that is, log to logs table in db)
-end
-
-
 desc 'Create DB schema'
 command [:create] do |c|
   c.action do |g,o,args|
@@ -232,8 +247,6 @@ pre do |g,c,o,args|
   opts.merge_gli_options!( g )
   opts.merge_gli_options!( o )
 
-  puts WorldDbCli.banner
-
   if opts.verbose?
     LogUtils::Logger.root.level = :debug
   end
@@ -260,4 +273,8 @@ on_error do |e|
 end
 
 
-exit run(ARGV)
+### exit run(ARGV)  ## note: use Toolii.run( ARGV ) outside of class
+
+  end  # class Toolii
+end  # module WorldDb
+

data/lib/worlddb/cli/version.rb

@@ -6,7 +6,7 @@
 module WorldDbCli    # todo/check - rename to WorldDbTool or WorldDbCommands or WorldDbShell ??
 
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
-  MINOR = 1
+  MINOR = 2
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/lib/worlddb/console.rb

@@ -4,6 +4,7 @@
 ## for use to run with interactive ruby (irb)
 ##  e.g.  irb -r worlddb/console
 
+require 'logger'
 require 'worlddb/models'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models