protonbot 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc988d20d75650203519befc6557450026fe5f3
-  data.tar.gz: c770acdac3ffa5a6bde08949ec8571dd872d1cf0
+  metadata.gz: 61920b192eecbc9b7b39d4bf03bba247b78bcdbd
+  data.tar.gz: 958c3b77f8f26d0645dae278922f1da6fdefeb70
 SHA512:
-  metadata.gz: 4e47035c9ed7843536074ccb89df051fada5a71c84600bbae24f6a250add07df866b29303b68c7c48647f83207012e826220610a6fc73583ebd0000016cae7b0
-  data.tar.gz: 306f4b16d3433b74fc9381931d120761087464a33ca636a78d7f0a85066fc12c6720fe6ce26ce903bde24a0a762ae903c768726a20e047a98eb1ac7194cd94cd
+  metadata.gz: 0d9310723a7ad08d58fe08cc6d62a636c13f7f38f851e7e7f5823c2efa8543666427ade1470e09c8f58d0d073fbc4e0d2333e93fbea5bb9ed3bdb5d7f3973de3
+  data.tar.gz: b5def97b97faa11db2d4f485c79b9c760d5698f0a0913d6b555d68640832f555edb8fa6e4b2f81d81091b2562ed760f3ca518a6459b6c984120f43e23f4473a4

data/lib/protonbot/bot_plugins.rb

@@ -44,8 +44,9 @@ class ProtonBot::Bot
     @plugin_loader.call if @plugin_loader
     @plugins.each do |k, v|
       v.bot = self
-      v.log = @_log.wrap("?#{k}")
       v.launch
+      v.log = @_log.wrap("?#{v.name}")
+      v.log.info("Started plugin `#{v.name} v#{v.version}` successfully!")
     end
     self
   end

data/lib/protonbot/core_plugin/apis/help.rb

@@ -11,24 +11,32 @@ fun :help_render do |query = nil, ehash = nil|
           p.hooks.each do |hk|
             next if hook
             next unless hk
-            if hk.pattern[:type] == :command && hk.pattern[:cmd] == h[:name] && hk.extra[:needed_perms]
+            if hk.pattern[:type] == :command && hk.pattern[:cmd] == h[:name]
               hook = hk
             end
           end
         end
-        done = 
-          if hook && ehash && ehash[:perms]
-            perms       = ehash[:perms]
-            needed      = hook.extra[:needed_perms]
-            not_enough  = needed - perms
-            available   = needed - not_enough
-            available_  = available.map{|i|'%C%GREEN' + i + '%N'}
-            not_enough_ = not_enough.map{|i|'%C%RED' + i + '%N'}
-            permstatus  = (available_ + not_enough_).join(' ')
-            "%B#{group}/#{item} |%N #{h[:syntax]} %B|%N Perms: #{permstatus} %B|%N #{h[:description]}"
-          else
-            "%B#{group}/#{item} |%N #{h[:syntax]} %B|%N #{h[:description]}"
-          end
+        done = "%B#{group}/#{item} |%N #{h[:syntax]} %B|%N #{h[:description]}"
+        if hook && ehash && ehash[:perms] && hook.extra[:needed_perms]
+          perms       = ehash[:perms]
+          needed      = hook.extra[:needed_perms]
+          not_enough  = needed - perms
+          available   = needed - not_enough
+          available_  = available.map{|i|'%C%GREEN' + i + '%N'}
+          not_enough_ = not_enough.map{|i|'%C%RED' + i + '%N'}
+          permstatus  = (available_ + not_enough_).join(' ')
+          done << " %B|%N Perms: #{permstatus}"
+        end
+        if hook && ehash && hook.extra[:cooldown_seconds]
+          s = hook.extra[:cooldown_seconds].to_s
+          q =
+            if hook.extra[:cooldown_mode]
+              ''
+            else
+              ' (quiet)'
+            end
+          done << " %B|%N Cooldown: #{s}s#{q}"
+        end
       end
     end
     if done

data/lib/protonbot/core_plugin/codes/whois.rb

@@ -7,3 +7,4 @@ hook(type: :code, code: @numeric::WHOISUSER) do |dat|
   u[:host] = m[3]
   emit(dat.merge(type: :code_whoisuser, nick: u[:nick], user: u[:user], host: u[:host]))
 end
+

data/lib/protonbot/core_plugin/plugin.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 ProtonBot::Plugin.new do
   @name        = 'Core'
   @version     = ProtonBot::VERSION

data/lib/protonbot/plugin.rb

@@ -41,7 +41,6 @@ class ProtonBot::Plugin
       @description
     raise ProtonBot::PluginError, 'Plugin-description is not set!' unless
       @description
-    log.info("Started plugin `#{@name} v#{@version}` successfully!")
   end
 
   # Creates hook and returns it

data/lib/protonbot/version.rb

@@ -1,4 +1,4 @@
 module ProtonBot
   # ProtonBot's version
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protonbot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Nickolay Ilyushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler