protonbot 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61920b192eecbc9b7b39d4bf03bba247b78bcdbd
-  data.tar.gz: 958c3b77f8f26d0645dae278922f1da6fdefeb70
+  metadata.gz: e32dd98edcadebac541ea89e89c7d9945ea50929
+  data.tar.gz: d5a72e64cdea4d2aeb3d29739299b1c7d55d3357
 SHA512:
-  metadata.gz: 0d9310723a7ad08d58fe08cc6d62a636c13f7f38f851e7e7f5823c2efa8543666427ade1470e09c8f58d0d073fbc4e0d2333e93fbea5bb9ed3bdb5d7f3973de3
-  data.tar.gz: b5def97b97faa11db2d4f485c79b9c760d5698f0a0913d6b555d68640832f555edb8fa6e4b2f81d81091b2562ed760f3ca518a6459b6c984120f43e23f4473a4
+  metadata.gz: c32605501bc4afbe317b9fed90af8b6af7a33416ca88c97fef20b41ef160068b5a6130c06271eb90c06c07a5377abf3f29724e3d05ff0e9d672cf93f48107d3e
+  data.tar.gz: 873895ef9bee5c6d63a419747249043d861e2196fba9b47c789a1a005a2fe1b9ad31b7b9bd59c50cbda8ae67f6ba1586962476058467bc2b5a9e300d54e9f93c

data/lib/protonbot/bot.rb

@@ -1,6 +1,6 @@
 # Main bot class. Use it to create the bot
 class ProtonBot::Bot
-  attr_reader :log, :_log, :dbs, :plugins, :conf, :plugs, :plugthrs
+  attr_reader :log, :_log, :dbs, :plugins, :conf, :plugs, :plugthrs, :core
 
   # @yield Main bot's block. You'll use it for configuring bot.
   def initialize(&block)
@@ -15,6 +15,7 @@ class ProtonBot::Bot
     configure
     @log.info('Processed config block')
 
+    @parr = []
     @plugins = {}
     plugins_load
     @log.info('Processed plugins block')

data/lib/protonbot/bot_plugins.rb

@@ -39,14 +39,22 @@ class ProtonBot::Bot
   # each plugin
   # @return [Bot] self
   def plugins_load
-    @plugins['core'] =
-      pluginr "#{Gem.loaded_specs['protonbot'].lib_dirs_glob.split(':')[0]}/protonbot/core_plugin/plugin.rb"
+    core = pluginr "#{Gem.loaded_specs['protonbot'].lib_dirs_glob.split(':')[0]}/protonbot/core_plugin/plugin.rb"
+    core.bot  = self
+    core.core = core
+    core.launch
+    @core = core
+    @plugins[core.name] = core
+    core.log = @_log.wrap("?#{core.name}")
+    core.log.info("Started plugin `#{core.name} v#{core.version}` successfully!")
     @plugin_loader.call if @plugin_loader
-    @plugins.each do |k, v|
-      v.bot = self
-      v.launch
-      v.log = @_log.wrap("?#{v.name}")
-      v.log.info("Started plugin `#{v.name} v#{v.version}` successfully!")
+    @parr.each do |pl|
+      pl.bot  = self
+      pl.core = @plugins[core.name]
+      pl.launch
+      @plugins[pl.name] = pl
+      pl.log = @_log.wrap("?#{pl.name}")
+      pl.log.info("Started plugin `#{pl.name} v#{pl.version}` successfully!")
     end
     self
   end
@@ -69,7 +77,7 @@ class ProtonBot::Bot
     else
       raise ArgumentError, 'Unknown type of `dat` plugin! Use Array or String!'
     end
-    @plugins[pl.name] = pl
+    @parr << pl
     self
   end
 
@@ -85,7 +93,7 @@ class ProtonBot::Bot
         pl = pluginr(path)
         raise ProtonBot::PluginError, "`#{path}` did not return plugin!" unless
           pl.instance_of? ProtonBot::Plugin
-        @plugins[gemname] = pl
+        @parr << pl
       else
         raise IOError, "No such file or directory: #{path}"
       end

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

@@ -25,7 +25,7 @@ class ProtonBot::Hook
         when :user_and_target
           :"last_used_#{dat[:plug].name}_#{dat[:target]}_#{dat[:host]}"
         end
-      if dat[:bot].plugins['core'].getpermsr(dat[:plug], dat[:host]).include? 'nocooldown'
+      if dat[:bot].core.getpermsr(dat[:plug], dat[:host]).include? 'nocooldown'
         true
       elsif hook.extra[lu_sign]
         curtime = Time.now.to_i

data/lib/protonbot/core_plugin/commands/basic.rb

@@ -7,3 +7,8 @@ core.help_add('basic', 'echo', 'echo', 'Sends given message back')
 cmd(cmd: 'echo') do |dat|
   dat.reply("#{dat[:split].join(' ')}")
 end.cooldown!(5)
+
+core.help_add('basic', 'plugins', 'plugins', 'List of plugins')
+cmd(cmd: 'plugins') do |dat|
+  dat.nreply("%BAvailable plugins:%N #{bot.plugins.map{|_,p|p.name + ' v' + p.version}.join(', ')}")
+end.cooldown!(10)

data/lib/protonbot/core_plugin/plugin.rb

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

data/lib/protonbot/plugin.rb

@@ -16,11 +16,11 @@
 #   @return [LogWrapper] Log
 # @!attribute [rw] path
 #   @return [String] Path
-# @!attribute [r] core
+# @!attribute [rw] core
 #   @return [Plugin] Core plugin
 class ProtonBot::Plugin
-  attr_reader :name, :version, :description, :plugins, :hooks, :core
-  attr_accessor :bot, :log, :path
+  attr_reader :name, :version, :description, :plugins, :hooks
+  attr_accessor :bot, :log, :path, :core
 
   # @param block [Proc]
   def initialize(&block)
@@ -33,7 +33,6 @@ class ProtonBot::Plugin
   # @return [Plugin] self
   def launch
     @plugins = @bot.plugins
-    @core    = @bot.plugins['core']
     instance_exec(&@block)
     raise ProtonBot::PluginError, 'Plugin-name is not set!' unless
       @name

data/lib/protonbot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protonbot
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Nickolay Ilyushin