beerdb 0.0.1 → 0.1.0

data/Manifest.txt

@@ -1,14 +1,18 @@
-History.markdown
+History.md
 Manifest.txt
-README.markdown
+README.md
 Rakefile
 bin/beerdb
 lib/beerdb.rb
+lib/beerdb/cli/main.rb
 lib/beerdb/cli/opts.rb
-lib/beerdb/cli/runner.rb
+lib/beerdb/deleter.rb
 lib/beerdb/models/beer.rb
 lib/beerdb/models/brewery.rb
+lib/beerdb/models/city.rb
 lib/beerdb/models/country.rb
-lib/beerdb/models/prop.rb
+lib/beerdb/models/forward.rb
+lib/beerdb/reader.rb
 lib/beerdb/schema.rb
+lib/beerdb/stats.rb
 lib/beerdb/version.rb

data/{README.markdown → README.md}

@@ -2,7 +2,7 @@
 
 beer.db Command Line Tool in Ruby
 
-* [geraldb.github.com/beer.db](http://geraldb.github.com/beer.db)
+* [geraldb.github.com/beer.db.ruby](http://geraldb.github.com/beer.db.ruby)
 
 
 ## Usage
@@ -20,4 +20,4 @@ Just install the gem:
 ## License
 
 The `beerdb` scripts are dedicated to the public domain.
-Use it as you please with no restrictions whatsoever.
+Use it as you please with no restrictions whatsoever.

data/Rakefile

@@ -3,23 +3,105 @@ require './lib/beerdb/version.rb'
 
 Hoe.spec 'beerdb' do
   
-  self.version = BeerDB::VERSION
+  self.version = BeerDb::VERSION
   
   self.summary = 'beerdb - beer.db command line tool'
   self.description = summary
 
-  self.urls    = ['http://geraldb.github.com/beer.db']
+  self.urls    = ['https://github.com/geraldb/beer.db.ruby']
   
   self.author  = 'Gerald Bauer'
   self.email   = 'tobedone@googlegroups.com'
     
   # switch extension to .markdown for gihub formatting
-  self.readme_file  = 'README.markdown'
-  self.history_file = 'History.markdown'
+  self.readme_file  = 'README.md'
+  self.history_file = 'History.md'
   
   self.extra_deps = [
-    ['activerecord', '~> 3.2']  # NB: will include activesupport,etc.
+    ['activerecord', '~> 3.2'],  # NB: will include activesupport,etc.
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
+
+    ['worlddb', '~> 1.6'],  # NB: worlddb already includes
+                               #         - commander
+                               #         - logutils
+                               #         - textutils
+                               
+  ## 3rd party
+    ['commander', '~> 4.1.3']   # remove? -- already included as dep in worlddb                               
   ]
 
-end
+ self.licenses = ['Public Domain']
+
+  self.spec_extras = {
+   :required_ruby_version => '>= 1.9.2'
+  }
+
+end
+
+
+
+##############################
+## for testing 
+##
+## NB: use rake -I ../world.db.ruby/lib -I ./lib beerdb:build
+
+namespace :beerdb do
+  
+  BUILD_DIR = "./build"
+  
+  BEER_DB_PATH = "#{BUILD_DIR}/beer.db"
+
+  DB_CONFIG = {
+    :adapter   =>  'sqlite3',
+    :database  =>  BEER_DB_PATH
+  }
+
+  directory BUILD_DIR
+
+  task :clean do
+    rm BEER_DB_PATH if File.exists?( BEER_DB_PATH )
+  end
+
+  task :env => BUILD_DIR do
+    require 'worlddb'   ### NB: for local testing use rake -I ./lib dev:test e.g. do NOT forget to add -I ./lib
+    require 'beerdb'
+    require 'logutils/db'
+
+    LogUtils::Logger.root.level = :info
+
+    pp DB_CONFIG
+    ActiveRecord::Base.establish_connection( DB_CONFIG )
+  end
+
+  task :create => :env do
+    LogDb.create
+    WorldDb.create
+    BeerDb.create
+  end
+
+  task :importworld => :env do
+    WorldDb.read_setup( 'setups/sport.db.admin', '../world.db', skip_tags: true )  # populate world tables
+    WorldDb.tables
+  end
+
+  task :importbeer => :env do
+    BeerDb.read_setup( 'setups/all', '../beer.db' )
+    BeerDb.tables
+  end
+
+  task :deletebeer => :env do
+    BeerDb.delete!
+  end
+
+
+  desc 'beerdb - build from scratch'
+  task :build => [:clean, :create, :importworld, :importbeer] do
+    puts 'Done.'
+  end
+
+  desc 'beerdb - update'
+  task :update => [:deletebeer, :importbeer] do
+    puts 'Done.'
+  end
+
+end  # namespace :beerdb

data/bin/beerdb

@@ -4,4 +4,4 @@ require 'beerdb'
 
 ## todo: set x flag for file
 
-BeerDB.main
+BeerDb.main

data/lib/beerdb/cli/main.rb

@@ -0,0 +1,230 @@
+# encoding: utf-8
+
+require 'commander/import'
+
+require 'logutils/db'   # add support for logging to db
+require 'beerdb/cli/opts'
+
+LogUtils::Logger.root.level = :info   # set logging level to info 
+
+
+program :name,  'beerdb'
+program :version, BeerDb::VERSION
+program :description, "beer.db command line tool, version #{BeerDb::VERSION}"
+
+
+# default_command :help
+default_command :load
+
+program :help_formatter, Commander::HelpFormatter::TerminalCompact
+
+
+## todo: find a better name e.g. change to settings? config? safe_opts? why? why not?
+myopts = BeerDb::Opts.new
+
+### global option (required)
+## todo: add check that path is valid?? possible?
+
+global_option '-i', '--include PATH', String, "Data path (default is #{myopts.data_path})"
+global_option '-d', '--dbpath PATH', String, "Database path (default is #{myopts.db_path})"
+global_option '-n', '--dbname NAME', String, "Database name (datault is #{myopts.db_name})"
+
+global_option '-q', '--quiet', "Only show warnings, errors and fatal messages"
+### todo/fix: just want --debug/--verbose flag (no single letter option wanted) - fix
+global_option '-w', '--verbose', "Show debug messages"
+
+
+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
+
+
+command :create do |c|
+  c.syntax = 'beerdb create [options]'
+  c.description = 'Create DB schema'
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts )
+    
+    LogDb.create
+    WorldDb.create
+    BeerDb.create
+    puts 'Done.'
+  end # action
+end # command create
+
+command :setup do |c|
+  c.syntax = 'beerdb setup [options]'
+  c.description = "Create DB schema 'n' load all data"
+
+  c.option '--world', 'Populate world tables'
+  ## todo: use --world-include - how? find better name?
+  c.option '--worldinclude PATH', String, 'World data path'
+
+  c.option '--beer', 'Populate beer tables'
+  c.option '--delete', 'Delete all records'
+
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts )
+
+    ## todo: document optional setup profile arg (defaults to all)
+    setup = args[0] || 'all'
+    
+    if options.world.present? || options.beer.present?
+      
+      ## todo: check order for reference integrity
+      #  not really possible to delete world data if sport data is present
+      #   delete sport first
+      
+      if options.delete.present?
+        BeerDb.delete! if options.beer.present?
+        WorldDb.delete! if options.world.present?
+      end
+      
+      if options.world.present?
+        WorldDb.read_all( myopts.world_data_path )
+      end
+      
+      if options.beer.present?
+        BeerDb.read_setup( "setups/#{setup}", myopts.data_path )
+      end
+
+    else  # assume "plain" regular setup
+      LogDb.create
+      WorldDb.create
+      BeerDb.create
+    
+      WorldDb.read_all( myopts.world_data_path )
+      BeerDb.read_setup( "setups/#{setup}", myopts.data_path )
+    end
+
+    puts 'Done.'
+  end # action
+end  # command setup
+
+command :load do |c|
+  ## todo: how to specify many fixutes <>... ??? in syntax
+  c.syntax = 'beerdb load [options] <fixtures>'
+  c.description = 'Load fixtures'
+
+  c.option '--delete', 'Delete all records'
+
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts )
+    
+    if options.delete.present?
+      LogDb.delete!
+      BeerDb.delete!
+    end
+
+    # read plain text country/region/city fixtures
+    reader = BeerDb::Reader.new( myopts.data_path )
+    args.each do |arg|
+      name = arg     # File.basename( arg, '.*' )
+      reader.load( name )
+    end # each arg
+    
+    puts 'Done.'
+  end
+end # command load
+
+
+command :stats do |c|
+  c.syntax = 'beerdb stats [options]'
+  c.description = 'Show stats'
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts ) 
+    
+    BeerDb.tables
+    
+    puts 'Done.'
+  end
+end
+
+
+command :props do |c|
+  c.syntax = 'beerdb props [options]'
+  c.description = 'Show props'
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts ) 
+    
+    BeerDb.props
+    
+    puts 'Done.'
+  end
+end
+
+
+command :logs do |c|
+  c.syntax = 'beerdb logs [options]'
+  c.description = 'Show logs'
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts ) 
+    
+    LogDb::Models::Log.all.each do |log|
+      puts "[#{log.level}] -- #{log.msg}"
+    end
+    
+    puts 'Done.'
+  end
+end
+
+
+
+command :test do |c|
+  c.syntax = 'beerdb test [options]'
+  c.description = 'Debug/test command suite'
+  c.action do |args, options|
+    puts "hello from test command"
+    puts "args (#{args.class.name}):"
+    pp args
+    puts "options:"
+    pp options
+    puts "options.__hash__:"
+    pp options.__hash__
+    puts 'Done.'
+  end
+end

