protonbot 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f65457868bd780dfd1b7d8b15dcb48d2a5ab8a0
-  data.tar.gz: 1cd97f1b5a0d40282a8377c2e7fccdfb51c542b9
+  metadata.gz: 73dd9e0f7a84a103a38624b2ee05ddf53df67060
+  data.tar.gz: 9822ccc4e683567a88cb93b5a5b48c9f59591baa
 SHA512:
-  metadata.gz: becffdbdd3fc6f0ca4aef5e14ac6e978c849f99b28fdc877bcf71025f22d4d7e8e840814052e073a61c23a7115d03b691156723dc19c12e4524199714b4d7ff1
-  data.tar.gz: 361b120ccb0963977fae44b744b3408119b4288a1f43ca7210a1ea3bcb24579fbcce12ace69d45f828ab6558633b604351f70607228a9ca3a9ff47907bcb3182
+  metadata.gz: bc1ed5e2db7662129cb6b7b00577a18d08887fa992c1eb9fe65f1d917be291675d42fcbbdb590be93697e37c9ba9a26a7103577fb663c8e03bd486366de2a43e
+  data.tar.gz: ca800b7b34fbfa5d85a2352ebff17fe13af14911da4037ab80e23b2c1f2ce1e3fa40d49b391b7029a0934dbf20f46d3f66c6268d6542ee1879c2c5c5f69a81dd

data/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-ruby '2.4.0'
-
 # Specify your gem's dependencies in protonbot.gemspec
 gem 'protonbot-chanop', '~> 0.1.0'
 gemspec

data/lib/protonbot/bot.rb

@@ -26,14 +26,16 @@ class ProtonBot::Bot
     @conf['servers'].each do |k_, v_|
       k = k_.clone
       v = v_.clone
-      @plugthrs[k] = Thread.new do
-        @dbs[k] = Heliodor::DB.new("dbs/#{k}.db", true) unless k.nil?
-        @plugs[k] = ProtonBot::Plug.new(self, k.clone, v.clone)
-        begin
-          @plugs[k].connect! if v['enabled'] || v['enabled'].nil?
-        rescue => e
-          @plugs[k].log_err(e)
+      @dbs[k] = Heliodor::DB.new("dbs/#{k}.db", true) unless k.nil?
+      @plugs[k] = ProtonBot::Plug.new(self, k.clone, v.clone)
+      begin
+        if v['enabled'] || v['enabled'].nil?
+          Thread.new do
+            @plugs[k].connect!
+          end
         end
+      rescue => e
+        @plugs[k].log_err(e)
       end
     end
 
@@ -47,8 +49,8 @@ class ProtonBot::Bot
       exit
     end
 
-    @plugthrs.each do |_k, v|
-      v.join
+    @plugs.each do |_, p|
+      p.thrjoin
     end
 
     @_log.stop

data/lib/protonbot/bot_plugins.rb

@@ -77,6 +77,7 @@ class ProtonBot::Bot
   # @return [Bot] self
   def gem(gemname)
     if Gem.loaded_specs[gemname]
+      require gemname.gsub(/-/, '/')
       path = "#{Gem.loaded_specs[gemname].lib_dirs_glob.split(':')[0]}/" \
         "#{gemname.gsub(/-/, '/')}/plugin.rb"
       if File.exist? path

data/lib/protonbot/plug.rb

@@ -98,8 +98,6 @@ class ProtonBot::Plug
 
     introduce
 
-    @rloop.join
-    @wloop.join
     self
   end
 
@@ -120,4 +118,17 @@ class ProtonBot::Plug
   def inspect
     %(<#ProtonBot::Plug:#{object_id.to_s(16)} @name=#{name} @bot=#{bot}>)
   end
+
+  # @!api private
+  def thrjoin
+    until @rloop && @rloop.status == 'run'
+      sleep(0.1)
+    end
+    until @wloop && @wloop.status == 'run'
+      sleep(0.1)
+    end
+    @bot.plugthrs[@name].join
+    @rloop.join
+    @wloop.join
+  end
 end

data/lib/protonbot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protonbot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nickolay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler