beerdb 0.9.13 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bd5af8feb16a5a25aac740c6cc34a08aec1109b6
+  data.tar.gz: dd4b95c41c8a89754e9f3c864234ba00758f8437
+SHA512:
+  metadata.gz: 37052c2727905e75c047d20ef2c8f300f58523102108ae6a670e3d945debbfa820c78b329135d308659714f999f970dc1eba6121fd5080be9383e97edecee28a
+  data.tar.gz: 9db94348d1f538e861c927eec9edc8358cf0cca72d43435d36f297f6eb7a3311e20c05aee1b15e5df81c32fd4f7edd8a4e82b9e9f88cdb9c54842ade45e7e31c

data/HISTORY.md

@@ -0,0 +1,3 @@
+### 0.1.0 / 2014-12-07
+
+* Everything is new. First release

data/Manifest.txt

@@ -1,4 +1,4 @@
-History.md
+HISTORY.md
 Manifest.txt
 README.md
 Rakefile
@@ -6,24 +6,5 @@ bin/beerdb
 lib/beerdb.rb
 lib/beerdb/cli/main.rb
 lib/beerdb/cli/opts.rb
+lib/beerdb/cli/version.rb
 lib/beerdb/console.rb
-lib/beerdb/deleter.rb
-lib/beerdb/models/beer.rb
-lib/beerdb/models/brand.rb
-lib/beerdb/models/brewery.rb
-lib/beerdb/models/forward.rb
-lib/beerdb/models/tag.rb
-lib/beerdb/models/world/city.rb
-lib/beerdb/models/world/country.rb
-lib/beerdb/models/world/region.rb
-lib/beerdb/reader.rb
-lib/beerdb/reader_file.rb
-lib/beerdb/reader_zip.rb
-lib/beerdb/schema.rb
-lib/beerdb/serializers/beer.rb
-lib/beerdb/serializers/brewery.rb
-lib/beerdb/stats.rb
-lib/beerdb/version.rb
-test/helper.rb
-test/test_fixture_matchers.rb
-test/test_values.rb

data/README.md

@@ -1,6 +1,5 @@
-# beerdb
+# beerdb gem - open beer database (beer.db) command line tool in ruby
 