data/lib/beerdb/cli/opts.rb

@@ -1,47 +1,28 @@
-module BeerDB
+module BeerDb
 
 class Opts
 
-  def create=(boolean)
-    @create = boolean
-  end
 
-  def create?
-    return false if @create.nil?   # default create flag is false
-    @create == true
-  end
-  
+  def merge_commander_options!( options = {} )
+    @db_path   = options[:dbpath]  if options[:dbpath].present?
+    @db_name   = options[:dbname]  if options[:dbname].present?
 
-  def delete=(boolean)
-    @delete = boolean
+    @data_path = options[:include] if options[:include].present?
+    
+    @world_data_path = options[:worldinclude] if options[:worldinclude].present? 
   end
 
-  def delete?
-    return false if @delete.nil?   # default create flag is false
-    @delete == true
-  end
 
 
-  # use loader? (that is, built-in seed data)
-  def load=(boolean)
-    @load = boolean
+  def db_path
+    @db_path || '.'
   end
 
-  def load?
-    return false if @load.nil?   # default create flag is false
-    @load == true
+  def db_name
+    @db_name || 'beer.db'
   end
 
 
-  def output_path=(value)
-    @output_path = value
-  end
-  
-  def output_path
-    @output_path || '.'
-  end
-  
-
   def data_path=(value)
     @data_path = value
   end
