zetabot 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a554bc48199494aa6031371fb243e7eec95e0a
-  data.tar.gz: 5ba2388b7dbb81343831c5023afc5c28bf463be8
+  metadata.gz: dce1409371adb87fb83f3ae823892cfb68c8de02
+  data.tar.gz: 4802a3da4ff5988fff6671ca95109dae47a0daf7
 SHA512:
-  metadata.gz: 01db01f70640a77d5193f1fe6837188472439c10221cd67d7228538bc63a072fc4e7b7941626b7537ad52ca797975afd31ff4f91b6bf87d52ed56345519e7cb8
-  data.tar.gz: 3df65259b967710e7454a5ce87f926b72e8d46a3341974ed84b35e2091b3906b56ce20dac730517e03416a612f1c1251b30a4febafb64f432cf3a395b7fbba11
+  metadata.gz: '081b9aa9985ac373d577d9f348174d610a1f10b50e9e3e6c5aeefad250770b732dd0abf3c0ee5be30e96d25d9485d9ae38a2e3b95a9c930d008b2bb5fe441fad'
+  data.tar.gz: 77dc4cd3c3bd454f2fe7e1e5d0b6cd0b6d27ece912ef20e6a9daa632f4a1ee01588c8f29efab13cb1a2c58b79a0fd3a3e6164a08ba6ec80ef6d9c73397aef4bd

data/Gemfile.lock

@@ -289,4 +289,4 @@ DEPENDENCIES
   zetabot!
 
 BUNDLED WITH
-   1.15.4
+   1.16.0

data/lib/Zeta/plugins/russian_roulette.rb

@@ -34,7 +34,7 @@ module Plugins
     match 'rr', method: :russian
 
     def russian(m)
-      # return m.reply "I am sorry comrade, but I do not have pistol on me." unless m.channel.ops.include?(@bot)
+      return m.reply "I am sorry comrade, but I do not have pistol on me." unless m.channel.ops.include?(@bot)
       return m.user.notice "Sorry comrade, but there is already game going on." if @games.include?(m.channel.name)
 
       # player setup

data/lib/Zeta/plugins/weather.rb

@@ -52,7 +52,7 @@ module Plugins
         true_src = @api_src.include?(src) ? src : 'wu'
         data = send("#{true_src}_src", query)
       end
-      # return msg.reply "No results found for #{query}." if data.nil?
+      return msg.reply "No results found for #{query} with #{true_src} source." if data.nil?
       # return msg.reply 'Problem getting data. Try again later.' if data.nil?
       msg.reply(data.reply)
     end
@@ -141,11 +141,14 @@ module Plugins
           open(URI.encode("https://autocomplete.wunderground.com/aq?query=#{location}")).read,
           object_class: OpenStruct
       )
+      return nil if ac.RESULTS.empty?
+
       ac = ac.RESULTS[0]
       geolookup = JSON.parse(
           open(URI.encode("https://api.wunderground.com/api/#{Config.secrets[:wunderground]}/geolookup/#{ac.l}.json")).read,
           object_class: OpenStruct
       ).location.l rescue nil
+
       # Get Data
       data = JSON.parse(
           open("https://api.wunderground.com/api/#{Config.secrets[:wunderground]}/alerts/conditions#{geolookup}.json").read,
@@ -156,7 +159,7 @@ module Plugins
       data.ac = ac
       current = data.current_observation
       alerts = data.alerts.empty? ? 'none' : data.alerts.map {|l| l['type']}.join(',')
-      pressure_si = current.pressure_mb.to_i / 10
+      pressure_si = Unitwise(current.pressure_mb.to_i, '[psi]').convert_to('kPa').to_i.round(2)
 
       data.reply = "WU ∴ #{ac.name}, #{ac.c} " \
                   "≈ #{current.weather} #{current.temperature_string} " \
@@ -172,13 +175,18 @@ module Plugins
     # Open Weather map - https://openweathermap.org/api
     def owm_src(location)
       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
       )
-      ac = ac.RESULTS[0]
+
+      return nil if ac.results.nil? ## Unable to locate
+
+      ac = ac.results[0]
+      lat = ac.geometry.location.lat
+      lon = ac.geometry.location.lng
       data = JSON.parse(
           open(
-              URI.encode("https://api.openweathermap.org/data/2.5/weather?lat=#{ac.lat}&lon=#{ac.lon}&APPID=#{Config.secrets[:owm]}")
+              URI.encode("https://api.openweathermap.org/data/2.5/weather?lat=#{lat}&lon=#{lon}&APPID=#{Config.secrets[:owm]}")
           ).read,
           object_class: OpenStruct
       )
@@ -200,13 +208,18 @@ module Plugins
     # DarkSky - https://darksky.net/dev
     def darksky_src(location)
       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
       )
-      ac = ac.RESULTS[0]
+      return nil if ac.results.nil? ## Unable to locate
+
+      ac = ac.results[0]
+      lat = ac.geometry.location.lat
+      lon = ac.geometry.location.lng
+
       data = JSON.parse(
                      open(
-                         URI.encode("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{ac.lat},#{ac.lon}")
+                         URI.encode("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}")
                      ).read,
                      object_class: OpenStruct
       )
@@ -236,17 +249,27 @@ module Plugins
     # NOAA - https://graphical.weather.gov/xml/
     def noaa_src(location)
       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
       )
-      ac = ac.RESULTS[0]
+      return nil if ac.results.nil? ## Unable to locate
+
+      ac = ac.results[0]
+      lat = ac.geometry.location.lat
+      lon = ac.geometry.location.lng
+
       stations = JSON.parse(
-          open(URI.encode("https://api.weather.gov/points/#{ac.lat},#{ac.lon}/stations/")).read)
+          open(URI.encode("https://api.weather.gov/points/#{lat},#{lon}/stations/")).read
+      ) rescue nil
+
+      return nil if stations.nil? ## Unable to find station. probably not in the USA
+
       parsed = JSON.parse(
           open(URI.encode("#{stations['observationStations'][0]}/observations/current")).read,
           object_class: OpenStruct
       )
 
+
       data = parsed.properties
       data.ac = ac
       f = data.temperature.value * 9/5

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Liothen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler