coffeeoutside 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5744ea07913c3e57048e2e18ac38db972e2f27a58412643ad5c8c21e661092
-  data.tar.gz: ac683194966a7ad9b8c05ed2580af6c052de9b9a937d970d07f28dc1eb833a95
+  metadata.gz: 95c0295fadc19a7ab1d107e9b28560cc1228cb54dd2de613563cc00b44402700
+  data.tar.gz: 24d8a3f2dd2fb3227228b21e7f9ba12e72d56b0c126a3b8cd32e04c9526c145d
 SHA512:
-  metadata.gz: 20a68ef99969acab09abbeff6b17b869801ea5cb42e98c52376b08d8f994bd2753c545627441a54a8f96e52ec4faa67e52e991e86b73e3700a2bbe3465a2dbed
-  data.tar.gz: 4a439b69f7698b04d7120446e6f5a364f3ff120df35485f43c48ae88b4bb2332a067d59394939308837b15f2d1556f59fcee4ce218cddaa3ba6f597279b1431a
+  metadata.gz: bdd636bb7d5b8708e847b9e0782c5cc3ad6b0a09fe3133c16e2fe6135128aac974d90ff768f0cb641a7284039ec8273a4f4b68e45c3aa727c9462cca1070eeab
+  data.tar.gz: bee8a49d1eb6181c7dc1222b4478e48570e5f9ae4231dc4cf7eb94b4640d5e9e0e454767b927a795bdbe445a42c21c55c307b514048a99522ea0a4682001364c

data/.github/workflows/ruby.yaml

@@ -0,0 +1,25 @@
+name: Ruby
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+permissions:
+  contents: read
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITH: development
+    strategy:
+      matrix:
+        ruby-version: ['2.5.1', '3.0', '3.1']
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -1,8 +1,11 @@
+*.gem
 *.ics
 /.bundle
+/coverage/
 /vendor
 Gemfile.lock
 config.yaml
 override.yaml
 prior_locations.yaml
 yyc.json
+yyc.rss

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_gem:
+  dc-rubocop: ruby25.yml

data/Gemfile

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-group :development do
-  # TODO: submit Ruby 3.0 fixes upstream
-  gem 'guard'
-  gem 'guard-minitest'
-  gem 'kwalify', '= 0.7.2'
-  gem 'minitest'
-  gem 'rake'
+group :serverhack, optional: true do
+  # TODO: better handling of this
+  gem "http", "= 4.0.0"
+end
 
-  # soon
-  gem 'rubocop'
-  # gem 'guard-rubocop'
-  # gem 'rubocop-minitest'
+group :development, optional: true do
+  # TODO: submit Ruby 3.0 fixes upstream
+  gem "dc-devtools", "~> 0.5"
+  gem "dc-kwalify", "~> 1.0.0"
 end

