zetabot 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6e927c6006c02faf5117ec11d11d0c5c6896d0cf
-  data.tar.gz: 391a22bac0fdafcc528ae60394cf4fde8def9c9d
+SHA256:
+  metadata.gz: 2dd3327d9406e8bace63344c59915b050f1d299c020158b37002b3ab1173ec2e
+  data.tar.gz: ee405d6b921baeff3a733b4ef4099ac9008fd813886bdd5fa5542d0b82151bf7
 SHA512:
-  metadata.gz: 7b30608cb81f2a3d1bbf764bb87815e59de214f4ff146a0bd09721070ccf13f2bc64c072b6735f6c12039e49222c09fe7e1c96f81edc3edb2e53c4693444964e
-  data.tar.gz: 03466234cd8842f36e3f86ab48828077013cd9d8c33a4304b77e42ffbb0bbcf26959829a0c11e644750e9310d16e5ee4958fd7ab7b9eae45fc528389a42d5f44
+  metadata.gz: e273343279ae3027037db881aa019d62d44c235b13789797fa9bcb12537bbefd8505b74d11e60ea6a55c004e44ec70ed94068477ca4fa282ff01b82e29b0f283
+  data.tar.gz: cad11ac72c558ad148d0c15704f5bae925adcd76a80d5db2372a1658e4beaadd12d127afd0caa9b247adeabdf473b48062846d3e16a7ea1ff9e7c1f4953355df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (1.0.1)
+    zetabot (1.0.2)
       actionview
       chronic
       chronic_duration
@@ -81,7 +81,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.3)
-    daemons (1.2.5)
+    daemons (1.2.6)
     debugging (1.1.1)
       binding.repl (~> 3.0)
       paint (>= 0.9, < 3.0)
@@ -89,7 +89,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     destructor (0.1.0)
     diff-lcs (1.3)
-    discourse_api (0.19.0)
+    discourse_api (0.20.0)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       rack (>= 1.6)
@@ -111,7 +111,7 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     ffi (1.9.18)
     geocoder (1.4.5)
-    gist (4.6.1)
+    gist (4.6.2)
     github_api (0.18.2)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
@@ -122,14 +122,14 @@ GEM
       temple (>= 0.8.0)
       tilt
     hashery (2.1.2)
