vaccine-spotter 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4472babd675e97bdda96d6a52bccee08799429753ea166542b34069c9ae150
-  data.tar.gz: ff3875ce3d6bef34cc1941e9990159ba7dffe048de981176b07163424a1f9fc7
+  metadata.gz: 205ae00407441cac0a54d0f3bc5105ba6d59258a170370e1ba9f0188d534d908
+  data.tar.gz: a645c74b497746a9988ed478804d904456fd33f9a89019fdd3ceb191e6b179d2
 SHA512:
-  metadata.gz: 0c2783d31fc893a1a192523b2fad3d32db6d2e44525a252a44665cb68371c57bb0a73fac999c513787f41c349857fe2ee082e786fdb63bd0ac1049c77022053b
-  data.tar.gz: 33c9366a86cdef1c192c2ff11598517400ba3177109a47763a27478cb6e904aec32f749fc57662763d4ce3abe7058b47a1589f0eb2bbd6f016fa6ff3115bf252
+  metadata.gz: 47ea8cd56a85627e89029a28491b7c82f596a8ab7e979f9dd7d5caa351dcf0e061fee8c965d7058e372966186aa59cb566d1d581a7377b3ad764ae5c3c2c717b
+  data.tar.gz: 256f8e366e846df15f250591d38ce1af6a5cf2906c92f11b9624e8e311a50394fdf0a389fafc0dc1d1ac8d131c5fad3b1417cbea6d4b2eb46e0713948bd41e4e

data/bin/vaccine-spotter

@@ -1,3 +1,65 @@
 #!/usr/bin/env ruby
 
-require 'vaccine-spotter'
+require "thor"
+
+class MyCLI < Thor
+
+  desc "start", "Start vaccine-spotter — the default task when no command or options are given"
+  def start
+    begin
+      require 'vaccine-spotter'
+    rescue LoadError
+      require_relative './../lib/vaccine-spotter'
+    end
+  end
+
+  desc "check", "Run vaccine-spotter once instead of looping"
+  def check
+    $loop = false
+    begin
+      require 'vaccine-spotter'
+    rescue LoadError
+      require_relative './../lib/vaccine-spotter'
+    end
+  end
+
+  desc "config", "Open config file (~/.config/vaccine-spotter.toml) with default editor"
+  def config
+    system("open ~/.config/vaccine-spotter.toml")
+  end
+
+  desc "version", "Print version and OS information"
+  def version
+    begin
+      puts "vaccinespotter.org CLI notifier thing v#{Gem.loaded_specs["vaccine-spotter"].version}"
+    rescue
+      puts "(!) vaccine-spotter: error loading version"
+    end
+    begin
+      require 'os'
+    rescue
+      puts "(!) vaccine-spotter: couldn't load OS gem"
+    end
+    begin
+      puts OS.report
+      puts "ruby_bin: #{OS.ruby_bin}"
+    rescue
+      puts "(!) vaccine-spotter: couldn't print `OS.report`"
+    end
+  end
+
+  default_task :start
+
+end
+
+# The following is from https://stackoverflow.com/a/49044225/
+help_commands = Thor::HELP_MAPPINGS + ["help"]
+if help_commands.any? { |cmd| ARGV.include? cmd }
+  help_commands.each do |cmd|
+    if match = ARGV.delete(cmd)
+      ARGV.unshift match
+    end
+  end
+end
+
+MyCLI.start(ARGV)

data/lib/vaccine-spotter.rb

@@ -12,43 +12,66 @@ require "tty-config"
 require "tty-prompt"
 require "launchy"
 require "feep"
+require "os"
 
-pastel = Pastel.new
+# Supports https://no-color.org
+env_no_color = false if ENV['NO_COLOR']
+
+pastel = Pastel.new(enabled: env_no_color)
 config = TTY::Config.new
-prompt = TTY::Prompt.new
+prompt = TTY::Prompt.new(enable_color: env_no_color)
 
 config.filename = "vaccine-spotter"
 config.extname = ".toml"
 config.append_path "#{Dir.home}/.config"
 
-if !config.exist?
+if OS.windows?
   puts
-  puts pastel.bold "Hi, welcome to the unofficial vaccinespotter.org CLI notifier thing!"
-  puts "It looks like you don't have a configuration file yet. Would you like to create one?"
-  create_config = prompt.yes? "Create `~/.config/vaccine-spotter.toml`?"
-  if create_config
-    set_state = prompt.ask("What state would you like to monitor? (Two-letter postal code, please)", required: true) do |q|
-      q.modify :up, :remove
-    end
-    config.set(:state, value: set_state)
-    puts "Ok, time to set zip codes…"
-    if prompt.yes? "freemaptools.com has a really helpful tool for getting the zip codes around a radius. Would you like to open it?"
-      Launchy.open "https://www.freemaptools.com/find-zip-codes-inside-radius.htm"
+  print pastel.bold.red "(!) Note: Windows is unsupported"
+  puts pastel.red " (I don't have a Windows computer and I barely know how it works)."
+  puts pastel.red "Notifications don't work, I think, and sounds require installing `sounder`. Read more at the project homepage: https://github.com/jltml/vaccine-spotter-cli"
+end
+
+if !config.exist?
+  begin
+    puts
+    puts pastel.bold "Hi, welcome to the unofficial vaccinespotter.org CLI notifier thing!"
+    puts "It looks like you don't have a configuration file yet. Would you like to create one?"
+    create_config = prompt.yes? "Create `~/.config/vaccine-spotter.toml`?"
+    if !create_config
+      puts pastel.bold.red "You'll need to create a configuration file at `~/.config/vaccine-spotter.toml` to use this."
     end
-    set_zips = prompt.ask("What zip codes would you like to track? You can paste here from freemaptools.com, if you used it (comma-separated list of integers, please)", convert: :int_list, required: true)
-    config.set(:zips, value: set_zips)
-    set_vaccine_types = prompt.multi_select("Which types of vaccines would you like to include?", %w(pfizer moderna jj unknown), min: 1, show_help: :always)
-    config.set(:vaccine_types, value: set_vaccine_types)
-    set_refresh_rate = prompt.ask("How often should the script check for updates? (seconds)", convert: :int, required: true)
-    config.set(:refresh_rate, value: set_refresh_rate)
-    set_play_sound = prompt.yes?("Would you like to play a sound when availability is found?", required: true)
-    config.set(:sound, :play, value: set_play_sound)
-    if set_play_sound
-      set_repeat_sound = prompt.ask("How many times should the sound repeat?", convert: :int, required: true)
-      config.set(:sound, :repeat, value: set_repeat_sound)
+    if create_config
+      set_state = prompt.ask("What #{pastel.bold.underline "state"} would you like to monitor? (Two-letter postal code, please)", required: true) do |q|
+        q.modify :up, :remove
+        # q.validate(^(?-i:A[LKSZRAEP]|C[AOT]|D[EC]|F[LM]|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEHINOPST]|N[CDEHJMVY]|O[HKR]|P[ARW]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])) # This is supposed to validate but doesn't work # Validates state abbreviation, apparently
+      end
+      config.set(:state, value: set_state)
+      puts "Ok, time to set zip codes…"
+      if prompt.yes? "freemaptools.com has a really helpful tool for getting the zip codes around a radius. Would you like to open it?"
+        Launchy.open "https://www.freemaptools.com/find-zip-codes-inside-radius.htm"
+      end
+      set_zips = prompt.ask("What #{pastel.bold.underline "zip codes"} would you like to track? You can paste here from freemaptools.com, if you used it (comma-separated list of integers, please)", convert: :int_list, required: true)
+      config.set(:zips, value: set_zips)
+      set_vaccine_types = prompt.multi_select("Which types of vaccines would you like to include?", %w(pfizer moderna jj unknown), min: 1, show_help: :always)
+      config.set(:vaccine_types, value: set_vaccine_types)
+      set_refresh_rate = prompt.ask("How often should the script check for updates? (seconds)", convert: :int, required: true)
+      config.set(:refresh_rate, value: set_refresh_rate)
+      set_play_sound = prompt.yes?("Would you like to play a sound when availability is found?", required: true)
+      config.set(:sound, :play, value: set_play_sound)
+      if set_play_sound
+        set_repeat_sound = prompt.ask("How many times should the sound repeat?", convert: :int, required: true)
+        config.set(:sound, :repeat, value: set_repeat_sound)
+      end
+      puts "Perfect; writing to `~/.config/vaccine-spotter.toml`…"
+      config.write
     end
-    puts "Perfect; writing to `~/.config/vaccine-spotter.toml`…"
-    config.write
+
+  rescue Interrupt
+    puts
+    print pastel.red.underline "vaccine-spotter was interrupted during config setup — ~/.config/vaccine-spotter.toml was "
+    puts pastel.red.underline.bold "not created"
+    exit 1
   end
 end
 
@@ -87,7 +110,12 @@ rescue
 end
 puts pastel.dim ", by Jack MapelLentz (jltml.me)"
 puts pastel.dim "This script uses the wonderful vaccinespotter.org, by Nick Muerdter (github.com/GUI)"
-puts "Checking #{pastel.underline zips.length} zip codes in #{pastel.underline state} every #{pastel.underline refresh_rate} seconds"
+print "Checking #{pastel.underline zips.length} zip codes in #{pastel.underline state} "
+if $loop != false
+  puts "every #{pastel.underline refresh_rate} seconds"
+else
+  puts pastel.underline "once"
+end
 puts "Filtering appointments for #{pastel.underline vaccine_types.to_s.tr("[]\"", "")}"
 if play_sound
   puts "Playing a sound #{pastel.underline repeat_sound} #{pluralize(repeat_sound, "time")} when availability is found"
@@ -96,44 +124,76 @@ else
 end
 puts pastel.dim "Press control-C to quit"
 
-excluded = Array.new
+excluded = Hash.new
+
+begin
 
-loop do
+  loop do
 
-  number_excluded = excluded.length
+    initial_number_excluded = excluded.length
 
