zetabot 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd3327d9406e8bace63344c59915b050f1d299c020158b37002b3ab1173ec2e
-  data.tar.gz: ee405d6b921baeff3a733b4ef4099ac9008fd813886bdd5fa5542d0b82151bf7
+  metadata.gz: 0e83b24e7bb11ff64bf361e2c02c1e0a02bdc566f749510ed466460605e3cc12
+  data.tar.gz: 4b6a88945cfda34e4802b032ee70d06bacb6a96cdd1b57951b0449b28d92442a
 SHA512:
-  metadata.gz: e273343279ae3027037db881aa019d62d44c235b13789797fa9bcb12537bbefd8505b74d11e60ea6a55c004e44ec70ed94068477ca4fa282ff01b82e29b0f283
-  data.tar.gz: cad11ac72c558ad148d0c15704f5bae925adcd76a80d5db2372a1658e4beaadd12d127afd0caa9b247adeabdf473b48062846d3e16a7ea1ff9e7c1f4953355df
+  metadata.gz: 70bf0af0cf2e4f1c54ea986bcdb29b9ea3f9e7ecabd4c2c25eb009d5e87f09a23c8a03e2aff03729d50c4653c46a72481c5153115851a0d6be8db0e82b319bc3
+  data.tar.gz: f6f666313c39d5591a0748557c2947e9d9307e028b0af4de3e4d1d3e2557c3c8371d7552afb2de2eaa4c25500906f4819473c94f1ef0853770ec4e338becce9b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (1.0.2)
+    zetabot (1.0.4)
       actionview
       chronic
       chronic_duration
@@ -41,23 +41,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
+    Ascii85 (1.0.3)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.1.4)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     afm (0.2.2)
     ansi (1.5.0)
-    ast (2.3.0)
+    ast (2.4.0)
     binding.repl (3.0.0)
     builder (3.2.3)
     cd (1.0.1)
@@ -80,7 +80,7 @@ GEM
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
+    crass (1.0.4)
     daemons (1.2.6)
     debugging (1.1.1)
       binding.repl (~> 3.0)
@@ -89,17 +89,17 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     destructor (0.1.0)
     diff-lcs (1.3)
-    discourse_api (0.20.0)
+    discourse_api (0.20.1)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       rack (>= 1.6)
     dnsbl-client (1.0.4)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     dronebl.rb (0.1.0.0)
       httparty (~> 0.13)
       nokogiri (~> 1.6)
-    erubi (1.7.0)
+    erubi (1.7.1)
     every_day_irb (2.0.0)
       cd (~> 1.0)
     fancy_irb (1.1.0)
@@ -109,8 +109,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.18)
-    geocoder (1.4.5)
+    ffi (1.9.23)
+    geocoder (1.4.7)
     gist (4.6.2)
     github_api (0.18.2)
       addressable (~> 2.4)
@@ -126,10 +126,10 @@ GEM
     hirb (0.7.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.15.6)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
     humanize-bytes (2.2.0)
-    i18n (0.9.3)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     instance (0.2.0)
     interactive_editor (0.0.11)
@@ -158,7 +158,7 @@ GEM
     iso8601 (0.9.1)
     jwt (1.5.6)
     liner (0.2.4)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mechanize (2.7.5)