-    hashie (3.5.6)
+    hashie (3.5.7)
     hirb (0.7.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     humanize-bytes (2.2.0)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     instance (0.2.0)
     interactive_editor (0.0.11)
@@ -179,9 +179,9 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    minitest (5.11.1)
     mkfifo (0.1.1)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     net-http-digest_auth (1.4.1)
@@ -198,7 +198,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oga (2.11)
+    oga (2.13)
       ast
       ruby-ll (~> 2.1)
     ori (0.1.0)
@@ -229,7 +229,7 @@ GEM
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
+    rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -271,7 +271,7 @@ GEM
       net_http_timeout_errors (~> 0.3.0)
       oga (~> 2.7)
     webrobots (0.1.2)
-    wirb (2.1.1)
+    wirb (2.1.2)
       paint (>= 0.9, < 3.0)
     wolfram (0.2.1)
       nokogiri (>= 1.4.3)
@@ -289,4 +289,4 @@ DEPENDENCIES
   zetabot!
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/lib/Zeta/plugins/weather.rb

@@ -23,8 +23,6 @@ module Plugins
     match /setw (.+)/, method: :set_location
     match /wx (.+)/, method: :weather
     match /weather (.+)/, method: :weather
-    match /almanac (.+)/, method: :almanac
-    match /hurricane/, method: :hurricane
 
     #####
     def initialize(*args)
@@ -76,76 +74,30 @@ module Plugins
       msg.reply "Your location is now set to #{data.ac.name}, #{data.ac.c}!"
     end
 
-    # ?hurricane
-    def hurricane(msg)
-      url = URI.encode "http://api.wunderground.com/api/#{Zsec.wunderground}/currenthurricane/view.json"
-      location = JSON.parse(
-          # RestClient.get(url)
-          open(url).read
-      )
-      return msg.reply "No results found for #{query}." if location.nil?
-      reply_msg = "∴ #{location['currenthurricane'][0]['stormInfo']['stormName_Nice']} " \
-                  "(#{location['currenthurricane'][0]['stormInfo']['stormNumber']}) "\
-                  "≈ Category #{location['currenthurricane'][0]['Current']['SaffirSimpsonCategory']} " \
-                  "≈ Wind #{location['currenthurricane'][0]['Current']['WindSpeed']['Mph']} mph " \
-                  "(#{location['currenthurricane'][0]['Current']['WindSpeed']['Kph']} kph) " \
-                  "≈ Wind Gust #{location['currenthurricane'][0]['Current']['WindGust']['Mph']} mph " \
-                  "(#{location['currenthurricane'][0]['Current']['WindGust']['Kph']} kph) " \
-                  "≈ #{location['currenthurricane'][0]['Current']['Time']['pretty']} ∴"
-      msg.reply(reply_msg)
-    end
-
-    # ?almanac <location>
-    def almanac(msg, locale)
-      autocomplete = JSON.parse(open(URI.encode("http://autocomplete.wunderground.com/aq?query=#{locale}")).read)
-      url = URI.encode("http://api.wunderground.com/api/#{Config.secrets[:wunderground]}/almanac/#{autocomplete['RESULTS'][0]['l']}.json")
-      location = JSON.parse(
-          # RestClient.get(url)
-          open(url).read
-      )
-      return msg.reply "No results found for #{query}." if location.nil?
-
-      time = Time.now()
-
-      data = OpenStruct.new(
-          date: time.strftime('%B, %d %Y (%A) '),
-          airport: location['almanac']['airport_code'],
-          high_norm_f: location['almanac']['temp_high']['normal']['F'],
-          high_norm_c: location['almanac']['temp_high']['normal']['C'],
-          high_record_y: location['almanac']['temp_high']['recordyear'],
-          high_record_f: location['almanac']['temp_high']['record']['F'],
-          high_record_c: location['almanac']['temp_high']['normal']['C'],
-          low_norm_f: location['almanac']['temp_low']['normal']['F'],
-          low_norm_c: location['almanac']['temp_low']['normal']['C'],
-          low_record_y: location['almanac']['temp_low']['recordyear'],
-          low_record_f: location['almanac']['temp_low']['record']['F'],
-          low_record_c: location['almanac']['temp_low']['normal']['C'],
-      )
-
-      reply_msg = "∴ Almanac #{data.date} ≈ Airport #{data.airport} " \
-              "≈ Normal #{data.high_norm_f} F (#{data.high_norm_c} C) | #{data.low_norm_f} F (#{data.low_norm_c} C) " \
-              "≈ High #{data.high_record_f} F (#{data.high_record_c} C) [#{data.high_record_y}] " \
-              "≈ Low #{data.low_record_f} F (#{data.low_record_c} C) [#{data.low_record_y}] ∴"
-
-      msg.reply(reply_msg)
-    end
-
-
-    # -private
     private
     #### Weather Sources
     # Weather Underground - https://wunderground.com
     def wu_src(location)
       # Fuzzy location lookup
+      # ac = JSON.parse(
+      #     open(URI.encode("https://autocomplete.wunderground.com/aq?query=#{location}")).read,
+      #     object_class: OpenStruct
+      # )
+      # return nil if ac.RESULTS.empty?
       ac = JSON.parse(
-          open(URI.encode("https://autocomplete.wunderground.com/aq?query=#{location}")).read,
+          open(URI.encode("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
           object_class: OpenStruct
       )
-      return nil if ac.RESULTS.empty?
+      return nil if ac.results.nil? ## Unable to locate
+
+      ac = ac.results[0]
+      lat = ac.geometry.location.lat
+      lon = ac.geometry.location.lng
 
-      ac = ac.RESULTS[0]
+      # ac = ac.RESULTS[0]
       geolookup = JSON.parse(
-          open(URI.encode("https://api.wunderground.com/api/#{Config.secrets[:wunderground]}/geolookup/#{ac.l}.json")).read,
+          # open(URI.encode("https://api.wunderground.com/api/#{Config.secrets[:wunderground]}/geolookup/#{ac.l}.json")).read,
+          open(URI.encode("https://api.wunderground.com/api/#{Config.secrets[:wunderground]}/geolookup/q/#{lat},#{lon}.json")).read,
           object_class: OpenStruct
       ).location.l rescue nil
 
@@ -155,13 +107,12 @@ module Plugins
           object_class: OpenStruct
       )
 
-      debug "DATA: #{data}"
       data.ac = ac
       current = data.current_observation
       alerts = data.alerts.empty? ? 'none' : data.alerts.map {|l| l['type']}.join(',')
       pressure_si = Unitwise((current.pressure_in.to_f)+14.7, '[psi]').convert_to('kPa').to_f.round(2)
 
-      data.reply = "WU ∴ #{ac.name}, #{ac.c} " \
+      data.reply = "WU ∴ #{ac.formatted_address} " \
                   "≈ #{current.weather} #{current.temperature_string} " \
                   "≈ Feels like #{current.feelslike_string} " \
                   "≈ Humidity: #{current.relative_humidity} " \

data/lib/Zeta/plugins/weather_almanac.rb

@@ -0,0 +1,61 @@
+
+require 'ostruct'
+require 'persist'
+require 'open-uri'
+require 'json'
+require 'unitwise'
+
+module Plugins
+  # Forecast is a Cinch plugin for getting the weather forecast.
+  # @original_author Jonah Ruiz <jonah@pixelhipsters.com>
+  # @author Liothen <liothen@flagrun.net>
+  class WeatherHurricane
+    include Cinch::Plugin
+    include Cinch::Helpers
+    enable_acl
+
+    set(
+        plugin_name: "Hurricane Info",
+        help: "Get the Weather?.\nUsage: `?hurricane`\n",
+        )
+
+    match /almanac (.+)/, method: :almanac
+
+    def almanac(msg, locale)
+      autocomplete = JSON.parse(open(URI.encode("http://autocomplete.wunderground.com/aq?query=#{locale}")).read)
+      url = URI.encode("http://api.wunderground.com/api/#{Config.secrets[:wunderground]}/almanac/#{autocomplete['RESULTS'][0]['l']}.json")
+      location = JSON.parse(
+          # RestClient.get(url)
+          open(url).read
+      )
+      return msg.reply "No results found for #{query}." if location.nil?
+
+      time = Time.now()
+
+      data = OpenStruct.new(
+          date: time.strftime('%B, %d %Y (%A) '),
+          airport: location['almanac']['airport_code'],
+          high_norm_f: location['almanac']['temp_high']['normal']['F'],
+          high_norm_c: location['almanac']['temp_high']['normal']['C'],
+          high_record_y: location['almanac']['temp_high']['recordyear'],
+          high_record_f: location['almanac']['temp_high']['record']['F'],
+          high_record_c: location['almanac']['temp_high']['normal']['C'],
+          low_norm_f: location['almanac']['temp_low']['normal']['F'],
+          low_norm_c: location['almanac']['temp_low']['normal']['C'],
+          low_record_y: location['almanac']['temp_low']['recordyear'],
+          low_record_f: location['almanac']['temp_low']['record']['F'],
+          low_record_c: location['almanac']['temp_low']['normal']['C'],
+          )
+
+      reply_msg = "∴ Almanac #{data.date} ≈ Airport #{data.airport} " \
+              "≈ Normal #{data.high_norm_f} F (#{data.high_norm_c} C) | #{data.low_norm_f} F (#{data.low_norm_c} C) " \
+              "≈ High #{data.high_record_f} F (#{data.high_record_c} C) [#{data.high_record_y}] " \
+              "≈ Low #{data.low_record_f} F (#{data.low_record_c} C) [#{data.low_record_y}] ∴"
+
+      msg.reply(reply_msg)
+    end
+
+  end
+end
+Bot.config.plugins.plugins.push Plugins::WeatherAlmanac
+

data/lib/Zeta/plugins/weather_hurricane.rb

@@ -0,0 +1,44 @@
+require 'ostruct'
+require 'persist'
+require 'open-uri'
+require 'json'
+require 'unitwise'
+
+module Plugins
+  # Forecast is a Cinch plugin for getting the weather forecast.
+  # @original_author Jonah Ruiz <jonah@pixelhipsters.com>
+  # @author Liothen <liothen@flagrun.net>
+  class WeatherHurricane
+    include Cinch::Plugin
+    include Cinch::Helpers
+    enable_acl
+
+    set(
+        plugin_name: "Hurricane Info",
+        help: "Get the Weather?.\nUsage: `?hurricane`\n",
+        )
+
+    match /hurricane/, method: :hurricane
+
+    def hurricane(msg)
+      url = URI.encode "http://api.wunderground.com/api/#{Zsec.wunderground}/currenthurricane/view.json"
+      location = JSON.parse(
+          # RestClient.get(url)
+          open(url).read
+      )
+      return msg.reply "No results found for #{query}." if location.nil?
+      reply_msg = "∴ #{location['currenthurricane'][0]['stormInfo']['stormName_Nice']} " \
+                  "(#{location['currenthurricane'][0]['stormInfo']['stormNumber']}) "\
+                  "≈ Category #{location['currenthurricane'][0]['Current']['SaffirSimpsonCategory']} " \
+                  "≈ Wind #{location['currenthurricane'][0]['Current']['WindSpeed']['Mph']} mph " \
+                  "(#{location['currenthurricane'][0]['Current']['WindSpeed']['Kph']} kph) " \
+                  "≈ Wind Gust #{location['currenthurricane'][0]['Current']['WindGust']['Mph']} mph " \
+                  "(#{location['currenthurricane'][0]['Current']['WindGust']['Kph']} kph) " \
+                  "≈ #{location['currenthurricane'][0]['Current']['Time']['pretty']} ∴"
+      msg.reply(reply_msg)
+    end
+
+  end
+end
+
+Bot.config.plugins.plugins.push Plugins::WeatherHurricane

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Liothen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -627,6 +627,8 @@ files:
 - lib/Zeta/plugins/snooper.rb
 - lib/Zeta/plugins/urban.rb
 - lib/Zeta/plugins/weather.rb
+- lib/Zeta/plugins/weather_almanac.rb
+- lib/Zeta/plugins/weather_hurricane.rb
 - lib/Zeta/plugins/whois.rb
 - lib/Zeta/plugins/wiki.rb
 - lib/Zeta/plugins/wolfram.rb
@@ -655,7 +657,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Zeta is a IRC bot written in ruby using the Cinch Framework