beerdb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c9b7444f7b2da573df49e8caa31166d4c404ba
-  data.tar.gz: 90bed33466139447acdd10596fac03880b635121
+  metadata.gz: 17f9cc74689ce9d1208acaab5188304387681738
+  data.tar.gz: 66ca767ba0474ff0f8ba87226f07e5466c005bc2
 SHA512:
-  metadata.gz: 309a3c8514fd37351fe45b41db5ba192cc1b61490410ed995aac6419c92631161b3c6bc9a1a98ebb41a8c0ea06b2b2f11f591d8b9bb079284b564984bbf9b49d
-  data.tar.gz: e444ac23eddcf1780806cfcd611343f8ca8e0495ee8e036f8a6e9177281fdd5a934865b3898ba7ccb875c4655bec3f99f6c3d46ccce6303fa5b8b0a3cbec8011
+  metadata.gz: 85c93d3258a2c2c5ba40e9cf6ea791ff851ed5385f87153d5e5fed5656b3ef22680af9501e1ab951d47af04697bbf16d3fe541209587e1a88864d24ce0d54b38
+  data.tar.gz: b1ad9f90444df6d7070f8191866626780787107d251ec8db1c1102d4aa073e6f50b763cd81a68a5c1d1e787c43e8036adec03bb14c8ba96f0349dd80a33acab6

data/README.md

@@ -19,7 +19,6 @@
         logs                 Show logs
         props                Show props
         serve                Start web service (HTTP JSON API)
-        setup                Create DB schema 'n' load all data
         stats                Show stats
         test                 Debug/test command suite
 

data/Rakefile

@@ -4,7 +4,7 @@ require './lib/beerdb/cli/version.rb'
 
 Hoe.spec 'beerdb' do
 
-  self.version = BeerDbCli::VERSION
+  self.version = BeerDbTool::VERSION
 
   self.summary = 'beerdb - beer.db command line tool'
   self.description = summary
