zetabot 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d148d18b6a174f7369be3eac81ec811f10f311
-  data.tar.gz: 53f8123f8e4cb48d441b35ee07e0f814a9521064
+  metadata.gz: '0569aebeebd88200bc4f962cecbf8c880aa40832'
+  data.tar.gz: 01a9f8d01d07c76905bdfbf88100798ef93fa964
 SHA512:
-  metadata.gz: d64699866d7e9c58abfb209384b8cb8a21d0400157859ed349f87cebae71410023bd427cccdaf7057025e64b679b9574a3f620e32001e16731fa6ff10f9149e2
-  data.tar.gz: 49e57b2db66a8c5004552b8e56a6436e662164003b96d02cbf1d8361d3f1c87ec4a3b9b7b324c414ff8bf9219fcabcbcc10a1ec8f9ae3c6f5a9787d1730abdbf
+  metadata.gz: d530f7decbe3f3d36da3773d461418dd636f3b28ab9c97069ca7bfac4a8a9b87a8ac67c07fac195093037517d927909cafaac08e54f922a9035ca155cc31e29e
+  data.tar.gz: 5458b43003b00cf0d1d9f3f29c4ba49efbd10a730d5b5220962bab0ecda8a2c31e1ea54bb3fc98b5882e8d9997a0ecea72907cef063c83a5a57591c1de2da086

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (0.0.11)
+    zetabot (0.0.20)
       actionview
       chronic
       chronic_duration
@@ -41,18 +41,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.0.2)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     afm (0.2.2)
     ansi (1.5.0)
     ast (2.3.0)
@@ -62,8 +63,8 @@ GEM
     chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
-    cinch (2.3.3)
-    cinch-cooldown (1.1.7)
+    cinch (2.3.4)
+    cinch-cooldown (1.2.0)
       cinch (~> 2)
       time-lord (~> 1.0, >= 1.0.1)
     cinch-quotes (0.0.4)
@@ -71,13 +72,14 @@ GEM
     cinch-toolbox (1.1.6)
       nokogiri (~> 1.6)
     clipboard (1.1.1)
-    code (0.9.1)
+    code (0.9.2)
       coderay (~> 1.1)
-      method_source (~> 0.8, >= 0.8.2)
-    coderay (1.1.1)
+      method_source (~> 0.9)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    crass (1.0.2)
     daemons (1.2.4)
     debugging (1.1.1)
       binding.repl (~> 3.0)
@@ -86,47 +88,48 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     destructor (0.1.0)
     diff-lcs (1.3)
-    discourse_api (0.14.1)
+    discourse_api (0.18.0)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       rack (>= 1.6)
-    dnsbl-client (1.0.3)
+    dnsbl-client (1.0.4)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     dronebl.rb (0.1.0.0)
       httparty (~> 0.13)
       nokogiri (~> 1.6)
-    erubis (2.7.0)
+    erubi (1.7.0)
     every_day_irb (2.0.0)
       cd (~> 1.0)
     fancy_irb (1.1.0)
       paint (>= 0.9, < 3.0)
       unicode-display_width (~> 1.1)
-    faraday (0.9.2)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.9.18)
-    geocoder (1.4.3)
-    gist (4.5.0)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
+    geocoder (1.4.4)
+    gist (4.6.1)
+    github_api (0.18.1)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
+      faraday (~> 0.8)
       hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
       oauth2 (~> 1.0)