@@ -50,7 +31,10 @@ 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
+end # module BeerDb

data/lib/beerdb/deleter.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module BeerDb
+
+  class Deleter
+    
+    include BeerDb::Models
+
+    def run
+      # for now delete all tables
+
+      Beer.delete_all
+      Brewery.delete_all
+    end
+    
+  end # class Deleter
+
+end # module BeerDb

data/lib/beerdb/models/beer.rb

@@ -1,12 +1,12 @@
-module BeerDB
-  module Models
+module BeerDb::Models
 
- 
 class Beer < ActiveRecord::Base
 
+  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
+  belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
 
 end # class Beer
 
 
- end # module Models
-end # module BeerDB
+end # module BeerDb::Models
+

data/lib/beerdb/models/brewery.rb

@@ -1,13 +1,14 @@
-module BeerDB
-  module Models
+module BeerDb::Models
 
-  
 class Brewery < ActiveRecord::Base
-  
+
   self.table_name = 'breweries'
 
+  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
+  belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
+
 end # class Brewery
 
 
- end # module Models
-end # module BeerDB
+end # module BeerDb::Models
+

data/lib/beerdb/models/city.rb

@@ -0,0 +1,8 @@
+module WorldDb::Models
+
+class City
+    has_many :beers,     :class_name => 'BeerDb::Models::Beer',    :foreign_key => 'country_id'
+    has_many :breweries, :class_name => 'BeerDb::Models::Brewery', :foreign_key => 'country_id'
+end # class Country
+
+end # module WorldDb::Models

