zetabot 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29f311e58d91926ad8d83fbe0ac23d94a09787072463f937f8a6fcc0d1249443
-  data.tar.gz: 6ec3d0bc906da344bf4398091eee2e0c9190bc4ffdf555cd5851c3700c6b6458
+  metadata.gz: 9a9cad4211323234ab96a59ba56d31982295e7592613da47f5859e89bb0d022a
+  data.tar.gz: ddf5ed10a9812098fa3af3113a81d6ba6eabbafca13b582dd0556ca04fb7ea36
 SHA512:
-  metadata.gz: 94d193dbcd70da8bb93e3a93b951c2ec6fd8245dd979c684e31b31353d89f7af6aaee6fe2f63ab3b468c467058283b564f3ff4b7f30fa21bb3089adf58b280fb
-  data.tar.gz: ec1a8cf35f69a996cdbe7dbc420ec161f9d6b9fbabb8549a343586ab339a0b946bff54b7368a4e2422f15f3ab7f1a136bea4f918ea7e0b4ce4d5930f6509340f
+  metadata.gz: 26f5d9265910bdebf81fa1951555293eac0fb993a03578e1c8abf77e1c48ba716d4c5b47bbdd1f71b1646b2db7856f7b60acc78568c1ac016361c8b306f20b24
+  data.tar.gz: 91eb85dfdba2027300c335d7a8e718aaf4b44ee33d2bb63a9843fe0822c0abe4d601f1ec52e0b76c442289d250bebd69c77962cfc5fa6796756bffec90815032

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (1.0.6)
+    zetabot (1.0.2)
       actionview
       chronic
       chronic_duration
@@ -42,13 +42,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.0)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -72,12 +72,13 @@ GEM
       cinch (~> 2.0)
     cinch-toolbox (1.1.6)
       nokogiri (~> 1.6)
-    clipboard (1.1.1)
+    clipboard (1.1.2)
     code (0.9.2)
       coderay (~> 1.1)
       method_source (~> 0.9)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
+    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
@@ -89,7 +90,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     destructor (0.1.0)
     diff-lcs (1.3)
-    discourse_api (0.20.1)
+    discourse_api (0.27.0)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       rack (>= 1.6)
@@ -109,9 +110,9 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.23)
-    geocoder (1.4.7)
-    gist (4.6.2)
+    ffi (1.9.25)
+    geocoder (1.5.0)
+    gist (5.0.0)
     github_api (0.18.2)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
@@ -122,20 +123,20 @@ GEM
       temple (>= 0.8.0)
       tilt
     hashery (2.1.2)
-    hashie (3.5.7)
+    hashie (3.6.0)
     hirb (0.7.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httparty (0.16.2)
       multi_xml (>= 0.5.2)
     humanize-bytes (2.2.0)
-    i18n (1.0.1)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     instance (0.2.0)
     interactive_editor (0.0.11)
       spoon (>= 0.0.1)
     ipaddress (0.8.3)
-    irbtools (2.2.0)
+    irbtools (2.2.1)
       binding.repl (~> 3.0)
       clipboard (~> 1.1)
       code (~> 0.9)
@@ -149,7 +150,7 @@ GEM
       method_locator (~> 0.0, >= 0.0.4)
       methodfinder (~> 2.0)
       ori (~> 0.1.0)
-      os (~> 1.0)
+      os
       paint (>= 0.9, < 3.0)
       ruby_engine (~> 1.0)
       ruby_info (~> 1.0)
@@ -161,12 +162,12 @@ GEM
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mechanize (2.7.5)
+    mechanize (2.7.6)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
       mime-types (>= 1.17.2)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 2.5, >= 2.5.2)
+      net-http-persistent (>= 2.5.2)
       nokogiri (~> 1.6)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
@@ -174,10 +175,10 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     method_locator (0.0.4)
     method_source (0.9.0)