-    haml (4.0.7)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
     hashery (2.1.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
     hirb (0.7.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.14.0)
+    httparty (0.15.6)
       multi_xml (>= 0.5.2)
     humanize-bytes (2.2.0)
-    i18n (0.8.1)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
     instance (0.2.0)
     interactive_editor (0.0.10)
       spoon (>= 0.0.1)
@@ -153,7 +156,8 @@ GEM
       wirb (~> 2.0)
     iso8601 (0.9.1)
     jwt (1.5.6)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mechanize (2.7.5)
       domain_name (~> 0.5, >= 0.5.1)
@@ -165,30 +169,32 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
     method_locator (0.0.4)
-    method_source (0.8.2)
+    method_source (0.9.0)
     methodfinder (2.1.0)
-    mime-types (2.99.3)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
     mkfifo (0.1.1)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     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)
     netrc (0.11.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     ntlm-http (0.1.1)
     numerizer (0.1.1)
-    oauth2 (1.3.1)
-      faraday (>= 0.8, < 0.12)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oga (2.9)
+    oga (2.11)
       ast
       ruby-ll (~> 2.1)
     ori (0.1.0)
@@ -201,31 +207,32 @@ GEM
       ruby-rc4
       ttfunk
     persist (1.0.0)
-    rack (2.0.1)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    public_suffix (3.0.0)
+    rack (2.0.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rake (10.5.0)
-    recursive-open-struct (1.0.2)
-    rest-client (2.0.1)
+    recursive-open-struct (1.0.5)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     ruby-ll (2.1.2)
       ansi
       ast
@@ -237,16 +244,17 @@ GEM
     spoon (0.0.6)
       ffi
     tag_formatter (0.0.3)
+    temple (0.8.0)
     thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.8)
     time-lord (1.0.1)
-    ttfunk (1.5.0)
+    ttfunk (1.5.1)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
-    unicode-display_width (1.1.3)
+    unf_ext (0.0.7.4)
+    unicode-display_width (1.3.0)
     video_info (2.7)
       iso8601 (~> 0.9.1)
       net_http_timeout_errors (~> 0.3.0)
@@ -270,4 +278,4 @@ DEPENDENCIES
   zetabot!
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/lib/Zeta/plugins/botinfo.rb

@@ -47,11 +47,11 @@ module Plugins
         session_start_date: @started_at.strftime("%A, %B %e, %Y, at %l:%M:%S %P"),
         total_channels: @bot.channels.length,
         total_users: proc {
-          users = [];
+          users = []
           @bot.channels.each {|c|
               c.users.each {|u| users << u[0].nick
             }
-          };
+          }
           users.uniq.size
         }.call,
         uptime: ChronicDuration.output(Time.now.to_i - @started_at.to_i)

data/lib/Zeta/plugins/macros.rb

@@ -11,7 +11,8 @@ module Plugins
     attr_reader :macros
 
     set plugin_name: "Macros", help: "Macro's are prefixed by a <dot> example .dnf",
-        react_on: :channel
+        react_on: :channel,
+        prefix: /^\./
 
     def initialize *args
       super
@@ -19,7 +20,7 @@ module Plugins
       @macros = load_locale 'macros'
     end
 
-    match /\.reload/, method: :execute_reloadmacros, react_on: :private
+    match /reload/, method: :execute_reloadmacros, react_on: :private
     def execute_reloadmacros m
       return unless check_user(m, :admin)
       # return unless check_channel(m)
@@ -32,7 +33,7 @@ module Plugins
       end
     end
 
-    match /\.(\w+)(?: (.+))?/, method: :execute_macro, group: :macro
+    match /(\w+)(?: (.+))?/, method: :execute_macro, group: :macro
     def execute_macro m, macro, arguments
       return unless @macros.has_key?(macro)
       parse(arguments.to_s.rstrip, @macros[macro], m.channel, m.user)

data/lib/Zeta/plugins/movie.rb

@@ -29,7 +29,7 @@ module Plugins
       movie = URI.encode(m.gsub(/:\d+/, ''))
       data = JSON.parse(
           # RestClient.get("http://www.omdbapi.com/?t=#{movie}&y=#{year}")
-          open("http://www.omdbapi.com/?t=#{movie}&y=#{year}").read
+          open("http://www.omdbapi.com/?t=#{movie}&y=#{year}&apikey=#{Config.secrets[:omdb]}").read
       )
       OpenStruct.new(
           title:       data['Title'],

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '0.0.19'
+  VERSION = '0.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.21
 platform: ruby
 authors:
 - Liothen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -642,7 +642,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Zeta is a IRC bot written in ruby using the Cinch Framework