data/lib/beerdb/models/country.rb

@@ -1,26 +1,9 @@
-module BeerDB
-  module Models
 
-  
-class Country < ActiveRecord::Base
-  self.table_name = 'countries'
-
-  def self.create_from_ary!( countries )
-    countries.each do |values|
-      
-      ## key & title required
-      attr = {
-        :key   => values[0],
-        :title => values[1],
-        :tag   => values[2]
-      }
-      
-      Country.create!( attr )
-    end # each country
-  end
+module WorldDb::Models
 
+class Country
+    has_many :beers,     :class_name => 'BeerDb::Models::Beer',    :foreign_key => 'country_id'
+    has_many :breweries, :class_name => 'BeerDb::Models::Brewery', :foreign_key => 'country_id'
 end # class Country
 
-
- end # module Models
-end # module BeerDB
+end # module WorldDb::Models

data/lib/beerdb/models/forward.rb

@@ -0,0 +1,25 @@
+### forward references
+##   require first to resolve circular references
+
+module BeerDb::Models
+
+  ## todo: why? why not use include WorldDb::Models here???
+
+  Continent = WorldDb::Models::Continent
+  Country   = WorldDb::Models::Country
+  Region    = WorldDb::Models::Region
+  City      = WorldDb::Models::City
+  Prop      = WorldDb::Models::Prop
+
+  class Beer < ActiveRecord::Base ; end
+  class Brewery < ActiveRecord::Base ; end
+
+end
+
+
+module WorldDb::Models
+
+  Beer    = BeerDb::Models::Beer
+  Brewery = BeerDb::Models::Brewery
+
+end

data/lib/beerdb/reader.rb

