whatson 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e518bb473a98dc200733a06c3c5e98a8051b5644
-  data.tar.gz: dc05244c9247518c2ba4da1b69f370ac7ac87018
+  metadata.gz: a6abc83c8d8d6c91192467a99bbb91286f55ffea
+  data.tar.gz: 9c08e7885c14a439fd12cf6cad76d72bbaea246b
 SHA512:
-  metadata.gz: 9319373b1f942620a00e4250c9b1e937dc38fed5a80c3981f15e0283a624ece0f6c8f7a201bd215aad5ceb10a519c6ee60bbc3a2b35dc1529e71b5905afd8d86
-  data.tar.gz: 9b816f0aebee5a5e464247bcf847d342dc59ca994c30ae6815d3da2dd10eccfc75c996c8516a6f86c0ebdb0ff0e8fe87ee4315e2b900df75521eb9df8e5b1854
+  metadata.gz: bbd1bb7600bf0cf0810d9accc7f3af945ffa09bb22e116fef08de457eb9ed91481a891129e1792f68cd103e2895b59dfb71ad6db99243c8c5380a592416db231
+  data.tar.gz: 33cebafca9da5fad2f5582074290e77a1da28ae1f9bffc619dfd3ecceb059491b6536943bcd8e58f431c286cd2853356aae50a913b4c0b43caa36cb43809019a

data/Manifest.txt

@@ -4,12 +4,17 @@ README.md
 Rakefile
 bin/beerfest
 bin/kickoff
+bin/pycon
 bin/rubyconf
+bin/whatson
 lib/whatson.rb
 lib/whatson/beerfest.rb
 lib/whatson/football.rb
+lib/whatson/pycon.rb
 lib/whatson/rubyconf.rb
+lib/whatson/tool.rb
 lib/whatson/version.rb
+lib/whatson/whatson.rb
 test/helper.rb
 test/test_beerfest.rb
 test/test_kickoff.rb

data/README.md