-    methodfinder (2.1.1)
-    mime-types (3.1)
+    methodfinder (2.2.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     mkfifo (0.1.1)
@@ -185,10 +186,11 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (2.9.4)
-    net_http_timeout_errors (0.3.0)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
+    net_http_timeout_errors (0.3.3)
     netrc (0.11.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     ntlm-http (0.1.1)
     numerizer (0.1.1)
@@ -212,7 +214,7 @@ GEM
       ruby-rc4
       ttfunk
     persist (1.0.0)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rack (2.0.5)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -225,19 +227,19 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     ruby-ll (2.1.2)
       ansi
       ast
@@ -260,7 +262,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)
     unitwise (2.2.0)
       liner (~> 0.2)
       memoizable (~> 0.4)

data/bin/{console → zconsole}

@@ -4,7 +4,7 @@ require "bundler/setup"
 require "zeta"
 
 # 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.
+# with your gem easier. You can also use a different zconsole, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
 # require "pry"

data/lib/Zeta/plugins/pdfinfo.rb

@@ -42,20 +42,18 @@ module Plugins
         return msg.reply("PDF → Unable to parse. file too big #{humanize_size}kb")
       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
-      }
+
+      # 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/russian_roulette.rb

@@ -37,7 +37,7 @@ module Plugins
       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
+      # player zeta_setup
       player = m.user
       # player = m.user if player == @bot
       # be nice, don't force the game on the starter unless the user actually exists in the channel.

data/lib/Zeta/plugins/seen.rb

@@ -6,7 +6,11 @@ module Plugins
       def to_s
         # "[#{time.asctime}] #{who} was seen in #{where} last saying #{what}"
         time_ago = time_ago_in_words(Time.at(time))
-        "[ \x1F#{where.to_s.upcase}\x0F ] \x0304#{who}\x0F: \"\x0303#{what[0..300]}\x0F\" \x02#{time_ago}\x0F ago"
+        # "[ \x1F#{where.to_s.upcase}\x0F ] \x0304#{who}\x0F: \"\x0303#{what[0..300]}\x0F\" \x02#{time_ago}\x0F ago"
+        if where.to_s.upcase == 'STAFF' || where.to_s.upcase == 'SERVICES'
+          return ''
+        end
+        "Seen ∴ \x0304#{who}\x0F was last seen talking in \x1F#{where.to_s.upcase}\x0F \x02#{time_ago}\x0F ago."
       end
     end
 

data/lib/Zeta/plugins/weather.rb

@@ -21,107 +21,131 @@ 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
+    match /almanac (.+)/, method: :almanac
+    match /hurricane/, method: :hurricane
 
     #####
     def initialize(*args)
-      @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'))
+      @api_src = %w{wu noaa darksky owm}
+      @store = Persist.new(File.join(Dir.home, '.zeta', 'cache', 'weather.pstore'))
       super
     end
 
     # ?w <location>
     def weather(msg, query=nil)
-      if !@source[msg.user.to_s].nil?
-        stored_source = @source[msg.user.to_s]
-      else
-        stored_source = 'wu'
-      end
-
+      # Pull data source and scrub query
+      # Lookup user from pstore
       if !@store[msg.user.to_s].nil? && query.nil?
-        data = send("#{stored_source}_src", msg, @store[msg.user.to_s], true)
+        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)
       elsif query.nil?
-        return msg.reply 'No location set. ?setw <location> and ?setws <source> for where you get the weather from'
+        return msg.reply 'No location set. ?setw <location> :(wu|darkscy|noaa|apixu|owm)'
       else
         # data = wu_src(query, true)
+        src = query[/:\w+/].gsub(/:/, '') if query[/:\w+/]
         query = query.gsub(/:\w+/, '').strip if query
-        data = send("#{stored_source}_src", msg, query)
+        true_src = @api_src.include?(src) ? src : 'wu'
+        data = send("#{true_src}_src", query)
       end
-
-      return msg.reply "No results found for #{query} with #{@src_translated[stored_source.to_sym]} source." 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
 
     # ?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
-      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)
+      true_src = @api_src.include?(src) ? src : 'wu'
+      data = send("#{true_src}_src", query)
 
       # Error
       return msg.reply "No results found for #{query}." if data.nil?
 
       # Store and display general location
-
-      serial_location = "#{data.lat},#{data.lon}"
+      serial_location = "#{query}::#{src}"
       @store[msg.user.to_s] = serial_location unless data.nil?