@@ -0,0 +1,196 @@
+# encoding: UTF-8
+
+module BeerDb
+
+class Reader
+
+  include LogUtils::Logging
+
+  include BeerDb::Models
+
+  attr_reader :include_path
+
+
+  def initialize( include_path, opts = {} )
+    @include_path = include_path
+  end
+
+
+  def load_setup( setup )
+    ary = load_fixture_setup( setup )
+
+    ary.each do |name|
+      load( name )
+    end
+  end # method load_setup
+
+
+  ## fix/todo: rename ??
+  def load_fixture_setup( name )
+    
+   ## todo/fix: cleanup quick and dirty code
+    
+    path = "#{include_path}/#{name}.yml"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    text = File.read_utf8( path )
+    
+    hash = YAML.load( text )
+    
+    ### build up array for fixtures from hash
+    
+    ary = []
+    
+    hash.each do |key_wild, value_wild|
+      key   = key_wild.to_s.strip
+      
+      logger.debug "yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<"
+    
+      if value_wild.kind_of?( String ) # assume single fixture name
+        ary << value_wild
+      elsif value_wild.kind_of?( Array ) # assume array of fixture names as strings
+        ary = ary + value_wild
+      else
+        logger.error "unknow fixture type in setup (yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<); skipping"
+      end
+    end
+    
+    logger.debug "fixture setup:"
+    logger.debug ary.to_json
+    
+    ary
+  end # load_fixture_setup
+
+
+  def load( name )
+
+    if name =~ /\/([a-z]{2})\/beers/
+      ## auto-add required country code (from folder structure)
+      load_beers( $1, name )
+    else
+      logger.error "unknown beer.db fixture type >#{name}<"
+      # todo/fix: exit w/ error
+    end
+  end
+  
+
+  def load_beers( country_key, name, more_values={} )
+    country = Country.find_by_key!( country_key )
+    logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
+
+    more_values[ :country_id ] = country.id
+
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = ValuesReader.new( path, more_values )
+    
+    load_beers_worker( reader )
+
+    Prop.create_from_fixture!( name, path )
+  end
+
+
+private
+
+
+  def load_beers_worker( reader )
+
+    ## NB: assumes active activerecord db connection
+    ##
+
+    reader.each_line do |attribs, values|
+  
+      value_tag_keys    = []
+      
+      ### check for "default" tags - that is, if present attribs[:tags] remove from hash
+      
+      if attribs[:tags].present?
+        more_tag_keys = attribs[:tags].split('|')
+        attribs.delete(:tags)
+
+        ## unify; replace _w/ space; remove leading n trailing whitespace
+        more_tag_keys = more_tag_keys.map do |key|
+          key = key.gsub( '_', ' ' )
+          key = key.strip
+          key
+        end
+
+        value_tag_keys += more_tag_keys
+      end
+
+
+      ## check for optional values
+      values.each_with_index do |value,index|
+        if value =~ /^country:/   ## country:
+          value_country_key = value[8..-1]  ## cut off country: prefix
+          value_country = Country.find_by_key!( value_country_key )
+          attribs[ :country_id ] = value_country.id
+        elsif value =~ /^city:/   ## city:
+          value_city_key = value[5..-1]  ## cut off city: prefix
+          value_city = City.find_by_key!( value_city_key )
+          attribs[ :city_id ] = value_city.id
+        elsif (values.size==(index+1)) && value =~ /^[a-z0-9\|_ ]+$/   # tags must be last entry
+
+          logger.debug "   found tags: >>#{value}<<"
+
+          tag_keys = value.split('|')
+  
+          ## unify; replace _w/ space; remove leading n trailing whitespace
+          tag_keys = tag_keys.map do |key|
+            key = key.gsub( '_', ' ' )
+            key = key.strip
+            key
+          end
+          
+          value_tag_keys += tag_keys
+        else
+          # issue warning: unknown type for value
+          logger.warn "unknown type for value >#{value}<"
+        end
+      end # each value
+
+      #  rec = Beer.find_by_key_and_country_id( attribs[ :key ], attribs[ :country_id] )
+      rec = Beer.find_by_key( attribs[ :key ] )
+
+      if rec.present?
+        logger.debug "update Beer #{rec.id}-#{rec.key}:"
+      else
+        logger.debug "create Beer:"
+        rec = Beer.new
+      end
+      
+      logger.debug attribs.to_json
+
+      rec.update_attributes!( attribs )
+
+=begin
+      ##################
+      ## add taggings 
+
+      if value_tag_keys.size > 0
+        
+          value_tag_keys.uniq!  # remove duplicates
+          logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
+
+          ### fix/todo: check tag_ids and only update diff (add/remove ids)
+
+          value_tag_keys.each do |key|
+            tag = Tag.find_by_key( key )
+            if tag.nil?  # create tag if it doesn't exit
+              logger.debug "   creating tag >#{key}<"
+              tag = Tag.create!( key: key )
+            end
+            rec.tags << tag
+          end
+      end
+=end
+        
+    end # each_line
+            
+  end # method load_beers_worker
+  
+end # class Reader
+end # module BeerDb

data/lib/beerdb/schema.rb

@@ -1,27 +1,10 @@
 
-module BeerDB
+module BeerDb
 
-class CreateDB
+class CreateDb < ActiveRecord::Migration
 
-  include BeerDB::Models
 
-
-def self.up
-
-  ActiveRecord::Schema.define do
-
-create_table :countries do |t|
-  t.string :title, :null => false
-  t.string :tag,   :null => false  # short three letter tag
-  t.string :key,   :null => false
-  t.timestamps
-end
-
-create_table :props do |t|
-  t.string :key,   :null => false
-  t.string :value, :null => false
-  t.timestamps
-end
+def up
 
 create_table :beers do |t|
   t.string  :title, :null => false
@@ -32,23 +15,32 @@ create_table :beers do |t|
   ## todo: check seasonal is it proper english?
   t.boolean  :seasonal, :null => false, :default => false # all year or just eg. Festbier/Oktoberfest Special
   ## todo: add microbrew/brewpub flag?