@@ -9,14 +9,11 @@ what's on now command line tool (using the event.db machinery)
 * forum :: [ruby-talk@ruby-lang.org](http://www.ruby-lang.org/en/community/mailing-lists)
 
 
-## Command-Line Tools - `rubyconf`, `kickoff`, `beerfest`
+## Command Line Tools - `rubyconf`, `pycon`, `kickoff`, `beerfest`
 
-The whatson gem includes command-line tools
-to list upcoming events (ruby conferences, football tournaments, beer festivals. etc.).
-
-[Upcoming Ruby Conferences](#upcoming-ruby-conferences)   •
-[Upcoming Football Tournaments](#upcoming-football-tournaments)  •
-[Upcoming Beerfests](#upcoming-beerfests)
+The whatson package includes command line tools
+to list upcoming events (ruby conferences, python conferences,
+football tournaments, beer festivals. etc.).
 
 
 ### Upcoming Ruby Conferences
@@ -74,6 +71,34 @@ Upcoming Ruby Conferences:
 
 
 
+### Upcoming Python Conferences
+
+Use
+
+```
+$ pycon
+```
+
+to list upcoming Python (un)conferences from around the world. Will print in 2020:
+
+```
+Upcoming Python Conferences:
+
+  in 62d  PyCascades, Sat+Sun Feb/8+9 (2d) @ Portland, Oregon, United States of America
+  in 72d  PyCon Namibia, Tue-Thu Feb/18-20 (3d) @ Windhoek, Namibia
+  in 90d  PyTennessee, Sat+Sun Mar/7+8 (2d) @ Nashville, Tennessee, United States of America
+  in 110d  Moscow Python Conf ++ 2020, Fri Mar/27 (1d) @ Moscow, Russia
+  in 116d  PyCon Italy, Thu-Sun Apr/2-5 (4d) @ Florence, Italy
+  in 129d  PyCon US, Wed-Thu Apr/15-23 (9d) @ Pittsburgh, Pennsylvania, United States of America
+  in 160d  PyTexas, Sat+Sun May/16+17 (2d) @ Austin, Texas, United States of America
+  in 225d  EuroPython, Mon-Sun Jul/20-26 (7d) @ Dublin, Ireland
+  in 230d  PyOhio, Sat+Sun Jul/25+26 (2d) @ Columbus, Ohio, United States of America
+  in 232d  EuroSciPy, Mon-Fri Jul/27-31 (5d) @ Bilbao, Spain
+  in 232d  GeoPython, Mon-Fri Jul/27-31 (5d) @ Bilbao, Spain
+  in 311d  PyConDE & PyData Berlin 2020, Wed-Fri Oct/14-16 (3d) @ Berlin, Germany
+```
+
+
 ### Upcoming Football Tournaments
 
 Use
@@ -122,6 +147,44 @@ Upcoming Beerfests:
 
 
 
+## Do-It-Yourself (DIY) - Use Your Own Datasets
+
+Note: You can pass in local or remote datafiles in the markdown, yaml or csv formats
+instead of using the built-in / pre-configured datafiles.
+Example:
+
+```
+$ rubyconf https://github.com/planetruby/calendar/raw/master/_data/conferences2020.yml
+# - or -
+$ rubyconf conferences2020.yml  # note: assumes a saved (local) copy in the working dir (./)
+
+$ pycon https://github.com/python-organizers/conferences/raw/master/2020.csv
+# - or
+$ pycon 2020.csv                # note: assumes a saved (local) copy in the working dir (./)
+
+$ kickoff https://github.com/footballbook/calendar/raw/master/README.md
+# - or -
+$ kickoff README.md             # note: assumes a saved (local) copy in the working dir (./)
+```
+
+
+
+## `whatson` Command Line Tool
+
+Use the `whatson` command line tool as a "generic catch-all" to print any type of event.
+Example:
+
+```
+$ whatson https://github.com/planetruby/calendar/raw/master/_data/conferences2020.yml \
+          https://github.com/python-organizers/conferences/raw/master/2020.csv
+```
+
+Note: `whatson` is pre-configured (that is, if you do not pass along any datafiles)
+to print ongoing and upcoming ruby and python conferences.
+
+
+
+
 ## Public Event Datasets
 
 - [Calendar @ Planet Ruby](https://github.com/planetruby/calendar) - a collection of awesome Ruby events (meetups, conferences, camps, etc.) from around the world

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.spec 'whatson' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['eventdb', '>= 1.0.0'],
+    ['eventdb', '>= 1.1.0'],
     ## 3rd party
     ['fetcher', '>= 0.4.5'],
     ['sqlite3']

data/bin/beerfest

@@ -14,5 +14,4 @@
 
 require 'whatson'
 
-WhatsOn::BeerFest.new.print
-
+WhatsOn::BeerFest.main

data/bin/kickoff

@@ -14,5 +14,4 @@
 
 require 'whatson'
 
-WhatsOn::Football.new.print
-
+WhatsOn::Football.main

data/bin/pycon

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+###################
+# == DEV TIPS:
+#
+# For local testing run like:
+#
+#    ruby -Ilib bin/pycon
+#
+# Set the executable bit in Linux. Example:
+#
+#    % chmod a+x bin/pycon
+#
+
+require 'whatson'
+
+WhatsOn::PyCon.main

data/bin/rubyconf

@@ -14,4 +14,4 @@
 
 require 'whatson'
 
-WhatsOn::RubyConf.new.print
+WhatsOn::RubyConf.main

data/bin/whatson

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+###################
+# == DEV TIPS:
+#
+# For local testing run like:
+#
+#    ruby -Ilib bin/whatson
+#
+# Set the executable bit in Linux. Example:
+#
+#    % chmod a+x bin/whatson
+#
+
+require 'whatson'
+
+WhatsOn::WhatsOn.main

data/lib/whatson.rb

@@ -11,14 +11,15 @@ require 'fetcher'
 require 'whatson/version'      ## let version always go first
 
 
+require 'whatson/tool'
 require 'whatson/beerfest'   ## used by beerfest bin(ary) tool
+require 'whatson/pycon'      ## used by pyocn bin(ary) tool
 require 'whatson/rubyconf'   ## used by rubyconf bin(ary) tool
 require 'whatson/football'   ## used by kickoff bin(ary) tool
-
+require 'whatson/whatson'    ## used by whatson bin(ary) tool
 
 
 
 
 # say hello
-puts WhatsOn.banner    if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG
-
+puts WhatsOn.banner    if defined?($RUBYCOCO_DEBUG) && $RUBYCOCO_DEBUG

data/lib/whatson/beerfest.rb

@@ -2,46 +2,19 @@
 
 module WhatsOn
 
-class BeerFest
+class BeerFest < Tool
 
-  def initialize
-    ## turn down logger (default :debug?)
-    LogUtils::Logger.root.level = :info
+  def self.main()   new( ARGV ).list;   end
 
-    @db = EventDb::Memory.new    ## note: use in-memory SQLite database
-    @db.read( "https://github.com/beerbook/calendar/raw/master/README.md" )
-  end
-
-  def print
-    ## get next 17 events
-
-    today = Date.today
-
-    up = EventDb::Model::Event.limit( 17 ).upcoming( today )
 
-    ## pp up.to_sql
-    ## pp up
+  def initialize( args=ARGV )
+    args = ['https://github.com/beerbook/calendar/raw/master/README.md']  if args.empty?
 
-    puts ''
-    puts ''
-    puts "Upcoming Beerfests:"
-    puts ''
-
-    on = EventDb::Model::Event.live( today )
-    on.each do |e|
-      puts "  NOW ON #{e.current_day(today)}d    #{e.title}, #{e.date_fmt} (#{e.days}d) @ #{e.place}"
-    end
-
-    puts '' if on.any?
-
-    up.each do |e|
-      puts "  in #{e.diff_days(today)}d  #{e.title}, #{e.date_fmt} (#{e.days}d) @ #{e.place}"
-    end
-    puts ''
-    puts "    More @ github.com/beerbook/calendar"
-    puts ''
+    super( args,
+           title:     'Upcoming Beerfests',
+           more_link: 'github.com/beerbook/calendar'
+         )
   end
-
 end # class BeerFest
 
 end # module WhatsOn

data/lib/whatson/football.rb

@@ -2,46 +2,20 @@
 
 module WhatsOn
 
-class Football
+class Football < Tool
 
-  def initialize
-    ## turn down logger (default :debug?)
-    LogUtils::Logger.root.level = :info
+  def self.main()   new( ARGV ).list;   end
 
-    @db = EventDb::Memory.new     ## note: use in-memory SQLite database
-    @db.read( "https://github.com/footballbook/calendar/raw/master/README.md" )
-  end
-
-  def print
-    ## get next 17 events
-
-    today = Date.today
-
-    up = EventDb::Model::Event.limit( 17 ).upcoming( today )
-    ## pp up.to_sql
-    ## pp up
 
+  def initialize( args=ARGV )
+    args = ['https://github.com/footballbook/calendar/raw/master/README.md']  if args.empty?
 
-    puts ''
-    puts ''
-    puts "Upcoming Football Tournaments:"
-    puts ''
-
-    on = EventDb::Model::Event.live( today )
-    on.each do |e|
-      puts "  NOW ON #{e.current_day(today)}d    #{e.title} #{e.start_date.year}, #{e.date_fmt} (#{e.days}d) @ #{e.place}"
-    end
-
-    puts '' if on.any?
-
-    up.each do |e|
-      puts "  in #{e.diff_days(today)}d  #{e.title} #{e.start_date.year}, #{e.date_fmt} (#{e.days}d) @ #{e.place}"
-    end
-    puts ''
-    puts "    More @ github.com/footballbook/calendar"
-    puts ''
+    super( args,
+           title:     'Upcoming Football Tournaments',
+           more_link: 'github.com/footballbook/calendar',
+           show_year: true    ## e.g. World Cup 2020 etc.
+         )
   end
-
 end # class Football
 
 end # module WhatsOn

data/lib/whatson/pycon.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+module WhatsOn
+
+class PyCon < Tool
+
+  def self.main()   new( ARGV ).list;   end
+
+
+  def initialize( args=ARGV )
+    args = ['https://github.com/python-organizers/conferences/raw/master/2020.csv']  if args.empty?
+
+    super( args,
+           title:     'Upcoming Python Conferences',
+           more_link: 'github.com/python-organizers/conferences'
+         )
+  end
+end # class PyCon
+
+end # module WhatsOn

data/lib/whatson/rubyconf.rb

@@ -2,45 +2,19 @@
 
 module WhatsOn
 
-class RubyConf
+class RubyConf < Tool
 
-  def initialize
-    ## turn down logger (default :debug?)
-    LogUtils::Logger.root.level = :info
+  def self.main()   new( ARGV ).list;   end
 
-    @db = EventDb::Memory.new    ## note: use in-memory SQLite database
-    @db.read( "https://github.com/planetruby/calendar/raw/master/_data/conferences2020.yml" )
-  end
-
-  def print
-    ## get next 17 events
-
-    today = Date.today
-
-    up = EventDb::Model::Event.limit( 17 ).upcoming( today )
-    ## pp up.to_sql
-    ## pp up
 
-    puts ''
-    puts ''
-    puts "Upcoming Ruby Conferences:"
-    puts ''
+  def initialize( args=ARGV )
+    args = ['https://github.com/planetruby/calendar/raw/master/_data/conferences2020.yml']  if args.empty?
 
-    on = EventDb::Model::Event.live( today )
-    on.each do |e|
-      puts "  NOW ON #{e.current_day(today)}d    #{e.title}, #{e.date_fmt} (#{e.days}d) @ #{e.place}"
-    end
-
-    puts '' if on.any?
-
-    up.each do |e|
-      puts "  in #{e.diff_days(today)}d  #{e.title}, #{e.date_fmt} (#{e.days}d) @ #{e.place}"
-    end
-    puts ''
-    puts "    More @ github.com/planetruby/calendar"
-    puts ''
+    super( args,
+           title:     'Upcoming Ruby Conferences',
+           more_link: 'github.com/planetruby/calendar'
+         )
   end
-
 end # class RubyConf
 
 end # module WhatsOn

data/lib/whatson/tool.rb

@@ -0,0 +1,83 @@
+# encoding: utf-8
+
+module WhatsOn
+
+
+## base (shared) tool class
+class Tool
+
+  ## todo/fix:  use header, footer instead of title, more_link - why? why not?
+
+  Config = Struct.new( :title,         ## todo/change:  find better names for config params - why? why not?
+                       :more_link,
+                       :show_year )
+
+  def initialize( args=ARGV,
+                  title:       'Upcoming Events',
+                  more_link:   nil,
+                  show_year:   false
+                )
+    ## turn down logger (default :debug?)
+    LogUtils::Logger.root.level = :info
+
+    @config =  Config.new( title,
+                           more_link,
+                           show_year )
+
+    @db = EventDb::Memory.new    ## note: use in-memory SQLite database
+    args.each do |arg|
+      puts "  reading >#{arg}<..."
+      @db.read( arg )
+    end
+  end
+
+
+  def list   ## note: use list and NOT print (otherwise built-in call to print is recursive and will crash!!!)
+    today = Date.today
+
+    puts ''
+    puts ''
+    puts "#{@config.title}:"
+    puts ''
+
+    on = EventDb::Model::Event.live( today )
+    on.each do |e|
+      print "  NOW ON #{e.current_day(today)}d    "
+      print "#{e.title}"
+      print " #{e.start_date.year}"     if @config.show_year
+      print ", "
+      print "#{e.date_fmt} (#{e.days}d) @ #{e.place}"
+      print "\n"
+    end
+
+    puts '' if on.any?
+
+    ## get next 17 events
+    up = EventDb::Model::Event.limit( 17 ).upcoming( today )
+    ## pp up.to_sql
+    ## pp up
+
+    if up.count > 0
+      up.each do |e|
+        print "  in #{e.diff_days(today)}d  "
+        print "#{e.title}"
+        print " #{e.start_date.year}"     if @config.show_year
+        print ", "
+        print "#{e.date_fmt} (#{e.days}d) @ #{e.place}"
+        print "\n"
+      end
+    else
+      puts "  -- No upcoming events found. #{EventDb::Model::Event.count} past event(s) in database. --"
+    end
+
+    puts ''
+
+    if @config.more_link
+      puts "    More @ #{@config.more_link}"
+      puts ''
+    end
+  end
+
+end # class Tool
+
+end # module WhatsOn

data/lib/whatson/version.rb

@@ -3,7 +3,7 @@
 module WhatsOn
 
   MAJOR = 1 ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/lib/whatson/whatson.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+module WhatsOn
+
+class WhatsOn < Tool
+
+  def self.main()   new( ARGV ).list;   end
+
+
+  def initialize( args=ARGV )
+    args = ['https://github.com/planetruby/calendar/raw/master/_data/conferences2020.yml',
+            'https://github.com/python-organizers/conferences/raw/master/2020.csv',
+           ]   if args.empty?
+
+    super( args,
+           title:     'Upcoming Events',
+           more_link: 'github.com/textkit/whatson#public-event-datasets'
+         )
+  end
+end # class WhatsOn
+end # module WhatsOn

data/test/test_beerfest.rb

@@ -9,11 +9,11 @@ require 'helper'
 
 class TestBeerFest < MiniTest::Test
 
-  def test_print
+  def test_list
 
-    r = WhatsOn::BeerFest.new
-    r.print
-    r.print
+    whatson = WhatsOn::BeerFest.new
+    whatson.list
+    whatson.list
 
     assert true  # assume ok if we get here
   end

data/test/test_kickoff.rb

@@ -9,11 +9,11 @@ require 'helper'
 
 class TestKickOff < MiniTest::Test
 
-  def test_print
+  def test_list
 
-    r = WhatsOn::Football.new
-    r.print
-    r.print
+    whatson = WhatsOn::Football.new
+    whatson.list
+    whatson.list
 
     assert true  # assume ok if we get here
   end

data/test/test_rubyconf.rb

@@ -9,11 +9,11 @@ require 'helper'
 
 class TestRubyConf < MiniTest::Test
 
-  def test_print
+  def test_list
 
-    r = WhatsOn::RubyConf.new
-    r.print
-    r.print
+    whatson = WhatsOn::RubyConf.new
+    whatson.list
+    whatson.list
 
     assert true  # assume ok if we get here
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whatson
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2019-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventdb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: fetcher
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,9 @@ email: ruby-talk@ruby-lang.org
 executables:
 - beerfest
 - kickoff
+- pycon
 - rubyconf
+- whatson
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -98,12 +100,17 @@ files:
 - Rakefile
 - bin/beerfest
 - bin/kickoff
+- bin/pycon
 - bin/rubyconf
+- bin/whatson
 - lib/whatson.rb
 - lib/whatson/beerfest.rb
 - lib/whatson/football.rb
+- lib/whatson/pycon.rb
 - lib/whatson/rubyconf.rb
+- lib/whatson/tool.rb
 - lib/whatson/version.rb
+- lib/whatson/whatson.rb
 - test/helper.rb
 - test/test_beerfest.rb
 - test/test_kickoff.rb