@@ -179,7 +179,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    minitest (5.11.3)
     mkfifo (0.1.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -188,7 +188,7 @@ GEM
     net-http-persistent (2.9.4)
     net_http_timeout_errors (0.3.0)
     netrc (0.11.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     ntlm-http (0.1.1)
     numerizer (0.1.1)
@@ -198,29 +198,29 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oga (2.13)
+    oga (2.15)
       ast
       ruby-ll (~> 2.1)
     ori (0.1.0)
     os (1.0.0)
     paint (2.0.1)
-    parslet (1.8.1)
-    pdf-reader (2.0.0)
+    parslet (1.8.2)
+    pdf-reader (2.1.0)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
     persist (1.0.0)
-    public_suffix (3.0.1)
-    rack (2.0.3)
+    public_suffix (3.0.2)
+    rack (2.0.5)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rake (10.5.0)
-    recursive-open-struct (1.0.5)
+    recursive-open-struct (1.1.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
@@ -237,7 +237,7 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+    rspec-support (3.7.1)
     ruby-ll (2.1.2)
       ansi
       ast
@@ -255,12 +255,12 @@ GEM
     tilt (2.0.8)
     time-lord (1.0.1)
     ttfunk (1.5.1)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
-    unicode-display_width (1.3.0)
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.3.2)
     unitwise (2.2.0)
       liner (~> 0.2)
       memoizable (~> 0.4)

data/lib/Zeta/plugins/pdfinfo.rb

@@ -42,18 +42,20 @@ module Plugins
         return msg.reply("PDF → Unable to parse. file too big #{humanize_size}kb")
       end
 
-
-      # Get file and parse metadata
-      open(url, "rb") do |io|
-        reader = PDF::Reader.new(io)
-        creator = reader.info[:Creator] || 'Anon'
-        producer = reader.info[:Producer] || 'Anon'
-        creation = reader.info[:CreationDate] || 'now'
-        modification = reader.info[:ModDate] || 'now'
-        title = reader.info[:Title] || nil
-        display = title ? title : "Title: None <> Creator: #{creator} <> Producer: #{producer} <> Creation: #{creation}"
-        msg.reply "PDF (#{humanize_size}kb) → #{display}"
-      end
+      # Parse the HTML
+      Timeout::timeout(12) {
+        # Get file and parse metadata
+        open(url, "rb") do |io|
+          reader = PDF::Reader.new(io)
+          creator = reader.info[:Creator] || 'Anon'
+          producer = reader.info[:Producer] || 'Anon'
+          creation = reader.info[:CreationDate] || 'now'
+          modification = reader.info[:ModDate] || 'now'
+          title = reader.info[:Title] || nil
+          display = title ? title : "Title: None <> Creator: #{creator} <> Producer: #{producer} <> Creation: #{creation}"
+          msg.reply "PDF (#{humanize_size}kb) → #{display}"
+        end
+      }
 
 
     rescue => e

data/lib/Zeta/plugins/weather.rb

@@ -21,79 +21,101 @@ module Plugins
     match /w (.+)/, method: :weather
     match 'w', method: :weather
     match /setw (.+)/, method: :set_location
+    match /setws (.+)/, method: :set_source
     match /wx (.+)/, method: :weather
     match /weather (.+)/, method: :weather
 
     #####
     def initialize(*args)
-      @api_src = %w{wu noaa darksky owm}
-      @store = Persist.new(File.join(Dir.home, '.zeta', 'cache', 'weather.pstore'))
+      @api_src = %w{wu noaa ds owm}
+      @src_translated = {wu: 'Wunderground', noaa: 'NOAA', ds: 'DarkSky', owm: 'Open Weather Map'}
+      @store  = Persist.new(File.join(Dir.home, '.zeta', 'cache', 'weather.pstore'))
+      @source = Persist.new(File.join(Dir.home, '.zeta', 'cache', 'weather_source.pstore'))
       super
     end
 
     # ?w <location>
     def weather(msg, query=nil)
-      # Pull data source and scrub query
-      # Lookup user from pstore
+      if !@source[msg.user.to_s].nil?
+        stored_source = @source[msg.user.to_s]
+      else
+        stored_source = 'wu'
+      end
+
       if !@store[msg.user.to_s].nil? && query.nil?
-        stored_location, stored_source = @store[msg.user.to_s].split('::')
-        stored_source = @api_src.include?(stored_source) ? stored_source : 'wu'
-        data = send("#{stored_source}_src", stored_location)
-        # location = geolookup(@store[msg.user.to_s])
-        # data = wunderground_src(stored_location, false)
+        data = send("#{stored_source}_src", msg, @store[msg.user.to_s], true)
       elsif query.nil?
-        return msg.reply 'No location set. ?setw <location> :(wu|darkscy|noaa|apixu|owm)'
+        return msg.reply 'No location set. ?setw <location> and ?setws <source> for where you get the weather from'
       else
         # data = wu_src(query, true)
-        src = query[/:\w+/].gsub(/:/, '') if query[/:\w+/]
         query = query.gsub(/:\w+/, '').strip if query
-        true_src = @api_src.include?(src) ? src : 'wu'
-        data = send("#{true_src}_src", query)
+        data = send("#{stored_source}_src", msg, query)
       end
-      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?
+
+      return msg.reply "No results found for #{query} with #{@src_translated[stored_source.to_sym]} source." if data.nil?
       msg.reply(data.reply)
     end
 
     # ?setw <location>
     def set_location(msg, query)
       # Establish source
-      src = query[/:\w+/].gsub(/:/, '') if query[/:\w+/]
       query = query.gsub(/:\w+/, '').strip if query
 
       # Sanity Check
-      true_src = @api_src.include?(src) ? src : 'wu'
-      data = send("#{true_src}_src", query)
+      if !@source[msg.user.to_s].nil?
+        stored_source = @source[msg.user.to_s]
+      else
+        stored_source = 'wu'
+      end
+      data = send("#{stored_source}_src", msg,query)
 
       # Error
       return msg.reply "No results found for #{query}." if data.nil?
 
       # Store and display general location
-      serial_location = "#{query}::#{src}"
+
+      serial_location = "#{data.lat},#{data.lon}"
       @store[msg.user.to_s] = serial_location unless data.nil?
-      msg.reply "Your location is now set to #{data.ac.name}, #{data.ac.c}!"
+      msg.reply "Your location is now set to #{data.ac.formatted_address}!"
+    end
+
+    # ?setws <source>
+    def set_source(msg,src)
+      return msg.reply("You can set your weather source using ?setws <omw|ds|wu|noaa>") if src.nil?
+      true_src = @api_src.include?(src) ? src : 'wu'
+      @source[msg.user.to_s] = true_src
+      msg.reply "Your weather source is set to #{@src_translated[true_src.to_sym]}!"
     end
 
     private
     #### Weather Sources
     # Weather Underground - https://wunderground.com
-    def wu_src(location)
+    def wu_src(msg, location, stored=false)
       # 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("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
-          object_class: OpenStruct
-      )
-      return nil if ac.results.nil? ## Unable to locate
-
-      ac = ac.results[0]
-      lat = ac.geometry.location.lat
-      lon = ac.geometry.location.lng
+      if stored
+        lat, lon = @store[msg.user.to_s].split(',')
+      else
 
+        ac = JSON.parse(
+            open(URI.encode("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
+            object_class: OpenStruct
+        )
+        return nil if ac.results.nil?
+        if ac.status = "OVER_QUERY_LIMIT"
+          return msg.reply("Google API - Over query Limit")
+          return nil
+        end
+
+        ac = ac.results[0]
+        lat = ac.geometry.location.lat
+        lon = ac.geometry.location.lng
+        localname = ac.formatted_address
+      end
       # ac = ac.RESULTS[0]
       geolookup = JSON.parse(
           # open(URI.encode("https://api.wunderground.com/api/#{Config.secrets[:wunderground]}/geolookup/#{ac.l}.json")).read,
@@ -108,11 +130,14 @@ module Plugins
       )
 
       data.ac = ac
+      data.lat = lat
+      data.lon = lon
+      localname = data.current_observation.display_location.full if localname.nil?
       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.formatted_address} " \
+      data.reply = "WU ∴ #{localname} " \
                   "≈ #{current.weather} #{current.temperature_string} " \
                   "≈ Feels like #{current.feelslike_string} " \
                   "≈ Humidity: #{current.relative_humidity} " \
@@ -124,17 +149,27 @@ module Plugins
     end
 
     # Open Weather map - https://openweathermap.org/api
-    def owm_src(location)
-      ac = JSON.parse(
-          open(URI.encode("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
-          object_class: OpenStruct
-      )
-
-      return nil if ac.results.nil? ## Unable to locate
+    def owm_src(msg, location, stored=false)
+      if stored
+        lat, lon = @store[msg.user.to_s].split(',')
+      else
 
-      ac = ac.results[0]
-      lat = ac.geometry.location.lat
-      lon = ac.geometry.location.lng
+        ac = JSON.parse(
+            open(URI.encode("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
+            object_class: OpenStruct
+        )
+        return nil if ac.results.nil? ## Unable to locate
+
+        if ac.status = "OVER_QUERY_LIMIT"
+          return msg.reply("Google API - Over query Limit")
+          return nil
+        end
+
+        ac = ac.results[0]
+        lat = ac.geometry.location.lat
+        lon = ac.geometry.location.lng
+        localname = ac.formatted_address
+      end
 
       # Get Data
       data = JSON.parse(
@@ -148,7 +183,11 @@ module Plugins
       pressure = Unitwise((data.main.pressure.to_f/10)+101, 'kPa')
       wind = Unitwise(data.wind.speed, 'kilometer')
 
-      data.reply = "OWM ∴ #{ac.formatted_address} " \
+      localname = data.name if localname.nil?
+
+      data.lat = lat
+      data.lon = lon
+      data.reply = "OWM ∴ #{localname} " \
                   "≈ #{data.weather[0].description},  #{temp.convert_to('[degF]').to_i.round(2)} F (#{temp.convert_to('Cel').to_i.round(2)} C) " \
                   "≈ Humidity: #{data.main.humidity}% " \
                   "≈ Pressure: #{pressure.convert_to('[psi]').to_f.round(2)} psi (#{pressure.convert_to('kPa').to_f} kPa) " \
@@ -159,16 +198,28 @@ module Plugins
     end
 
     # DarkSky - https://darksky.net/dev
-    def darksky_src(location)
+    def darksky_src(msg,location,stored=false)
+
       ac = JSON.parse(
           open(URI.encode("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
           object_class: OpenStruct
       )
       return nil if ac.results.nil? ## Unable to locate
 
+      if ac.status = "OVER_QUERY_LIMIT"
+        return msg.reply("Google API - Over query Limit")
+        return nil
+      end
+
       ac = ac.results[0]
-      lat = ac.geometry.location.lat
-      lon = ac.geometry.location.lng
+      if stored
+        lat, lon = @store[msg.user.to_s].split(',')
+      else
+        lat = ac.geometry.location.lat
+        lon = ac.geometry.location.lng
+      end
+
+      localname = ac.formatted_address
 
       data = JSON.parse(
           open(
@@ -176,7 +227,12 @@ module Plugins
           ).read,
           object_class: OpenStruct
       )
+
       data.ac = ac
+      data.lat = lat
+      data.lon = lon
+
+
       current = data.currently
       alerts = data.alerts.count rescue 0
       c = Unitwise(current.temperature, '[degF]').convert_to('Cel').to_i
@@ -187,7 +243,7 @@ module Plugins
       tempstring = "#{current.temperature.to_i} F (#{c} C)"
       feelslike = "#{current.apparentTemperature.to_i} F (#{c_feels} C)"
 
-      data.reply = "DS ∴ #{ac.formatted_address} " \
+      data.reply = "DS ∴ #{localname} " \
                   "≈ #{current.summary} #{tempstring} " \
                   "≈ Feels like #{feelslike} " \
                   "≈ Humidity: #{current.relative_humidity} " \
@@ -200,38 +256,57 @@ module Plugins
     end
 
     # NOAA - https://graphical.weather.gov/xml/
-    def noaa_src(location)
-      ac = JSON.parse(
-          open(URI.encode("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
-          object_class: OpenStruct
-      )
-      return nil if ac.results.nil? ## Unable to locate
+    def noaa_src(msg, location, stored=false)
+      if stored
+        lat, lon = @store[msg.user.to_s].split(',')
+      else
 
-      ac = ac.results[0]
-      lat = ac.geometry.location.lat
-      lon = ac.geometry.location.lng
+        ac = JSON.parse(
+            open(URI.encode("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
+            object_class: OpenStruct
+        )
+        return nil if ac.results.nil? ## Unable to locate
+
+        if ac.status = "OVER_QUERY_LIMIT"
+          return msg.reply("Google API - Over query Limit")
+          return nil
+        end
+
+        ac = ac.results[0]
+        lat = ac.geometry.location.lat
+        lon = ac.geometry.location.lng
+        localname = ac.formatted_address
+      end
 
-      stations = JSON.parse(
+      station_list = JSON.parse(
           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
+      return nil if station_list.nil? ## Unable to find station. probably not in the USA
+
+      station = JSON.parse(
+          open(URI.encode("#{station_list['observationStations'][0]}")).read,
+          object_class: OpenStruct
+      )
 
       parsed = JSON.parse(
-          open(URI.encode("#{stations['observationStations'][0]}/observations/current")).read,
+          open(URI.encode("#{station_list['observationStations'][0]}/observations/current")).read,
           object_class: OpenStruct
       )
 
+      localname = station.properties.name if localname.nil?
 
       data = parsed.properties
       data.ac = ac
+      data.lat = lat
+      data.lon = lon
       f = data.temperature.value * 9/5
       temp = "#{f.round(2)} F (#{data.temperature.value.to_i.round(2)} C) "
       wind = "Gusts: #{data.windGust.value} avg: #{data.windSpeed.value.to_i.round(2)}"
       feelslike = "#{data.windChill.value.to_i.round(2)} C"
       pressure = Unitwise(data.barometricPressure.value.to_f+101325, 'Pa')
 
-      data.reply = "NOAA ∴ #{ac.formatted_address} " \
+      data.reply = "NOAA ∴ #{localname} " \
                   "≈ #{data.textDescription} #{temp} " \
                   "≈ Feels like #{feelslike} " \
                   "≈ Humidity: #{data.relativeHumidity.value.round(2)} " \

data/lib/Zeta/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Liothen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -657,7 +657,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Zeta is a IRC bot written in ruby using the Cinch Framework