-      msg.reply "Your location is now set to #{data.ac.formatted_address}!"
+      msg.reply "Your location is now set to #{data.ac.name}, #{data.ac.c}!"
     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]}!"
+    # ?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(msg, location, stored=false)
+    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?
-      if stored
-        lat, lon = @store[msg.user.to_s].split(',')
-      else
+      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://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}")).read,
-            object_class: OpenStruct
-        )
-
-        info(ac.status)
-        return nil if ac.results.nil?
-        if ac.status == "OVER_QUERY_LIMIT"
-          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]
+      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/q/#{lat},#{lon}.json")).read,
+          open(URI.encode("https://api.wunderground.com/api/#{Config.secrets[:wunderground]}/geolookup/#{ac.l}.json")).read,
           object_class: OpenStruct
       ).location.l rescue nil
 
@@ -131,19 +155,17 @@ module Plugins
           object_class: OpenStruct
       )
 
+      debug "DATA: #{data}"
       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)
+      # pressure_si = Unitwise((current.pressure_in.to_f)+14.7, '[psi]').convert_to('kPa').to_f.round(2)
 
-      data.reply = "WU ∴ #{localname} " \
+      data.reply = "WU ∴ #{ac.name}, #{ac.c} " \
                   "≈ #{current.weather} #{current.temperature_string} " \
                   "≈ Feels like #{current.feelslike_string} " \
                   "≈ Humidity: #{current.relative_humidity} " \
-                  "≈ Pressure: #{current.pressure_in} psi (#{pressure_si} kPa) " \
+                  "≈ Pressure: #{current.pressure_in} in/Hg (#{current.pressure_mb} mbar) " \
                   "≈ Wind: #{current.wind_string} ≈ Alerts: #{alerts} ∴"
       return data
     # rescue
@@ -151,28 +173,17 @@ module Plugins
     end
 
     # Open Weather map - https://openweathermap.org/api
-    def owm_src(msg, location, stored=false)
-      if stored
-        lat, lon = @store[msg.user.to_s].split(',')
-      else
+    def owm_src(location)
+      ac = JSON.parse(
+          open(URI.encode("http://maps.googleapis.com/maps/api/geocode/json?address=#{location}")).read,
+          object_class: OpenStruct
+      )
 