data/Guardfile

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-directories %w[lib test] \
-  .select { |d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist") }
+directories(%w[lib test].select { |d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist") })
 
-guard :minitest do
-  watch(%r{^test/test_(.*)\.rb$}) { 'test' }
-  watch(%r{^lib/coffeeoutside/(.*)\.rb$}) { 'test' }
-  watch(%r{^lib/coffeeoutside\.rb$}) { 'test' }
-  watch(%r{^test/helper\.rb$}) { 'test' }
+guard :rake, task: "default" do
+  watch(%r{^test/test_(.*)\.rb$})
+  watch(%r{^lib/coffeeoutside/(.*)\.rb$})
+  watch(%r{^lib/coffeeoutside\.rb$})
 end

data/README.md

@@ -1,18 +1,17 @@
 # CoffeeOutsideBot
 
-The CoffeeOutsideBot is designed to pick a location in the city for the
-#yycbike crowd to meet and enjoy some hot coffee (or tea!).
+The CoffeeOutsideBot is designed to pick a location in the city
+for the #yycbike crowd to meet and enjoy some hot coffee (or tea!).
 
 ## Installation
 
 ```
 git clone https://github.com/yycbike/coffeeoutsidebot.git
-go build
+cd coffeeoutsidebot
+bundle install
+bundle exec bin/coffeeoutsidebot
 ```
 
-## Twitter integration
-You can get the necessary API keys at https://dev.twitter.com/
-
 ## OpenWeatherMap integration
 You can get an API key at https://openweathermap.org/price
 
@@ -20,11 +19,15 @@ You can get an API key at https://openweathermap.org/price
 An .ics file is auto generated. The current bot's version can be found at
 https://coffeeoutside.bike/yyc.ics
 
+## RSS integration
+You can add the bot to your favourite RSS reader with
+https://coffeeoutside.bike/yyc.rss
+
 ## Cron job
 To have the coffeeoutsidebot fire regularly, set up a cron job
 
 ```
-0 17 * * 3  pushd /path/to/coffeeoutsidebot && /path/to/coffeeoutsidebot/coffeeoutsidebot
+0 17 * * 3  pushd /path/to/coffeeoutsidebot && bundle exec ruby bin/coffeeoutsidebot
 ```
 
 ## Contributing

data/Rakefile

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
+require "dc_rake"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/test_*.rb"]
 end
 
-task default: %i[test]
+task :kwalify do
+  sh "kwalify -f locations.schema.yaml locations.yaml"
+end
+
+task default: %i[test rubocop kwalify]

data/bin/coffeeoutsidebot

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'coffeeoutside'
-include CoffeeOutside
+require "coffeeoutside"
+include CoffeeOutside # rubocop:disable Style/MixinUsage
 
 CoffeeOutside.main

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'coffeeoutside'
+require "bundler/setup"
+require "coffeeoutside"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require 'coffeeoutside'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/coffeeoutside.gemspec

@@ -1,31 +1,32 @@
 # frozen_string_literal: true
 
-require_relative 'lib/coffeeoutside/version'
+require_relative "lib/coffeeoutside/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'coffeeoutside'
+  spec.name          = "coffeeoutside"
   spec.version       = CoffeeOutside::VERSION
-  spec.authors       = ['David Crosby']
+  spec.authors       = ["David Crosby"]
 
-  spec.summary       = 'The CoffeeOutside bot'
-  spec.description   = 'The CoffeeOutside bot helps choose a coffee location based on weather and other inputs'
-  spec.homepage      = 'https://coffeeoutside.bike'
-  spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.summary       = "The CoffeeOutside bot"
+  spec.description   = "The CoffeeOutside bot helps choose a coffee location based on weather and other inputs"
+  spec.homepage      = "https://coffeeoutside.bike"
+  spec.license       = "MIT"
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/yycbike/coffeeoutside'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/yycbike/coffeeoutside"
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'icalendar', '= 2.7.1'
-  spec.add_dependency 'openweathermap', '= 0.2.3'
-  spec.add_dependency 'twitter', '= 7.0.0'
+  spec.add_dependency "icalendar", "= 2.7.1"
+  spec.add_dependency "openweathermap", "= 0.2.3"
+  spec.add_dependency "rss", "= 0.2.7"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/config.example.yaml

@@ -1,6 +1,6 @@
 production: false
 dispatchers:
-  twitter:
+  service:
     consumer_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     consumer_key: xxxxxxxxxxxxxxxxxxxxxxxxxx
     token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

data/lib/coffeeoutside/dispatchers/dispatcher.rb

@@ -23,7 +23,7 @@ module CoffeeOutside
     end
 
     def notify_production
-      raise 'notify_production must be overridden'
+      raise "notify_production must be overridden"
     end
 
     def debug_method
@@ -33,7 +33,7 @@ module CoffeeOutside
     end
 
     def notify_debug
-      raise 'notify_production must be overridden'
+      raise "notify_production must be overridden"
     end
   end
 end

data/lib/coffeeoutside/dispatchers/ical.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative 'dispatcher'
-require 'icalendar'
+require_relative "dispatcher"
+require "icalendar"
 
 module CoffeeOutside
   class IcalDispatcher < DispatcherBase
     def generate_ical_string
-      format = '%Y%m%dT%H%M%S'
-      tzid = 'America/Edmonton'
+      format = "%Y%m%dT%H%M%S"
+      tzid = "America/Edmonton"
 
       # Create a calendar with an event (standard method)
       cal = Icalendar::Calendar.new
       cal.event do |e|
-        e.dtstart = Icalendar::Values::DateTime.new @start_time.strftime(format), 'tzid' => tzid
-        e.dtend = Icalendar::Values::DateTime.new @end_time.strftime(format), 'tzid' => tzid
+        e.dtstart = Icalendar::Values::DateTime.new @start_time.strftime(format), "tzid" => tzid
+        e.dtend = Icalendar::Values::DateTime.new @end_time.strftime(format), "tzid" => tzid
         e.summary = "CoffeeOutside - #{@location.name}"
         e.location = @location.name
       end
@@ -21,7 +21,7 @@ module CoffeeOutside
     end
 
     def notify_production
-      i = File.open('yyc.ics', 'w')
+      i = File.open("yyc.ics", "w")
       i.write(generate_ical_string)
     end
 

data/lib/coffeeoutside/dispatchers/json.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'dispatcher'
-require 'json'
+require_relative "dispatcher"
+require "json"
 
 module CoffeeOutside
   class JsonDispatcher < DispatcherBase
@@ -14,7 +14,7 @@ module CoffeeOutside
     end
 
     def notify_production
-      i = File.open('yyc.json', 'w')
+      i = File.open("yyc.json", "w")
       i.write(generate_json_blob)
     end
 

data/lib/coffeeoutside/dispatchers/rss.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative "dispatcher"
+require "rss"
+
+module CoffeeOutside
+  class RssDispatcher < DispatcherBase
+    def generate_description
+      items = []
+      items.append(["Address: #{@location.address}"]) if @location.address
+      items.append(@forecast)
+      items.join("\n")
+    end
+
+    def generate_rss_string
+      RSS::Maker.make("2.0") do |maker|
+        maker.channel.language = "en"
+        maker.channel.author = "CoffeeOutsideBot"
+        maker.channel.updated = Time.now.to_s
+        maker.channel.about = "https://coffeeoutside.bike/yyc.rss"
+        maker.channel.link = "https://coffeeoutside.bike/yyc.rss"
+        maker.channel.description = "CoffeeOutside is a weekly meetup where Calgarians bike/walk/run/rollerblade to a location, drink coffee/tea/some hot or cold beverage, and shoot the breeze" # rubocop:disable Layout/LineLength
+        maker.channel.title = "CoffeeOutside"
+
+        maker.items.new_item do |item|
+          item.link = @location.url if @location.url
+          item.title = "Location for #{@start_time.strftime("%Y-%m-%d")}: #{@location.name}"
+          item.description = generate_description
+          item.updated = Time.now.to_s
+        end
+      end
+    end
+
+    def notify_production
+      i = File.open("yyc.rss", "w")
+      i.write(generate_rss_string)
+    end
+
+    def notify_debug
+      puts generate_rss_string
+    end
+  end
+end

data/lib/coffeeoutside/dispatchers/stdout.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "dispatcher"
+
+module CoffeeOutside
+  class StdoutDispatcher < DispatcherBase
+    def notify_production
+      # Since the bot is cron-based, don't write anything to stdout unless
+      # there's a problem
+      # puts "Chosen location is #{@location.name}"
+    end
+
+    def notify_debug
+      puts "Chosen location is #{@location.name}"
+    end
+  end
+end

data/lib/coffeeoutside/event_time.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module CoffeeOutside
+  module EventTime
+    def self.next_friday
+      # TODO: this is gross...
+      @next_friday ||= Date.today + [5, 4, 3, 2, 1, 7, 6][Date.today.wday]
+    end
+
+    def self.start_time
+      DateTime.new(
+        next_friday.year, next_friday.month, next_friday.day,
+        7, 30, 0,
+        "-07:00"
+      )
+    end
+
+    def self.end_time
+      DateTime.new(
+        next_friday.year, next_friday.month, next_friday.day,
+        8, 30, 0,
+        "-07:00"
+      )
+    end
+  end
+end

data/lib/coffeeoutside/locations.rb

@@ -1,26 +1,27 @@
 # frozen_string_literal: true
 
-require 'yaml'
+require "yaml"
 
 module CoffeeOutside
   class Location
-    attr_reader :name, :address, :url, :nearby_coffee
+    attr_reader :name, :location_hint, :address, :url, :nearby_coffee
 
     def initialize(params)
-      if params['name']
-        @name = params['name']
+      if params["name"]
+        @name = params["name"]
       else
-        raise 'Location class requires name key'
+        raise "Location class requires name key"
       end
-      @paused = params['paused'] || false
-      @nearby_coffee = params['nearby_coffee'] || []
-      @url = params['url'] if params['url']
-      @address = params['address'] if params['address']
+      @paused = params["paused"] || false
+      @nearby_coffee = params["nearby_coffee"] || []
+      @url = params["url"] if params["url"]
+      @address = params["address"] if params["address"]
+      @location_hint = params["location_hint"] if params["location_hint"]
 
       # Forecast related
-      @rainy_day = params['rainy_day'] || false
-      @high_limit = params['high_limit'] if params['high_limit']
-      @low_limit = params['low_limit'] if params['low_limit']
+      @rainy_day = params["rainy_day"] || false
+      @high_limit = params["high_limit"] if params["high_limit"]
+      @low_limit = params["low_limit"] if params["low_limit"]
 
       # Save params for any dispatcher-specific values
       @params = params
@@ -32,13 +33,10 @@ module CoffeeOutside
 
     def weather_appropriate?(forecast)
       # TODO: stderr reasons?
-      if forecast.rainy? && !@rainy_day
-        return false
-      elsif @low_limit && (forecast.temperature < @low_limit)
-        return false
-      elsif @high_limit && (forecast.temperature > @high_limit)
-        return false
-      end
+
+      return false if (forecast.rainy? && !@rainy_day) ||
+                      (@low_limit && (forecast.temperature < @low_limit)) ||
+                      (@high_limit && (forecast.temperature > @high_limit))
 
       true
     end
@@ -51,20 +49,20 @@ module CoffeeOutside
   class LocationFile
     attr_reader :locations
 
-    def initialize(filename = './locations.yaml')
+    def initialize(filename = "./locations.yaml")
       y = YAML.load_file(filename)
       @locations = []
       y.each do |l|
         @locations.append Location.new(l)
       end
-      @locations
+      @locations # rubocop:disable Lint/Void
     end
   end
 
   class OverrideFile
     attr_reader :location
 
-    def initialize(filename = './override.yaml')
+    def initialize(filename = "./override.yaml")
       @filename = filename
       if ::File.exist? @filename
         @override = true
@@ -87,7 +85,7 @@ module CoffeeOutside
   class LocationChooser
     attr_reader :location
 
-    def initialize(destructive = false, forecast)
+    def initialize(forecast, destructive: false)
       @location = nil
       of = OverrideFile.new
       plf = PriorLocationsFile.new
@@ -103,40 +101,47 @@ module CoffeeOutside
         # Remove paused locations
         locations.delete_if(&:paused?)
 
-        # Remove previously selected locations
-        prior_locations = plf.previous_locations
-        locations.delete_if { |l| prior_locations.include? l.name }
-
         # Delete locations that don't meet forecast criteria
         locations.keep_if { |l| l.weather_appropriate? forecast }
 
         # Raise if no locations remaining
-        raise 'No locations remaining!' if locations.empty?
+        raise "No locations remaining!" if locations.empty?
+
+        # Remove previously selected locations
+        prior_locations = plf.previous_locations.dup
+        while !prior_locations.empty? && locations.count > 1
+          pl = prior_locations.pop(locations.count - 1)
+          locations.delete_if { |l| pl.include? l.name }
+        end
 
-        # Pick random location
+        # Pick random location if more than one remaining
         @location = locations.sample
       end
 
       # Append to prior locations list
       plf.append_location @location if destructive
 
-      @location
+      @location # rubocop:disable Lint/Void
     end
   end
 
   class PriorLocationsFile
-    def initialize(filename = './prior_locations.yaml')
+    def initialize(filename = "./prior_locations.yaml")
       @filename = filename
-      @locations = YAML.load_file(filename) || []
+      @locations = if File.exist? filename
+                     YAML.load_file(filename) || []
+                   else
+                     []
+                   end
     end
 
-    def previous_locations(n = 5)
-      @locations.last n
+    def previous_locations
+      @locations
     end
 
     def append_location(location)
       @locations.append location.name
-      f = File.open(@filename, 'w')
+      f = File.open(@filename, "w")
       f.write(YAML.dump(@locations))
     end
   end

data/lib/coffeeoutside/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CoffeeOutside
-  VERSION = '0.1.0'
+  VERSION = "1.0.0"
 end

data/lib/coffeeoutside/weather.rb

@@ -1,24 +1,36 @@
 # frozen_string_literal: true
 
-require 'openweathermap'
+require "openweathermap"
 
 module CoffeeOutside
   class OWM
-    def initialize(config)
-      @city_id = config['city_id']
-      @api_key = config['api_key']
+    attr_accessor :result
 
-      get_forecast
+    def initialize(config, time = DateTime.now)
+      @city_id = config["city_id"]
+      @api_key = config["api_key"]
+      @start_time = time
     end
 
     def api_call
-      api = OpenWeatherMap::API.new(@api_key, 'en', 'metric')
-      api.forecast(@city_id)
+      api = OpenWeatherMap::API.new(@api_key, "en", "metric")
+      @result = api.forecast(@city_id)
     end
 
-    def get_forecast
-      # TODO: this looks wrong, check @time!
-      fc = api_call.forecast[2]
+    def closest_forecast
+      # Doing this as 'The Price Is Right' rules, forecast with the closest
+      # time to the start without going over wins.
+      @result.forecast.reject! { |x| x.time.to_datetime > @start_time }
+      @result.forecast.last
+    end
+
+    def parse_owm_datestring(str)
+      DateTime.strptime(str, "%Y-%m-%d %H-%M-%S")
+    end
+
+    def forecast
+      api_call
+      fc = closest_forecast
       Forecast.new(humidity: fc.humidity, temperature: fc.temperature)
     end
   end

data/lib/coffeeoutside.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
-require 'yaml'
-require 'date'
-require_relative 'coffeeoutside/version'
-require_relative 'coffeeoutside/locations'
-require_relative 'coffeeoutside/weather'
+require "yaml"
+require "date"
+require_relative "coffeeoutside/version"
+require_relative "coffeeoutside/locations"
+require_relative "coffeeoutside/weather"
+require_relative "coffeeoutside/event_time"
 
 # Dispatchers
-require_relative 'coffeeoutside/dispatchers/json'
-require_relative 'coffeeoutside/dispatchers/ical'
-require_relative 'coffeeoutside/dispatchers/twitter'
+%w[stdout json ical rss].each do |d|
+  require_relative "coffeeoutside/dispatchers/#{d}"
+end
 
 module CoffeeOutside
   class Error < StandardError; end
@@ -17,11 +18,11 @@ module CoffeeOutside
   class Config
     attr_reader :dispatchers, :openweathermap
 
-    def initialize(config_file = 'config.yaml')
+    def initialize(config_file = "config.yaml")
       config = YAML.load_file(config_file)
-      @production = config['production']
-      @dispatchers = config['dispatchers']
-      @openweathermap = config['openweathermap']
+      @production = config["production"]
+      @dispatchers = config["dispatchers"]
+      @openweathermap = config["openweathermap"]
     end
 
     def production?
@@ -29,48 +30,28 @@ module CoffeeOutside
     end
   end
 
-  def next_friday
-    # TODO: this is gross...
-    @next_friday ||= Date.today + [5, 4, 3, 2, 1, 7, 6][Date.today.wday]
-  end
-
-  def get_start_time
-    DateTime.new(
-      next_friday.year, next_friday.month, next_friday.day,
-      7, 30, 0
-    )
-  end
-
-  def get_end_time
-    DateTime.new(
-      next_friday.year, next_friday.month, next_friday.day,
-      8, 30, 0
-    )
-  end
-
   def main
     config = Config.new
     if config.production?
-      puts config.openweathermap
-      owm = OWM.new config.openweathermap
-      forecast = owm.get_forecast
+      owm = OWM.new config.openweathermap, EventTime.start_time
+      forecast = owm.forecast
     else
+      # stub a forecast in since OWM is rate-limited
       forecast = Forecast.new(humidity: 0, temperature: 10)
     end
 
-    destructive = config.production?
-    location = LocationChooser.new(destructive, forecast).location
-    puts "Chosen location is #{location}"
+    location = LocationChooser.new(forecast, destructive: config.production?).location
 
     dispatch = {
-      start_time: get_start_time,
-      end_time: get_end_time,
+      start_time: EventTime.start_time,
+      end_time: EventTime.end_time,
       forecast: forecast,
       location: location,
       production: config.production?
     }
+    StdoutDispatcher.new(dispatch).notify
     JsonDispatcher.new(dispatch).notify
+    RssDispatcher.new(dispatch).notify
     IcalDispatcher.new(dispatch).notify
-    TwitterDispatcher.new(dispatch.merge(config.dispatchers['twitter'])).notify
   end
 end

data/locations.schema.yaml

@@ -7,6 +7,9 @@ sequence:
         desc: "Name of the meetup location"
         type: str
         required: yes
+      "location_hint":
+        desc: "Human readable 'hint' where the meetup is"
+        type: str
       "url":
         desc: "URL for the site. Order of preference: City of Calgary link (if park), Cafe website (if inside), Google Maps URL"
         type: str

data/locations.yaml

@@ -1,41 +1,41 @@
 ---
-- name: "@LaBoulangerie4"
+- name: La Boulangerie
   address: 2435 4 St SW
   high_limit: 5
   rainy_day: true
   paused: true
 - high_limit: 5
-  name: "@SidewalkSimmons"
-  url: http://sidewalkcitizenbakery.com/
+  name: Sidewalk Citizen Bakery (Simmons Building)
+  url: https://sidewalkcitizenbakery.com/
   rainy_day: true
   paused: true
 - url: https://alforno.ca/
-  name: "@AlfornoYYC"
+  name: Alforno
   high_limit: 5
   rainy_day: true
-  paused: true
+  paused: true # Opens 8AM as of 2022-11-17
 - url: https://iloveyoucoffeeshop.com/
-  name: "@iloveyoucoffee_"
+  name: I Love You Coffee Shop
   high_limit: 5
   rainy_day: true
-  paused: true
+  paused: true # Opens 8AM as of 2022-11-17
 - url: http://www.bayaricacafe.ca/
-  name: "@BayaRicaCafe"
+  name: Baya Rica Cafe
   address: 204 7A Street NE
   high_limit: 5
   rainy_day: true
-  paused: true
 - url: https://www.calgaryheritageroastingco.com/
   name: Calgary Heritage Roasting Company
   address: 2020 11 St SE
   high_limit: 5
   rainy_day: true
-  paused: true
+  paused: true # Opens 8AM as of 2022-11-17
 - address: 420 2nd Street SW
   high_limit: 0
-  name: "@monogramco"
+  name: Monogram Coffee
   rainy_day: true
 - name: Barb Scott Park
+  location_hint: by 13th Ave tables
   url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/Downtown-parks/Barb-Scott-Park.aspx
   low_limit: -15
 - name: Buckmaster Park
@@ -43,32 +43,40 @@
   address: 1629 21 Ave SW
 - high_limit: 0
   address: 909 10 St SE
-  name: "@cafegravity"
+  name: Cafe Gravity
   rainy_day: true
   paused: true
 - high_limit: -15
   address: 1613 9th Street SW
   name: Caffe Beano
   rainy_day: true
-  paused: false
 - name: Ca'puccini
   paused: true
 - name: CNIB Fragrant Garden
   address: 10 11A St NE
-  low_limit: 5
-  url: TODO
-  paused: true
+  low_limit: 10
+  url: https://goo.gl/maps/2x2rRGgpdCdBG7am8
 - name: Central Memorial Park
   low_limit: -15
   url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/Downtown-parks/Central-Memorial-Park.aspx
 - name: Connaught Park
   low_limit: -15
   url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/Downtown-parks/Connaught-Park.aspx
-- name: Containr Park
+- name: Gladstone Pocket Park
   address: TODO
-  low_limit: -15
+  low_limit: -1
   url: TODO
   paused: true
+- name: Central Library Park
+  location_hint: 3rd St 9th Ave corner park
+  address: 800 3 Street SE
+  low_limit: -1
+  url: https://calgarylibrary.ca/your-library/locations/cent/
+  rainy_day: true
+- name: Containr Park
+  address: 1020 2 Ave NW
+  low_limit: -15
+  url: https://springboardperformance.com/containr
 - name: East Village Music Pavilion
   url: https://www.evexperience.com/music-pavilion
   low_limit: -10
@@ -76,7 +84,6 @@
 - name: Delta Park
   url: https://www.google.com/maps/place/Delta+Garden/@51.0521029,-114.0786464,17z/
   low_limit: -10
-  rainy_day: false
 - name: DeVille Luxury Coffee
   paused: true
 - name: Enmax Stage on Prince's Island
@@ -89,17 +96,19 @@
 - name: Harley Hotchkiss Gardens
   low_limit: -5
   address: 611 4 St SW
-- name: Harvie Passage (Weir)
+- name: Harvie Passage Lookout
+  location_hint: by the weir entrance
   low_limit: 0
-  url: https://www.google.ca/maps/place/Harvie+Passage,+Calgary,+AB/@51.0439438,-114.0137959,15z/data=!4m2!3m1!1s0x53717ac80a6f6a1b:0xe7a331ec29495195
+  url: https://goo.gl/maps/jZG2saNkY1AnhbY29
 - name: Haultain Park
   low_limit: -15
   url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/Downtown-parks/Haultain-Park.aspx
-- name: High Park (walk your bike up)
+- name: High Park
+  location_hint: walk your bike up
   low_limit: 0
   url: https://www.beltlineyyc.ca/highparkyyc
 - name: Horsy Park
-  low_limit: 10
+  low_limit: 15
   url: https://goo.gl/maps/ido1KAcqdJGtkeVN8
 - name: Humpy Hollow Park
   url: https://www.calgary.ca/CSPS/Parks/Pages/Locations/Downtown-parks/Humpy-Hollow-Park.aspx
@@ -109,17 +118,23 @@
   url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/Downtown-parks/Olympic-Plaza.aspx
   low_limit: -15
   nearby_coffee: Ca'Puccini
-- name: James Short Park
+- name: Harmony Park
   low_limit: -5
-  url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/Downtown-parks/James-Short-Park.aspx
+  address: 115 4 Ave SW
+  url: https://www.calgary.ca/parks/harmony-park.html
 - name: Lougheed House Beaulieu Gardens
-  low_limit: -5
+  low_limit: -2
   url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/Downtown-parks/Beaulieu-Gardens.aspx
-- name: McHugh Bluff
-  low_limit: 0
-  url: TODO
-  paused: true
+- name: Rosedale Dog Park
+  location_hint: benches at top of bluff
+  address: 1103 10 St NW
+  low_limit: 5
+  url: https://goo.gl/maps/Rpf5WTGQzyMkWSYY9
 - name: Munro Park
+  address: 425 18 Ave NE
+  url: https://www.calgary.ca/csps/parks/locations/ne-parks/munro-park.html
+  low_limit: 20
+- name: City Hall municipal building
   url: TODO
   paused: true
 - low_limit: 10
@@ -140,7 +155,8 @@
 - name: Reader Rock Garden
   low_limit: 10
   url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/SE-parks/Reader-Rock-Garden.aspx
-- name: Riley Park (Stage)
+- name: Riley Park
+  location_hint: Stage
   url: https://www.calgary.ca/csps/parks/locations/nw-parks/riley-park.html
   low_limit: -10
   rainy_day: true
@@ -168,18 +184,27 @@
   high_limit: 5
   address: 314 10th St NW
   rainy_day: true
-  paused: true
+- name: Royal Sunalta Park
+  location_hint: by lower swings
+  low_limit: 5
+  address: 302 Sharon Ave SW
+  url: https://goo.gl/maps/JENurv2NNhDrk6Mu6
 - name: Societe Coffee Lounge
   high_limit: -3
   address: 1223 11 Ave SW
   rainy_day: true
-  paused: true
 - name: Sought X Found Coffee
   url: https://www.soughtxfound.coffee
   high_limit: -3
   address: 916 Centre Street North
   rainy_day: true
-  paused: true
+  paused: true # Opens 8:30AM as of 2022-11-17
+- name: Muze Coffeehouse
+  url: TODO
+  high_limit: -3
+  address: TODO
+  rainy_day: true
+  paused: true # "temporarily closed" in Google as of 2022-11-17
 - low_limit: 10
   url: http://www.calgary.ca/CSPS/Parks/Pages/Locations/SW-parks/Stanley-Park.aspx
   name: Stanley Park Flower Garden

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffeeoutside
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Crosby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: icalendar
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
-  name: twitter
+  name: rss
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 0.2.7
 description: The CoffeeOutside bot helps choose a coffee location based on weather
   and other inputs
 email:
@@ -59,7 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yaml"
 - ".gitignore"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -75,7 +77,9 @@ files:
 - lib/coffeeoutside/dispatchers/dispatcher.rb
 - lib/coffeeoutside/dispatchers/ical.rb
 - lib/coffeeoutside/dispatchers/json.rb
-- lib/coffeeoutside/dispatchers/twitter.rb
+- lib/coffeeoutside/dispatchers/rss.rb
+- lib/coffeeoutside/dispatchers/stdout.rb
+- lib/coffeeoutside/event_time.rb
 - lib/coffeeoutside/locations.rb
 - lib/coffeeoutside/version.rb
 - lib/coffeeoutside/weather.rb
@@ -90,6 +94,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://coffeeoutside.bike
   source_code_uri: https://github.com/yycbike/coffeeoutside
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -105,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: The CoffeeOutside bot

data/lib/coffeeoutside/dispatchers/twitter.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: false
-
-require_relative 'dispatcher'
-require 'json'
-require 'twitter'
-
-module CoffeeOutside
-  class TwitterDispatcher < DispatcherBase
-    def notify_production
-      # Configure client
-      client = Twitter::REST::Client.new do |config|
-        config.consumer_key        = @params['consumer_key']
-        config.consumer_secret     = @params['consumer_secret']
-        config.access_token        = @params['token']
-        config.access_token_secret = @params['token_secret']
-      end
-
-      # Send location tweet
-      t = client.update location_tweet_msg
-      puts t
-
-      # Send followup tweets
-      # client.update('test', { in_reply_to_status_id: t.id }) if t.id
-    end
-
-    def notify_debug
-      puts "consumer_key        = #{@params['consumer_key']}"
-      puts "consumer_secret     = #{@params['consumer_secret']}"
-      puts "access_token        = #{@params['token']}"
-      puts "access_token_secret = #{@params['token_secret']}"
-      puts location_tweet_msg
-      puts "\n"
-    end
-
-    def location_tweet_msg
-      str = "This week's #CoffeeOutside: #{@location.name}"
-      str << " #{@location.url}" if @location.url
-      str << " (#{@location.address})" if @location.address
-      str << ', see you there! #yycbike'
-      str
-    end
-
-    def weather_tweet_msg
-      # TODO
-    end
-
-    def nearby_locations_tweet_msg
-      # TODO
-    end
-  end
-end