tinyirc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33ddbb6724715d429fc59c2e38237b9d80ac97011f6ccca7765c3e239d5a82f9
-  data.tar.gz: 5d10ffb973b84507762b81d7a43d81da7cc1534eff224974741a76dcb6cb5f5f
+  metadata.gz: 55c4c917c7b9a797d5aa6b3e16b16c3e6bb1edcf5fa75a454f4108d0cd16fb7a
+  data.tar.gz: 95f9bb3151eafab505be84b61f17b8b1e8f453c66eb2ceac1a81dfaefbe466e4
 SHA512:
-  metadata.gz: 5da2e9eec33b99522ae3ca5d66bed04ab942137ca75665d4c89219e66b7b250fbfde2e2e4eb0ce6cd21ff8545f632d6f3df2ea9e57dbdd3027e9c382d09fe010
-  data.tar.gz: 93107453e8c34a6fb05411b23b8b7619aeca9ba866ff65d1d0360e61541ede1db88e434b7559a3323814a3babefdbeb7bff3f9d2fd2dae5f48b8e5fad8642c56
+  metadata.gz: deb768c754471dfb04f0f17702f406a76c3ace59cd8e55ddc4030652a87154457b727418802b07347247611d0c8a26328e802e2267171a79d59c3a9eaaffa300
+  data.tar.gz: d095eb0fb43e58ec5d110288cbacfd930e008f72ed25a5f9281d04df3d84b47f0bcdbff5b6ca0280640f07fb291160d7d4fab7dcd3dddeb4c4222c1705f8bc9f

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    tinyirc (0.1.0)
+    tinyirc (0.1.2)
       particlecmd (~> 0.1)
       particlelog (~> 0.1)
       sinatra (~> 2.0)
       sqlite3 (~> 1.3)
-      thin (~> 1.2)
+      thin (~> 1.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
     daemons (1.2.6)
-    eventmachine (1.2.5)
-    mustermann (1.0.2)
-    particlecmd (0.1.4)
+    eventmachine (1.2.7)
+    mustermann (1.0.3)
+    particlecmd (0.1.5)
     particlelog (0.1.1)
-    rack (2.0.4)
-    rack-protection (2.0.1)
+    rack (2.0.5)
+    rack-protection (2.0.3)
       rack
-    rake (10.5.0)
-    sinatra (2.0.1)
+    rake (12.3.1)
+    sinatra (2.0.3)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.1)
+      rack-protection (= 2.0.3)
       tilt (~> 2.0)
     sqlite3 (1.3.13)
     thin (1.7.2)
@@ -37,8 +37,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
-  rake (~> 10.0)
+  rake (~> 12.3)
   tinyirc!
 
 BUNDLED WITH
-   1.16.1
+   1.16.3

data/lib/tinyirc/bot.rb

@@ -293,15 +293,15 @@ class TinyIRC::Bot
     def _read_line(socket)
       res = IO.select([socket.sock], nil, nil, 0.001)
       return nil unless res
-      socket.mtx.synchronize do
-        begin
-          return socket.sock.readline("\r\n", chomp: true).force_encoding("UTF-8")
-        rescue => e
-          socket.log.error "#{e.class.name} - #{e.message}"
+      begin
+        return socket.sock.readline("\r\n", chomp: true).force_encoding("UTF-8")
+      rescue => e
+        socket.log.error "#{e.class.name} - #{e.message}"
+        socket.mtx.synchronize do
           socket.running = false
-          handle_event(type: :disconnect, socket: socket)
-          return nil
         end
+        handle_event(type: :disconnect, socket: socket)
+        return nil
       end
     end
 
@@ -329,15 +329,15 @@ class TinyIRC::Bot
       end
       
       return unless msg
-      socket.mtx.synchronize do
-        begin
-          socket.direct_write msg.force_encoding("UTF-8")
-        rescue => e
-          socket.log.error "#{e.class.name} - #{e.message}"
+      begin
+        socket.direct_write msg.force_encoding("UTF-8")
+      rescue => e
+        socket.log.error "#{e.class.name} - #{e.message}"
+        socket.mtx.synchronize do
           socket.running = false
-          handle_event(type: :disconnect, socket: socket)
-          return nil
         end
+        handle_event(type: :disconnect, socket: socket)
+        return nil
       end
 
       socket.last_write = current

data/lib/tinyirc/plugins/admin-utils.rb

@@ -122,7 +122,7 @@ cmd('kick').branch('kick', 'who --ban --reason=REASON') do |e, c|
     to_ban = get_target(e, c, false)
     s.mode(e[:reply_to], "+b #{to_ban}")
   end
-  s.kick(e[:reply_to], c.positionals['who'])
+  s.kick(e[:reply_to], c.positionals['who'], (c.options['reason'] or 'Bye!'))
 end.tap do |b|
   b.description = 'Kicks the given user from the current channel'
   b.definition.tap do |d|
@@ -142,7 +142,7 @@ cmd('remove').branch('remove', 'who --ban --reason=REASON') do |e, c|
     to_ban = get_target(e, c, false)
     s.mode(e[:reply_to], "+b #{to_ban}")
   end
-  s.remove(e[:reply_to], c.positionals['who'])
+  s.remove(e[:reply_to], c.positionals['who'], (c.options['reason'] or 'Bye!'))
 end.tap do |b|
   b.description = 'Removes the given user from the current channel'
   b.definition.tap do |d|

data/lib/tinyirc/plugins/core.rb

@@ -218,6 +218,10 @@ group('admin').tap do |g|
   g.perm @name, 'flushq', 'targeted'
 end
 
+group('owner').tap do |g|
+  g.perm @name, 'eval', 'root'
+end
+
 #
 # help command
 #
@@ -426,4 +430,25 @@ flushq_cmd.branch('targeted', 'server') do |e, c|
   end
 end.tap do |b|
   b.description = 'Flushes the queue of the given server'
+end
+
+#
+# eval command
+#
+
+eval_cmd = cmd 'eval'
+
+eval_cmd.branch('root', '...') do |e, c|
+  unless c.extra.empty?
+    begin
+      out = eval(c.extra.join(' ')).inspect
+      e.reply "%BOutput%N: #{out}"
+    rescue StandardError, SyntaxError => err
+      e.reply "E: #{err.class} => #{err.message}"
+    end
+  else
+    e.reply '%BOutput%N: nil'
+  end
+end.tap do |b|
+  b.description = 'Evaluates given string'
 end

data/lib/tinyirc/version.rb

@@ -1,3 +1,3 @@
 module TinyIRC
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/tinyirc.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3'
 
   spec.add_dependency 'particlecmd', '~> 0.1'
   spec.add_dependency 'particlelog', '~> 0.1'
   spec.add_dependency 'sinatra', '~> 2.0'
-  spec.add_dependency 'thin', '~> 1.2'
+  spec.add_dependency 'thin', '~> 1.7'
   spec.add_dependency 'sqlite3', '~> 1.3'
 end

data/tinyirc.sample.yaml

@@ -7,16 +7,18 @@ plugins:
 groups:
   world: # All users belong to this group
     include: # Includes permissions from listed groups into the current one
-      - plugin/world
+      - core/world
     perms:
       - core/flushq
   admin: # Admins have this group
     include:
       - world
+      - core/admin
       - plugin/admin
   owner: # Owners have this group
     include:
       - admin
+      - core/owner
       - plugin/owner
 
 cooldowns:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinyirc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nickolay Ilyushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: particlecmd
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A modular IRC bot framework