worlddb 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02e4aee5a2328bc9d9ad438f18008fdd21d9e032
-  data.tar.gz: b7ffd082f22b1eae0b068119f137c81582803d38
+  metadata.gz: 24d659b0a6e54a1035ee66d2a01ab34766703d09
+  data.tar.gz: c813625ec34d148179e5950346b415a791729f11
 SHA512:
-  metadata.gz: 437d157d9498a7c1c71f3edf419d38941706be74949949713d9486f3ac5a29354d210a4afe179c59c150390edc6b3f1cf326e0494d62cabe637259ddb4087919
-  data.tar.gz: e8af4c21f138e17424bb314a183c56fa7924985e89c5a0967c1baeb8bee6020097050d4bff844672c042cd707ad9e38e2f0c5a0862f60e8a62886efe222cb8a7
+  metadata.gz: ff6dfd3b729c340fc7bf63050d87ac4dd72c5def886f9ae03626a8c71753228b359b3ad4378cdc6a48e4fe22c66c4228971284f08b0423f4d0837365833701a3
+  data.tar.gz: 2af456f08c297e815dcdc5faa3b737b6676a770f78016dd8959764b2306da522c8096da32899a1b399278a1fd2ea2c225fa973421a40c812ed96a92f25421aba

data/README.md

@@ -2,8 +2,8 @@
 
 world.db Command Line Tool in Ruby
 
-* home  :: [github.com/worlddb/world.db.ruby](https://github.com/worlddb/world.db.ruby)
-* bugs  :: [github.com/worlddb/world.db.ruby/issues](https://github.com/worlddb/world.db.ruby/issues)
+* home  :: [github.com/worlddb/world.db.tools](https://github.com/worlddb/world.db.tools)
+* bugs  :: [github.com/worlddb/world.db.tools/issues](https://github.com/worlddb/world.db.tools/issues)
 * gem   :: [rubygems.org/gems/worlddb](https://rubygems.org/gems/worlddb)
 * rdoc  :: [rubydoc.info/gems/worlddb](http://rubydoc.info/gems/worlddb)
 * forum :: [groups.google.com/group/openmundi](https://groups.google.com/group/openmundi)

data/Rakefile

@@ -9,15 +9,18 @@ Hoe.spec 'worlddb' do
   self.summary = "worlddb - world.db command line tool"
   self.description = summary
 
-  self.urls    = ['https://github.com/worlddb/world.db.ruby']
+  self.urls    = ['https://github.com/worlddb/world.db.tools']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'openmundi@googlegroups.com'
 
   self.extra_deps = [
-    ['worlddb-models', '>=2.1.0'],
+    ['worlddb-models', '>=2.3.0'],
     ### ['worlddb-service'],
 
+    ['datafile', '>= 0.2.2'],
+    ['fetcher', '>= 0.4.5'],
+
      ## 3rd party
     ['gli', '>= 2.12.2'],
     ['sqlite3']   # Note: will include sqlite for activerecord; use worlddb-models for apps etc.

data/lib/worlddb.rb

@@ -2,6 +2,8 @@
 
 require 'worlddb/models'   # NOTE: depends on core (aka worlddb-models)
 
+require 'fetcher'
+require 'datafile'
 
 require 'gli'
 

data/lib/worlddb/cli/main.rb

@@ -80,6 +80,81 @@ desc 'Only show warnings, errors and fatal messages'
 switch [:q, :quiet], negatable: false
 
 
+desc "Build DB (download/create/read); use ./Datafile - zips get downloaded to ./tmp"
+command [:build,:b] do |c|
+
+  c.action do |g,o,args|
+
+    datafile = Datafile::Datafile.load_file( './Datafile' )
+    datafile.download  # datafile step 1 - download all datasets/zips 
+
+    connect_to_db( opts )
+
+    WorldDb.create_all
+
+    datafile.read  # datafile step 2 - read all datasets
+
+    puts 'Done.'
+  end # action
+end  # command setup
+
+desc "Read datasets; use ./Datafile - zips required in ./tmp"
+command [:read,:r] do |c|
+
+  c.action do |g,o,args|
+
+    connect_to_db( opts )
+
+    datafile = Datafile::Datafile.load_file( './Datafile' )
+    datafile.read
+
+    puts 'Done.'
+  end # action
+end  # command setup
+
+desc "Download datasets; use ./Datafile - zips get downloaded to ./tmp"
+command [:download,:dl] do |c|
+
+  c.action do |g,o,args|
+
+    # note: no database connection needed (check - needed for logs?? - not setup by default???)
+
+    datafile = Datafile::Datafile.load_file( './Datafile' )
+    datafile.download
+
+    puts 'Done.'
+  end # action
+end  # command setup
+
+
+desc "Build DB w/ quick starter Datafile templates"
+arg_name 'NAME'   # optional setup profile name
+command [:new,:n] do |c|
+
+  c.action do |g,o,args|
+
+    ## todo: required template name (defaults to worldcup2014)
+    setup = args[0] || 'at'
+
+    worker = Fetcher::Worker.new
+    ## 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/openmundi/datafile/raw/master/#{setup}.rb", './Datafile' )
+
+    ## step 2: same as command build (todo - reuse code)
+    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  ???
+
+    WorldDb.create_all
+
+    datafile.read  # datafile step 2 - read all datasets
+
+    puts 'Done.'
+  end # action
+end  # command setup
+
+
 
 desc 'Create DB schema'
 command [:create] do |c|
@@ -93,7 +168,6 @@ command [:create] do |c|
   end # action
 end # command create
 
-
 desc "Create DB schema 'n' load all world data"
 arg_name 'NAME' # optional setup profile name
 command [:setup,:s] do |c|

data/lib/worlddb/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: datafile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: fetcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +128,7 @@ files:
 - lib/worlddb/cli/opts.rb
 - lib/worlddb/cli/version.rb
 - lib/worlddb/console.rb
-homepage: https://github.com/worlddb/world.db.ruby
+homepage: https://github.com/worlddb/world.db.tools
 licenses:
 - Public Domain
 metadata: {}