beerdb 0.10.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59415fcdf9c465ad302782f2e3d7dbbe523f7a9b
-  data.tar.gz: 3eb0dfd42d04170b294318fccb23869d5782b85d
+  metadata.gz: 83c9b7444f7b2da573df49e8caa31166d4c404ba
+  data.tar.gz: 90bed33466139447acdd10596fac03880b635121
 SHA512:
-  metadata.gz: 825ee22938f4aab62b1c52add08f041db453ac76b6f8dee449ad007438f318747e35214f1971ec135c3fac2cc24f2a05596510e4b7d8e3b43de894dfc0c6ff6a
-  data.tar.gz: d0dda165ce1173a9d731baf0a453e1ae0cae1f56f104ad251529226e98b945bd4b3df3a3ce3701feb17984218e2f4084d8059412938ddadd7fe44b1324b52ea7
+  metadata.gz: 309a3c8514fd37351fe45b41db5ba192cc1b61490410ed995aac6419c92631161b3c6bc9a1a98ebb41a8c0ea06b2b2f11f591d8b9bb079284b564984bbf9b49d
+  data.tar.gz: e444ac23eddcf1780806cfcd611343f8ca8e0495ee8e036f8a6e9177281fdd5a934865b3898ba7ccb875c4655bec3f99f6c3d46ccce6303fa5b8b0a3cbec8011

data/README.md