-  #### t.boolean  :brewpub, :null => false, :default => false 
+  #### t.boolean  :brewpub, :null => false, :default => false
+  
+  t.references :country,  :null => false
+  t.references :city  # optional 
+  
   t.timestamps
 end
-    
+
+
 create_table :breweries do |t|
   t.string  :title
+  t.string  :key,   :null => false   # import/export key
+  t.string  :synonyms  # comma separated list of synonyms
   t.references :country,   :null => false
+  t.references :city  # optional
+  
   t.timestamps
 end
-    
-  end # block Schema.define
 
+end # method up
 
-  Prop.create!( key: 'db.schema.version', value: BeerDB::VERSION )
+def down
+  raise ActiveRecord::IrreversibleMigration
+end
 
-end # method up
 
-end # class CreateDB
+end # class CreateDb
 
-end # module BeerDB
+end # module BeerDb

data/lib/beerdb/stats.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+module BeerDb
+
+  class Stats
+    include BeerDb::Models
+
+    def tables
+      puts "Stats:"
+      puts " #{'%5d' % Beer.count} beers"
+      puts " #{'%5d' % Brewery.count} breweries"
+    end
+    
+    def props
+      puts "Props:"
+      Prop.order( 'created_at asc' ).all.each do |prop|
+        puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
+      end
+    end
+  end # class Stats
+
+end # module BeerDb

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
-module BeerDB
-  VERSION = '0.0.1'
+module BeerDb
+  VERSION = '0.1.0'
 end

data/lib/beerdb.rb

@@ -12,23 +12,31 @@ require 'optparse'
 require 'fileutils'
 require 'erb'
 
-# rubygems
+# 3rd party gems / libs
 
 require 'active_record'   ## todo: add sqlite3? etc.
 
+require 'logutils'
+require 'textutils'
+require 'worlddb'
+
 
 # our own code
 
+require 'beerdb/version'
+
+require 'beerdb/models/forward'
 require 'beerdb/models/country'
+require 'beerdb/models/city'
 require 'beerdb/models/beer'
 require 'beerdb/models/brewery'
-require 'beerdb/models/prop'
-require 'beerdb/schema'       # NB: requires beerdb/models (include BeerDB::Models)
-require 'beerdb/version'
-require 'beerdb/cli/opts'
-require 'beerdb/cli/runner'
+require 'beerdb/schema'
+require 'beerdb/reader'
+require 'beerdb/deleter'
+require 'beerdb/stats'
+
 
-module BeerDB
+module BeerDb
 
   def self.banner
     "beerdb #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
@@ -39,10 +47,53 @@ module BeerDB
   end
 
   def self.main
-    Runner.new.run(ARGV)
+    require 'beerdb/cli/main'
+    # Runner.new.run(ARGV) old code
+  end
+
+  def self.create
+    CreateDb.new.up
+    BeerDb::Models::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
-  
-end  # module BeerDB
+
+  def self.read_setup( setup, include_path, opts={} )
+    reader = Reader.new( include_path, opts )
+    reader.load_setup( setup )
+  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
+
+  def self.props
+    Stats.new.props
+  end
+
+end  # module BeerDb
 
 
-BeerDB.main if __FILE__ == $0
+if __FILE__ == $0
+  BeerDb.main
+else
+  # say hello
+  puts BeerDb.banner
+end

metadata

@@ -1,123 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: beerdb
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
+  requirement: &73327670 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *73327670
+- !ruby/object:Gem::Dependency
+  name: worlddb
+  requirement: &73327440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        version: "3.2"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: *73327440
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: &73327210 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *73327210
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &72898760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *72898760
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &72898510 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *72898510
 description: beerdb - beer.db command line tool
 email: tobedone@googlegroups.com
-executables: 
+executables:
 - beerdb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
-files: 
-- History.markdown
+files:
+- History.md
 - Manifest.txt
-- README.markdown
+- README.md
 - Rakefile
 - bin/beerdb
 - lib/beerdb.rb
+- lib/beerdb/cli/main.rb
 - lib/beerdb/cli/opts.rb
-- lib/beerdb/cli/runner.rb
+- lib/beerdb/deleter.rb
 - lib/beerdb/models/beer.rb
 - lib/beerdb/models/brewery.rb