-  json = Net::HTTP.get(URI("https://www.vaccinespotter.org/api/v0/states/#{state}.json"))
-  parsed_json = JSON.parse(json)
+    json = Net::HTTP.get(URI("https://www.vaccinespotter.org/api/v0/states/#{state}.json"))
+    parsed_json = JSON.parse(json)
 
-  puts
+    puts
 
-  if (Time.now.strftime("%M").to_i%5 == 0) && (Time.now.strftime("%S").to_i < refresh_rate)
-    excluded.clear
-    puts "List of excluded/checked stores cleared"
-  end
+    # if (Time.now.strftime("%M").to_i%5 == 0) && (Time.now.strftime("%S").to_i < refresh_rate)
+    #   excluded.clear
+    #   puts "List of excluded/checked stores cleared"
+    #   number_excluded = excluded.length
+    # end
+
+    new_appointment = false
 
-  parsed_json["features"].each_index do |i|
-    current = parsed_json["features"][i]["properties"]
-    if (current["appointments_available"] == true) and (zips.include?(current["postal_code"].to_i) and (!excluded.include? current["id"].to_i) and !(vaccine_types & current["appointment_vaccine_types"].keys).empty?)
-      puts "- #{pastel.green.bold current["city"]} #{pastel.green.bold current["provider_brand_name"]}: #{current["url"]}"
-      puts " - #{current["appointment_vaccine_types"]} as of #{Time.parse(current["appointments_last_fetched"]).localtime.strftime("%H:%M:%S")}"
-      TerminalNotifier.notify("#{current["provider_brand_name"]} - #{current["city"]}", :title => "vaccine-spotter", :open => "#{current["url"]}")
-      if play_sound
+    # This is the main area thing — it loops through each zip code and finds matches
+    parsed_json["features"].each_index do |i|
+      current = parsed_json["features"][i]["properties"]
+
+      if (excluded.keys.include? current["id"]) && (current["appointments_available"] == false)
+        print "- "
+        puts pastel.red "Appointments no longer available at #{pastel.bold current["city"].split.map(&:capitalize).join(' ') + ' ' + current["provider_brand_name"]} as of #{Time.parse(current["appointments_last_fetched"]).localtime.strftime("%H:%M:%S")}"
+        excluded.delete current["id"]
+      end
+
+      # Finds matches
+      if (current["appointments_available"] == true) && (zips.include?(current["postal_code"].to_i) && (!excluded.include? current["id"].to_i) && (vaccine_types & current["appointment_vaccine_types"].keys).any?)
+
+        # Logs matches to terminal (and uniformly capitalizes location names)
+        puts "- #{pastel.green.bold current["city"].split.map(&:capitalize).join(' ')} #{pastel.green.bold current["provider_brand_name"]}: #{current["url"]}"
+        puts " - #{current["appointment_vaccine_types"].keys.to_s.tr("[]\"", "").split.map(&:capitalize).join(' ')} available as of #{Time.parse(current["appointments_last_fetched"]).localtime.strftime("%H:%M:%S")}"
+
+        # Sends a notification if on macOS (also makes location names all the same title case/capitalization)
+        if OS.mac? then TerminalNotifier.notify("#{current["provider_brand_name"]} - #{current["city"].split.map(&:capitalize).join(' ')} (#{current["appointment_vaccine_types"].keys.to_s.tr("[]\"", "").split.map(&:capitalize).join(' ')})", :title => "vaccine-spotter", :open => "#{current["url"]}") end
+
+        excluded[current["id"].to_i] = current["appointments_last_fetched"] # Add key & value of {"id" => "appointments_last_fetched"} to excluded hash
+        new_appointment = true
+      end
+    end
+
+    print pastel.dim "Checked at #{Time.now.strftime("%H:%M:%S")} on #{Time.now.strftime("%Y-%m-%d")}"
+    if initial_number_excluded != 0
+      print pastel.dim " (#{initial_number_excluded} checked #{pluralize(initial_number_excluded, "location")} excluded)"
+    end
+    puts
+
+    # Plays a sound (E blues scale) if there's a new appointment in a new thread so the whole program isn't delayed by the sound playing
+    if play_sound && new_appointment
+      Thread.new {
         repeat_sound.times do
           blues_scale
           sleep 0.5
         end
-      end
-      excluded.append current["id"].to_i
+      }
     end
-  end
 
-  print pastel.dim "Checked at #{Time.now.strftime("%H:%M:%S")} on #{Time.now.strftime("%Y-%m-%d")}"
-  if number_excluded != 0
-    print pastel.dim " (#{number_excluded} checked #{pluralize(number_excluded, "location")} excluded)"
-  end
-  puts
+    break if $loop == false
 
-  sleep refresh_rate
+    sleep refresh_rate
+
+  end
 
+rescue Interrupt
+  print " "
+  puts pastel.underline "Stopping vaccine-spotter…"
+  exit
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vaccine-spotter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jack MapelLentz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-logger
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 description: This gem will notify you when COVID-19 vaccine appointments are available
   matching certain criteria (a list of zip codes, type of vaccine, etc) using the
   very beta API from the absolutely wonderful vaccinespotter.org.