@@ -1,8 +1,8 @@
-# beerdb gem - open beer database (beer.db) command line tool in ruby
+# beerdb gem - open beer database (beer.db) command line tool
 
 
-* 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)
+* home  :: [github.com/beerkit/beer.db](https://github.com/beerkit/beer.db)
+* bugs  :: [github.com/beerkit/beer.db/issues](https://github.com/beerkit/beer.db/issues)
 * gem   :: [rubygems.org/gems/beerdb](https://rubygems.org/gems/beerdb)
 * rdoc  :: [rubydoc.info/gems/beerdb](http://rubydoc.info/gems/beerdb)
 * forum :: [groups.google.com/group/beerdb](https://groups.google.com/group/beerdb)
@@ -11,7 +11,7 @@
 ## Usage Command Line
 
       beer.db command line tool, version 0.5.0
-    
+
       Commands:
         create               Create DB schema
         help                 Display global or [command] help documentation.
@@ -22,16 +22,16 @@
         setup                Create DB schema 'n' load all data
         stats                Show stats
         test                 Debug/test command suite
-    
+
       Global Options:
-        -i, --include PATH   Data path (default is .) 
-        -d, --dbpath PATH    Database path (default is .) 
-        -n, --dbname NAME    Database name (datault is beer.db) 
-        -q, --quiet          Only show warnings, errors and fatal messages 
-        -w, --verbose        Show debug messages 
-        -h, --help           Display help documentation 
-        -v, --version        Display version information 
-        -t, --trace          Display backtrace when an error occurs 
+        -i, --include PATH   Data path (default is .)
+        -d, --dbpath PATH    Database path (default is .)
+        -n, --dbname NAME    Database name (datault is beer.db)
+        -q, --quiet          Only show warnings, errors and fatal messages
+        -w, --verbose        Show debug messages
+        -h, --help           Display help documentation
+        -v, --version        Display version information
+        -t, --trace          Display backtrace when an error occurs
 
 
 
@@ -42,14 +42,11 @@ Just install the gem:
     $ gem install beerdb
 
 
-## Free Open Public Domain Datasets
-
-- [`beer.db`](https://github.com/openbeer) - free open public domain beer n brewery data for use in any (programming) language
-
-
 
 ## License
 
+![](https://publicdomainworks.github.io/buttons/zero88x31.png)
+
 The `beerdb` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
@@ -57,4 +54,3 @@ Use it as you please with no restrictions whatsoever.
 
 Send them along to the [Open Beer & Brewery Database Forum/Mailing List](http://groups.google.com/group/beerdb).
 Thanks!
-

data/Rakefile

@@ -9,7 +9,7 @@ Hoe.spec 'beerdb' do
   self.summary = 'beerdb - beer.db command line tool'
   self.description = summary
 
-  self.urls    = ['https://github.com/beerkit/beer.db.ruby']
+  self.urls    = ['https://github.com/beerkit/beer.db']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'beerdb@googlegroups.com'
@@ -19,10 +19,10 @@ Hoe.spec 'beerdb' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['beerdb-models', '>= 0.10.0'],
+    ['beerdb-models', '>= 1.1.1'],
 
-    ['datafile', '>= 0.1.1'],
-    ['fetcher', '>= 0.4.4'],
+    ['datafile', '>= 0.2.5'],
+    ['fetcher', '>= 0.4.5'],
 
     ## 3rd party
     ['gli', '>= 2.12.2'],
@@ -32,7 +32,7 @@ Hoe.spec 'beerdb' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-    required_ruby_version: '>= 1.9.2'
+    required_ruby_version: '>= 2.3'
   }
 
 end

data/lib/beerdb/cli/main.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-### NOTE: wrap gli config into a class
+### Note: wrap gli config into a class
 ##  see github.com/davetron5000/gli/issues/153
 
 
@@ -8,7 +8,7 @@ module BeerDb
 
   class Tool
      def initialize
-       LogUtils::Logger.root.level = :info   # set logging level to info 
+       LogUtils::Logger.root.level = :info   # set logging level to info
      end
 
      def run( args )
@@ -28,18 +28,19 @@ module BeerDb
    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 = {
+     config = {
        adapter: 'sqlite3',
        database: "#{options.db_path}/#{options.db_name}"
      }
 
      puts "Connecting to db using settings: "
-     pp db_config
+     pp config
 
-     ActiveRecord::Base.establish_connection( db_config )
+     BeerDb.connect( config )
 
      LogDb.setup  # start logging to db (that is, save logs in logs table in db)
    end
@@ -47,7 +48,7 @@ module BeerDb
 
 
 logger = LogUtils::Logger.root
-opts   = BeerDb::Opts.new 
+opts   = BeerDb::Opts.new
 
 
 
@@ -82,7 +83,7 @@ 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 
+    datafile.download  # datafile step 1 - download all datasets/zips
 
     connect_to_db( opts )
 
@@ -139,7 +140,7 @@ command [:new,:n] do |c|
 
     ## step 2: same as command build (todo - reuse code)
     datafile = Datafile::Datafile.load_file( './Datafile' )
-    datafile.download  # datafile step 1 - download all datasets/zips 
+    datafile.download  # datafile step 1 - download all datasets/zips
 
     connect_to_db( opts )  ### todo: check let connect go first?? - for logging (logs) to db  ???
 
@@ -157,7 +158,7 @@ desc 'Create DB schema'
 command [:create] do |c|
 
   c.desc 'Extra tables (notes,drinks,marks,users)'
-  c.switch [:extras], negatable: false 
+  c.switch [:extras], negatable: false
 
   c.action do |g,o,args|
 
@@ -193,10 +194,10 @@ command [:setup,:s] do |c|
   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 )
@@ -216,7 +217,7 @@ command [:update,:up,:u] do |c|
   c.flag [:i,:include]
 
   c.desc 'Delete all beer data records'
-  c.switch [:delete], negatable: false 
+  c.switch [:delete], negatable: false
 
   c.action do |g,o,args|
 
@@ -239,12 +240,12 @@ arg_name 'NAME'   # multiple fixture names - todo/fix: use multiple option
 command [:load, :l] do |c|
 
   c.desc 'Delete all beer data records'
-  c.switch [:delete], negatable: false 
+  c.switch [:delete], negatable: false
 
   c.action do |g,o,args|
 
     connect_to_db( opts )
-    
+
     BeerDb.delete! if o[:delete].present?
 
     reader = BeerDb::Reader.new( opts.data_path )
@@ -287,9 +288,9 @@ command [:serve,:server] do |c|
     ## 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? 
+      # todo: check if connection is open - how?
       ActiveRecord::Base.connection.close
-    end    
+    end
 
     BeerDb::Service.run!
 
@@ -302,10 +303,10 @@ desc 'Show stats'
 command :stats do |c|
   c.action do |g,o,args|
 
-    connect_to_db( opts ) 
-    
+    connect_to_db( opts )
+
     BeerDb.tables
-    
+
     puts 'Done.'
   end
 end
@@ -316,10 +317,10 @@ command :props do |c|
   c.action do |g,o,args|
 
     connect_to_db( opts )
-    
+
     ### fix: use ConfDb.props or similar !!!
     ### BeerDb.props
-    
+
     puts 'Done.'
   end
 end
@@ -329,12 +330,12 @@ desc 'Show logs'
 command :logs do |c|
   c.action do |g,o,args|
 
-    connect_to_db( opts ) 
-    
+    connect_to_db( opts )
+
     LogDb::Models::Log.all.each do |log|
       puts "[#{log.level}] -- #{log.msg}"
     end
-    
+
     puts 'Done.'
   end
 end
@@ -352,11 +353,11 @@ command :test do |c|
     pp o
     puts "g (#{g.class.name}):"
     pp g
-    
+
     LogUtils::Logger.root.debug 'test debug msg'
     LogUtils::Logger.root.info 'test info msg'
     LogUtils::Logger.root.warn 'test warn msg'
-    
+
     puts 'Done.'
   end
 end
@@ -373,7 +374,7 @@ pre do |g,c,o,args|
     LogUtils::Logger.root.level = :debug
   end
 
-  logger.debug "Executing #{c.name}"   
+  logger.debug "Executing #{c.name}"
   true
 end
 

data/lib/beerdb/cli/version.rb

@@ -5,9 +5,9 @@
 
 module BeerDbCli    # todo/check - rename to BeerDbTool or BeerDbCommands or BeerDbShell ??
 
-  MAJOR = 0
-  MINOR = 10
-  PATCH = 1
+  MAJOR = 1
+  MINOR = 0
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -23,4 +23,3 @@ module BeerDbCli    # todo/check - rename to BeerDbTool or BeerDbCommands or Bee
   end
 
 end # module BeerDbCli
-

data/lib/beerdb/console.rb

@@ -15,7 +15,7 @@ Tag       = WorldDb::Models::Tag
 Tagging   = WorldDb::Models::Tagging
 Continent = WorldDb::Models::Continent
 Country   = WorldDb::Models::Country
-Region    = WorldDb::Models::Region
+State     = WorldDb::Models::State
 City      = WorldDb::Models::City
 Prop      = WorldDb::Models::Prop
 
@@ -52,10 +52,10 @@ MX = Country.find_by_key( 'mx' )
 
 WIEN = City.find_by_key( 'wien' )
 
-### some regions
+### some states
 
-NO = Region.find_by_key_and_country_id( 'no', AT.id )  # at - niederoesterreich
-OO = Region.find_by_key_and_country_id( 'oo', AT.id )  # at - oberoesterreich
+NO = State.find_by_key_and_country_id( 'no', AT.id )  # at - niederoesterreich
+OO = State.find_by_key_and_country_id( 'oo', AT.id )  # at - oberoesterreich
 
 #### some beers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beerdb-models
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: datafile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: fetcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -128,7 +128,7 @@ files:
 - lib/beerdb/cli/opts.rb
 - lib/beerdb/cli/version.rb
 - lib/beerdb/console.rb
-homepage: https://github.com/beerkit/beer.db.ruby
+homepage: https://github.com/beerkit/beer.db
 licenses:
 - Public Domain
 metadata: {}
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: beerdb - beer.db command line tool