+- lib/beerdb/models/city.rb
 - lib/beerdb/models/country.rb
-- lib/beerdb/models/prop.rb
+- lib/beerdb/models/forward.rb
+- lib/beerdb/reader.rb
 - lib/beerdb/schema.rb
+- lib/beerdb/stats.rb
 - lib/beerdb/version.rb
-homepage: http://geraldb.github.com/beer.db
-licenses: []
-
+homepage: https://github.com/geraldb/beer.db.ruby
+licenses:
+- Public Domain
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-- README.markdown
-require_paths: 
+- README.md
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: beerdb
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: beerdb - beer.db command line tool
 test_files: []
-

data/lib/beerdb/cli/runner.rb

@@ -1,124 +0,0 @@
-
-module BeerDB
-
-class Runner
-
-
-  include BeerDB::Models
-
-  def initialize
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
-
-    @opts    = Opts.new
-  end
-
-  attr_reader :logger, :opts
-
-
-  def run( args )
-    opt=OptionParser.new do |cmd|
-    
-      cmd.banner = "Usage: beerdb [options]"
-
-      ## todo: change to different flag??   use -c/--config ???
-      cmd.on( '-c', '--create', 'Create DB Schema' ) { opts.create = true }
-
-      cmd.on( '--delete', 'Delete all records' ) { opts.delete = true }
-      
-      cmd.on( '--load', 'Use Loader for Builtin Beer Data' ) { opts.load = true }
-      
-      ### todo: in future allow multiple search path??
-      cmd.on( '-i', '--include PATH', "Data Path (default is #{opts.data_path})" ) { |path| opts.data_path = path }
-
-      cmd.on( '-v', '--version', "Show version" ) do
-        puts BeerDB.banner
-        exit
-      end
-
-      cmd.on( "--verbose", "Show debug trace" )  do
-        logger.datetime_format = "%H:%H:%S"
-        logger.level = Logger::DEBUG
-        
-        ActiveRecord::Base.logger = Logger.new(STDOUT)
-      end
-
-      cmd.on_tail( "-h", "--help", "Show this message" ) do
-        puts <<EOS
-
-beerdb - beer.db command line tool, version #{VERSION}
-
-#{cmd.help}
-
-Examples:
-    beerdb at                             # import austrian beers
-    beerdb -c                             # create database schema
-
-More Examples:
-    beerdb                                # show stats (table counts, table props)
-
-Further information:
-  http://geraldb.github.com/beer.db
-  
-EOS
-        exit
-      end
-    end
-
-    opt.parse!( args )
-  
-    puts BeerDB.banner
-
-    puts "working directory: #{Dir.pwd}"
- 
-    db_config = {
-     :adapter  => 'sqlite3',
-     :database => "#{opts.output_path}/beer.db"
-    }
-  
-    puts "Connecting to db using settings: "
-    pp db_config
-
-    ActiveRecord::Base.establish_connection( db_config )
-    
-    if opts.create?
-      CreateDB.up
-    end
-    
-    if opts.delete?
-       # tbd
-    end
-
-
-    args.each do |arg|
-      name = arg     # File.basename( arg, '.*' )
-
-      # tbd
-    end
-    
-    dump_stats
-    dump_props
-    
-    puts 'Done.'
-    
-  end   # method run
-
-
-  def dump_stats
-    # todo: use %5d or similar to format string
-    puts "Stats:"
-    puts "  #{Beer.count} beers"
-    puts "  #{Brewery.count} breweries"
-    puts "  #{Country.count} countries"
-  end
-
-  def dump_props
-    # todo: use %5 or similar to format string
-    puts "Props:"
-    Prop.order( 'created_at asc' ).all.each do |prop|
-      puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
-    end
-  end
-  
-end # class Runner
-end # module BeerDB

data/lib/beerdb/models/prop.rb

@@ -1,12 +0,0 @@
-module BeerDB
-  module Models
-
-
-class Prop < ActiveRecord::Base
-    
-end  # class Prop
-  
-  
-  
- end # module Models
-end # module BeerDB