@@ -20,6 +20,7 @@ Hoe.spec 'beerdb' do
 
   self.extra_deps = [
     ['beerdb-models', '>= 1.1.1'],
+    ['beerdb-note', '>= 0.0.1' ],    ## (auto-)add notes extension / addon too
 
     ['datafile', '>= 0.2.5'],
     ['fetcher', '>= 0.4.5'],

data/bin/beerdb

@@ -2,6 +2,6 @@
 
 require 'beerdb'
 
-## todo: set x flag for file
+## note: set x flag for bin/beerdb file
 
 BeerDb.main

data/lib/beerdb/cli/main.rb

@@ -12,7 +12,7 @@ module BeerDb
      end
 
      def run( args )
-       puts BeerDbCli.banner
+       puts BeerDbTool.banner
        Toolii.run( args )
      end
   end
@@ -32,15 +32,8 @@ module BeerDb
    def self.connect_to_db( options )
      puts "working directory: #{Dir.pwd}"
 
-     config = {
-       adapter: 'sqlite3',
-       database: "#{options.db_path}/#{options.db_name}"
-     }
-
-     puts "Connecting to db using settings: "
-     pp config
-
-     BeerDb.connect( config )
+     BeerDb.connect( adapter: 'sqlite3',
+                     database: "#{options.db_path}/#{options.db_name}" )
 
      LogDb.setup  # start logging to db (that is, save logs in logs table in db)
    end
@@ -53,7 +46,7 @@ opts   = BeerDb::Opts.new
 
 
 program_desc 'beer.db command line tool'
-version BeerDbCli::VERSION
+version BeerDbTool::VERSION
 
 
 ### global option (required)
@@ -110,6 +103,7 @@ command [:read,:r] do |c|
   end # action
 end  # command setup
 
+
 desc "Download datasets; use ./Datafile - zips get downloaded to ./tmp"
 command [:download,:dl] do |c|
 
@@ -131,7 +125,7 @@ command [:new,:n] do |c|
 
   c.action do |g,o,args|
 
-    ## todo: required template name (defaults to worldcup2014)
+    ## todo: required template name (defaults to at)
     setup = args[0] || 'at'
 
     worker = Fetcher::Worker.new
@@ -178,33 +172,6 @@ command [:create] do |c|
 end # command create
 
 
-desc "Create DB schema 'n' load all world and beer data"
-arg_name 'NAME'   # optional setup profile name
-command [:setup,:s] do |c|
-
-  c.desc 'Beer data path'
-  c.arg_name 'PATH'
-  c.default_value opts.data_path
-  c.flag [:i,:include]
-
-  c.desc 'World data path'
-  c.arg_name 'PATH'
-  c.flag [:worldinclude]   ## todo: use --world-include - how? find better name? add :'world-include' ???
-
-  c.action do |g,o,args|
-
-    connect_to_db( opts )
-
-    ## todo: document optional setup profile arg (defaults to all)
-    setup = args[0] || 'all'
-
-    BeerDb.create_all
-
-    WorldDb.read_all( opts.world_data_path )
-    BeerDb.read_setup( "setups/#{setup}", opts.data_path )
-    puts 'Done.'
-  end # action
-end  # command setup
 
 
 desc 'Update all beer data'
@@ -261,43 +228,6 @@ end # command load
 
 
 
-## fix/todo: add server alias (serve/server)
-
-desc 'Start web service (HTTP JSON API)'
-command [:serve,:server] do |c|
-
-  c.action do |g,o,args|
-
-    connect_to_db( opts )
-
-    # NB: server (HTTP service) not included in standard default require
-    require 'beerdb/service'
-
-# make sure connections get closed after every request e.g.
-#
-#  after do
-#   ActiveRecord::Base.connection.close
-#  end
-#
-
-    puts 'before add middleware ConnectionManagement'
-    BeerDb::Service.use ActiveRecord::ConnectionAdapters::ConnectionManagement
-    puts 'after add middleware ConnectionManagement'
-    ## todo: check if we can check on/dump middleware stack
-
-    ## rack middleware might not work with multi-threaded thin web server; close it ourselfs
-    BeerDb::Service.after do
-      puts "  #{Thread.current.object_id} -- make sure db connections gets closed after request"
-      # todo: check if connection is open - how?
-      ActiveRecord::Base.connection.close
-    end
-
-    BeerDb::Service.run!
-
-    puts 'Done.'
-  end
-end # command serve
-
 
 desc 'Show stats'
 command :stats do |c|
@@ -318,8 +248,10 @@ command :props do |c|
 
     connect_to_db( opts )
 
-    ### fix: use ConfDb.props or similar !!!
-    ### BeerDb.props
+    ## fix: use ConfDb.dump or similar
+    ConfDb::Models::Prop.all.each do |prop|
+      puts "#{prop.key}  |  #{prop.value}"
+    end
 
     puts 'Done.'
   end
@@ -332,6 +264,7 @@ command :logs do |c|
 
     connect_to_db( opts )
 
+    ## fix: use LogDb.dump or similar
     LogDb::Models::Log.all.each do |log|
       puts "[#{log.level}] -- #{log.msg}"
     end

data/lib/beerdb/cli/opts.rb

@@ -9,7 +9,6 @@ class Opts
     @verbose = true     if options[:verbose] == true
 
     @data_path       = options[:include]      if options[:include].present?
-    @world_data_path = options[:worldinclude] if options[:worldinclude].present? 
   end
 
 
@@ -40,10 +39,6 @@ class Opts
     @data_path || '.'
   end
 
-  def world_data_path
-    @world_data_path   # NB: option has no default; return nil
-  end
-
 end # class Opts
 
 end # module BeerDb

data/lib/beerdb/cli/version.rb

@@ -3,11 +3,11 @@
 # Note: BeerDb::VERSION gets used by core, that is, beerdb-models
 
 
-module BeerDbCli    # todo/check - rename to BeerDbTool or BeerDbCommands or BeerDbShell ??
+module BeerDbTool    # todo/check - rename to BeerDbCli or BeerDbCommands or BeerDbShell ??
 
   MAJOR = 1
   MINOR = 0
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -22,4 +22,4 @@ module BeerDbCli    # todo/check - rename to BeerDbTool or BeerDbCommands or Bee
     "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
   end
 
-end # module BeerDbCli
+end # module BeerDbTool

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beerdb-models
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: beerdb-note
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: datafile
   requirement: !ruby/object:Gem::Requirement