-beer.db Command Line Tool in Ruby
 
 * home  :: [github.com/beerkit/beer.db.ruby](https://github.com/beerkit/beer.db.ruby)
 * bugs  :: [github.com/beerkit/beer.db.ruby/issues](https://github.com/beerkit/beer.db.ruby/issues)
@@ -35,82 +34,6 @@ beer.db Command Line Tool in Ruby
         -t, --trace          Display backtrace when an error occurs 
 
 
-## Usage Models
-
-Brewery Model
-
-```
-by = Brewery.find_by_key( 'guinness' )
-
-by.title
-=> 'St. James's Gate Brewery / Guinness Brewery'
-
-by.country.key
-=> 'ie'
-
-by.country.title
-=> 'Ireland'
-
-by.city.title
-=> 'Dublin'
-
-by.beers.first
-=> 'Guinness', 4.2
-
-...
-```
-
-
-Beer Model
-
-```
-b = Beer.find_by_key( 'guinness' )
-
-b.title
-=> 'Guinness'
-
-b.abv
-=> 4.2
-
-b.tags
-=> 'irish_dry_stout', 'dry_stout', 'stout'
-
-b.brewery.title
-=> 'St. James's Gate Brewery / Guinness Brewery'
-
-...
-```
-
-
-Country Model
-
-```
-at = Country.find_by_key( 'at' )
-
-at.beers
-=> 'Weitra Helles', 'Hadmar', 'Zwettler Original', ...
-
-at.breweries
-=> 'Weitra Bräu Bierwerkstatt', 'Zwettler Brauerei', ...
-
-...
-```
-
-
-City Model
-
-```
-wien = City.find_by_key( 'wien' )
-
-wien.beers
-=> 'Ottakringer Helles', 'Ottakringer (Gold Fassl) Zwickl', ...
-
-wien.breweries
-=> 'Ottakringer Brauerei'
-
-...
-```
-
 
 ## Install
 

data/Rakefile

@@ -1,11 +1,11 @@
 require 'hoe'
-require './lib/beerdb/version.rb'
+require './lib/beerdb/cli/version.rb'
 
 
 Hoe.spec 'beerdb' do
-  
-  self.version = BeerDb::VERSION
-  
+
+  self.version = BeerDbCli::VERSION
+
   self.summary = 'beerdb - beer.db command line tool'
   self.description = summary
 
@@ -16,32 +16,23 @@ Hoe.spec 'beerdb' do
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
-  self.history_file = 'History.md'
+  self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['props' ],
-    ['logutils'],
-    ['textutils'],
-    ['worlddb', '>= 2.0.2'],  # NB: worlddb already includes
-                               #         - logutils
-                               #         - textutils
-    ['tagutils'],     # tags n tagging tables
-    ['activerecord-utils'],   # extras e.g. rnd, find_by! for 3.x etc.
-    ['fetcher', '>= 0.3'],
+    ['beerdb-models', '>= 0.10.0'],
 
-    ## 3rd party
-    ['gli', '>= 2.5.6'],
+    ['datafile', '>= 0.1.1'],
+    ['fetcher', '>= 0.4.4'],
 
-    ['rubyzip'],   ## NOTE: used for ZipReader (optional in textutils, thus, pull it in here)
-
-    ['activerecord']  # NB: will include activesupport,etc.
-    ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
+    ## 3rd party
+    ['gli', '>= 2.12.2'],
+    ['sqlite3']
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+    required_ruby_version: '>= 1.9.2'
   }
 
 end

data/lib/beerdb/cli/main.rb

@@ -1,24 +1,58 @@
 # encoding: utf-8
 
-require 'gli'
- 
-include GLI::App
+### NOTE: wrap gli config into a class
+##  see github.com/davetron5000/gli/issues/153
 
 
-require 'logutils/db'   # add support for logging to db
-require 'beerdb/cli/opts'
+module BeerDb
 
+  class Tool
+     def initialize
+       LogUtils::Logger.root.level = :info   # set logging level to info 
+     end
 
+     def run( args )
+       puts BeerDbCli.banner
+       Toolii.run( args )
+     end
+  end
+
+
+  class Toolii
+    extend GLI::App
+
+   def self.logger=(value) @@logger=value; end
+   def self.logger()       @@logger; end
+
+   ## 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}"
+
+     db_config = {
+       adapter: 'sqlite3',
+       database: "#{options.db_path}/#{options.db_name}"
+     }
+
+     puts "Connecting to db using settings: "
+     pp db_config
+
+     ActiveRecord::Base.establish_connection( db_config )
+
+     LogDb.setup  # start logging to db (that is, save logs in logs table in db)
+   end
 
-program_desc 'beer.db command line tool'
-version BeerDb::VERSION
 
 
-LogUtils::Logger.root.level = :info   # set logging level to info 
 logger = LogUtils::Logger.root
+opts   = BeerDb::Opts.new 
 
 
-opts = BeerDb::Opts.new
+
+program_desc 'beer.db command line tool'
+version BeerDbCli::VERSION
 
 
 ### global option (required)
@@ -42,25 +76,6 @@ switch [:q, :quiet], negatable: false
 
 
 
-def connect_to_db( options )
-  puts BeerDb.banner
-
-  puts "working directory: #{Dir.pwd}"
-
-  db_config = {
-    :adapter  => 'sqlite3',
-    :database => "#{options.db_path}/#{options.db_name}"
-  }
-
-  puts "Connecting to db using settings: "
-  pp db_config
-
-  ActiveRecord::Base.establish_connection( db_config )
-  
-  LogDb.setup  # turn on logging to db
-end
-
-
 desc 'Create DB schema'
 command [:create] do |c|
 
@@ -78,11 +93,7 @@ command [:create] do |c|
       BeerDb::CreateDbExtrasNotes.new.up
       BeerDb::CreateDbExtrasDrinks.new.up
     else
-      LogDb.create
-      ConfDb.create
-      TagDb.create
-      WorldDb.create
-      BeerDb.create
+      BeerDb.create_all
     end
     puts 'Done.'
   end # action
@@ -109,11 +120,7 @@ command [:setup,:s] do |c|
     ## todo: document optional setup profile arg (defaults to all)
     setup = args[0] || 'all'
     
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
-    BeerDb.create
+    BeerDb.create_all
 
     WorldDb.read_all( opts.world_data_path )
     BeerDb.read_setup( "setups/#{setup}", opts.data_path )
@@ -311,4 +318,7 @@ on_error do |e|
 end
 
 
-exit run(ARGV)
+### exit run(ARGV)  ## note: use Toolii.run( ARGV ) outside of class
+
+  end  # class Toolii
+end  # module BeerDb

data/lib/beerdb/{version.rb → cli/version.rb}

@@ -1,8 +1,13 @@
+# encoding: utf-8
 
-module BeerDb
-  MAJOR = 0 ## todo: namespace inside version or something - why? why not??
-  MINOR = 9
-  PATCH = 13
+# Note: BeerDb::VERSION gets used by core, that is, beerdb-models
+
+
+module BeerDbCli    # todo/check - rename to BeerDbTool or BeerDbCommands or BeerDbShell ??
+
+  MAJOR = 0
+  MINOR = 10
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -14,7 +19,8 @@ module BeerDb
   end
 
   def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
   end
-end  # module BeerDb
+
+end # module BeerDbCli
 

data/lib/beerdb/console.rb

@@ -1,15 +1,9 @@
+# encoding: utf-8
+
 ## for use to run with interactive ruby (irb)
 ##  e.g.  irb -r sportdb/console
 
-require 'beerdb'
-
-# some ruby stdlibs
-
-require 'logger'
-require 'pp'   # pretty printer
-require 'uri'
-require 'json'
-require 'yaml'
+require 'beerdb/models'
 
 
 ## shortcuts for models
@@ -29,7 +23,7 @@ Prop      = WorldDb::Models::Prop
 
 DB_CONFIG = {
   adapter:  'sqlite3',
-  database: 'beer.db'
+  database: './beer.db'
 }
 
 pp DB_CONFIG

data/lib/beerdb.rb

@@ -1,123 +1,27 @@
-###
-# NB: for local testing run like:
-#
-# 1.9.x: ruby -Ilib lib/beerdb.rb
+# encoding: utf-8
 
-# core and stlibs
+require 'beerdb/models'   # Note: pull in all required deps via beerdb-models
 
-## stdlibs
-# -- get required already by worlddb (remove ??)
 
-require 'yaml'
-require 'pp'
-require 'logger'
-require 'optparse'
-require 'fileutils'
-require 'erb'
-require 'uri'
-
-
-# 3rd party gems / libs
-
-require 'zip'   ## (optionally for textutils e.g. soft dependency - pull in here)
-
-
-#  -- get required by worlddb
-# require 'active_record'   ## todo: add sqlite3? etc.
-# require 'logutils'
-# require 'textutils'
-
-require 'worlddb'
+require 'gli'
 
+require 'datafile'
+require 'fetcher'
 
 # our own code
 
-require 'beerdb/version'   ## version always goes first
-
-require 'beerdb/models/forward'
-require 'beerdb/models/world/country'
-require 'beerdb/models/world/region'
-require 'beerdb/models/world/city'
-require 'beerdb/models/tag'
-require 'beerdb/models/beer'
-require 'beerdb/models/brand'
-require 'beerdb/models/brewery'
-
-
-require 'beerdb/serializers/beer'
-require 'beerdb/serializers/brewery'
-
-require 'beerdb/schema'
-require 'beerdb/reader'
-require 'beerdb/reader_file'
-require 'beerdb/reader_zip'
-require 'beerdb/deleter'
-require 'beerdb/stats'
+require 'beerdb/cli/version'   ## version always goes first
+require 'beerdb/cli/opts'
+require 'beerdb/cli/main'
 
 
 module BeerDb
 
   def self.main
-    require 'beerdb/cli/main'
-    # Runner.new.run(ARGV) old code
-  end
-
-  def self.create
-    CreateDb.new.up
-
-    ### fix: make optional do NOT auto create here
-    ### fix: use if defined? BeerDbNote or similar or/and check if table exist ??
-    ###      or move to beerdb-note ??
-
-    # CreateDbExtrasUsers.new.up
-    # CreateDbExtrasBookmarks.new.up
-    # CreateDbExtrasDrinks.new.up
-    # CreateDbExtrasNotes.new.up
-
-    ConfDb::Model::Prop.create!( key: 'db.schema.beer.version', value: VERSION )
-  end
-
-
-  def self.read( ary, include_path )
-    reader = Reader.new( include_path )
-    ary.each do |name|
-      reader.load( name )
-    end
-  end
-
-  def self.read_setup( setup, include_path, opts={} )
-    reader = Reader.new( include_path, opts )
-    reader.load_setup( setup )
-  end
-
-  def self.read_setup_from_zip( zip_name, setup, include_path, opts={} )  ## todo/check - use a better (shorter) name ??
-    reader = ZipReader.new( zip_name, include_path, opts )
-    reader.load_setup( setup )
-    reader.close
+    exit Tool.new.run(ARGV)
   end
 
-  def self.read_all( include_path, opts={} )  # load all builtins (using plain text reader); helper for convenience
-    read_setup( 'setups/all', include_path, opts )
-  end # method read_all
-
-
-  # delete ALL records (use with care!)
-  def self.delete!
-    puts '*** deleting beer table records/data...'
-    Deleter.new.run
-  end # method delete!
-
-  def self.tables
-    Stats.new.tables
-  end
-
-
 end  # module BeerDb
 
 
-if __FILE__ == $0
-  BeerDb.main
-else
-  # say hello
-  puts BeerDb.banner
-end
+BeerDb.main  if __FILE__ == $0