-        ac = JSON.parse(
-            open(URI.encode("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}")).read,
-            object_class: OpenStruct
-        )
-        return nil if ac.results.nil? ## Unable to locate
-
-        info(ac.status)
-        if ac.status == "OVER_QUERY_LIMIT"
-          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
+      return nil if ac.results.nil? ## Unable to locate
+
+      ac = ac.results[0]
+      lat = ac.geometry.location.lat
+      lon = ac.geometry.location.lng
 
       # Get Data
       data = JSON.parse(
@@ -186,14 +197,10 @@ module Plugins
       pressure = Unitwise((data.main.pressure.to_f/10)+101, 'kPa')
       wind = Unitwise(data.wind.speed, 'kilometer')
 
-      localname = data.name if localname.nil?
-
-      data.lat = lat
-      data.lon = lon
-      data.reply = "OWM ∴ #{localname} " \
+      data.reply = "OWM ∴ #{ac.formatted_address} " \
                   "≈ #{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) " \
+                  "≈ Pressure: #{pressure.convert_to('[psi]').to_f.round(2)} in/Hg (#{data.main.pressure} mbar) " \
                   "≈ Wind: #{wind.convert_to('mile').to_i.round(2)} mph (#{wind.to_i.round(2)} km/h) ∴"
 
       return data
@@ -201,29 +208,16 @@ module Plugins
     end
 
     # DarkSky - https://darksky.net/dev
-    def ds_src(msg,location,stored=false)
-
+    def darksky_src(location)
       ac = JSON.parse(
-          open(URI.encode("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}")).read,
+          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
 
-      info(ac.status)
-      if ac.status == "OVER_QUERY_LIMIT"
-        msg.reply("Google API - Over query Limit")
-        return nil
-      end
-
       ac = ac.results[0]
-      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
+      lat = ac.geometry.location.lat
+      lon = ac.geometry.location.lng
 
       data = JSON.parse(
           open(
@@ -231,12 +225,7 @@ 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
@@ -247,11 +236,11 @@ module Plugins
       tempstring = "#{current.temperature.to_i} F (#{c} C)"
       feelslike = "#{current.apparentTemperature.to_i} F (#{c_feels} C)"
 
-      data.reply = "DS ∴ #{localname} " \
+      data.reply = "DS ∴ #{ac.formatted_address} " \
                   "≈ #{current.summary} #{tempstring} " \
                   "≈ Feels like #{feelslike} " \
                   "≈ Humidity: #{current.relative_humidity} " \
-                  "≈ Pressure: #{p.convert_to('[psi]').to_f.round(2)} psi (#{p.to_f} kPa) " \
+                  "≈ Pressure: #{p.convert_to('[psi]').to_f.round(2)} in/Hg (#{current.pressure} mbar) " \
                   "≈ Wind: gusts upto #{current.windGust} mph (#{gusts} km/h) ≈ Alerts: #{alerts} ∴"
 
         return data
@@ -260,62 +249,42 @@ module Plugins
     end
 
     # NOAA - https://graphical.weather.gov/xml/
-    def noaa_src(msg, location, stored=false)
-      if stored
-        lat, lon = @store[msg.user.to_s].split(',')
-      else
+    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
 
-        ac = JSON.parse(
-            open(URI.encode("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}")).read,
-            object_class: OpenStruct
-        )
-        return nil if ac.results.nil? ## Unable to locate
-
-        info(ac.status)
-        if ac.status == "OVER_QUERY_LIMIT"
-          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]
+      lat = ac.geometry.location.lat
+      lon = ac.geometry.location.lng
 
-      station_list = JSON.parse(
+      stations = JSON.parse(
           open(URI.encode("https://api.weather.gov/points/#{lat},#{lon}/stations/")).read
       ) rescue nil
 
-      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
-      )
+      return nil if stations.nil? ## Unable to find station. probably not in the USA
 
       parsed = JSON.parse(
-          open(URI.encode("#{station_list['observationStations'][0]}/observations/current")).read,
+          open(URI.encode("#{stations['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 ∴ #{localname} " \
+      data.reply = "NOAA ∴ #{ac.formatted_address} " \
                   "≈ #{data.textDescription} #{temp} " \
                   "≈ Feels like #{feelslike} " \
                   "≈ Humidity: #{data.relativeHumidity.value.round(2)} " \
-                  "≈ Pressure: #{pressure.convert_to('[psi]').to_f.round(2)} psi (#{pressure.convert_to('kPa').to_f} kPa) " \
+                  "≈ Pressure: #{pressure.convert_to('[psi]').to_f.round(2)} in/Hg (#{pressure.convert_to('kPa').to_f} mbar) " \
                   "≈ Wind: #{wind} ≈ Alerts:  ∴"
       return data
     # rescue

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '1.0.7'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Liothen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -571,8 +571,8 @@ files:
 - README.md
 - Rakefile
 - Zeta.gemspec
-- bin/console
-- bin/setup
+- bin/zconsole
+- bin/zeta_setup
 - bin/zetabot
 - lib/Zeta.rb
 - lib/Zeta/access.rb
@@ -591,7 +591,6 @@ files:
 - lib/Zeta/cache.rb
 - lib/Zeta/cinch.rb
 - lib/Zeta/config.rb
-- lib/Zeta/gems.locked
 - lib/Zeta/gems.rb
 - lib/Zeta/locale.rb
 - lib/Zeta/locale/en/8ball.yml
@@ -628,8 +627,6 @@ 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
@@ -658,7 +655,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Zeta is a IRC bot written in ruby using the Cinch Framework

data/lib/Zeta/gems.locked

@@ -1,10 +0,0 @@
-GEM
-  specs:
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-
-BUNDLED WITH
-   1.16.0

data/lib/Zeta/plugins/weather_almanac.rb

@@ -1,61 +0,0 @@
-
-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

@@ -1,44 +0,0 @@
-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