balotelli 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15612cf80da241b688e4fc4b1029b58f049756e5
-  data.tar.gz: 74dc6b66092aa791f7a35f9b6e7a74d7d768a40a
+  metadata.gz: 9bfeedb4c09e7cdac32022e2cc033310c9254c48
+  data.tar.gz: 9f0af9c1914dc98ae0f61b6487a1ff40f71d3568
 SHA512:
-  metadata.gz: d78beaca372105824a6f5893ac216aca69135a1c103dab1eeba0e25fb13fada711c0b511b5c416648f1f6da04bc53b4298e5fc7522666e6da933a8ac055e5b10
-  data.tar.gz: 43aa8f479f162551a8a940f230f53edc5673f762cea2f0e25045db93ed44ccd9c61bf13fc3f41e4b0c6bc88ac95502183a2401d5a4e34f02fffb6af709c059c7
+  metadata.gz: d580a3e378aee126aa667b675d6dec41d78d6c6e018f266bfbcdd7d36bc6cc9103ae33839f2400181b105386f50c312e820e77be570124edc489e34ac60405b9
+  data.tar.gz: 1687cc8f9f82a8d532fe2706f3812099c785c60e460208054e674ce75be6070de0e5763673b1f08a08cea45d4db4e3bd7376239cc599c89003fb250806092274

data/.codeclimate.yml

@@ -1,4 +1,5 @@
-languages:
-  ruby: true
+engines:
+  rubocop:
+    enabled: true
 exclude_paths:
-  "example.rb"
+  - examples/**/*

data/.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
+cache: bundler
 rvm:
   - 2.3.0
   - 2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    balotelli (0.3.0)
+    balotelli (0.4.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/balotelli/base.rb

@@ -32,17 +32,26 @@ module Balotelli
     end
 
     def get_user_list(channel)
-      self.class.instance_variable_set(:@to_process, :user_list)
+      execute_in_mutex(channel) do
+        self.class.names(channel)
+      end
+      __CACHE__[:user_list][channel]
+    end
+
+    def execute_in_mutex(channel)
       cv = ConditionVariable.new
-      __CVS__.push cv
-      self.class.names(channel)
+      if __CVS__.key? channel
+        __CVS__[channel] << cv
+      else
+        __CVS__[channel] = [cv]
+      end
+      yield
       __MUTEX__.synchronize { cv.wait(__MUTEX__) }
-      __CACHE__[:user_list][channel]
     end
 
     def method_missing(method, *args, **params, &block)
       if method =~ /__([[[:upper:]]_]+)__/
-        self.class.instance_variable_get("@#{$1}".downcase)
+        self.class.instance_variable_get("@#{Regexp.last_match(1)}".downcase)
       else
         super
       end
@@ -57,7 +66,7 @@ module Balotelli
 
         @modules = {}
         @cache = Hash.new { |hash, key| hash[key] = {} }
-        @cvs = []
+        @cvs = {}
       end
 
       def inherited(subclass)
@@ -83,8 +92,8 @@ module Balotelli
 
       def mod_match(str, priv = false)
         if str =~ /\A[^a-zA-Z0-9\s]?(\S+) ?(.*)/
-          if (mod = @cache[:modules][$1.downcase])
-            mod.match($2, priv)
+          if (mod = @cache[:modules][Regexp.last_match(1).downcase])
+            mod.match(Regexp.last_match(2), priv)
           end
         elsif str == :join
           match = nil
@@ -98,7 +107,6 @@ module Balotelli
       end
 
       def run
-        @to_process = false
         while (str = sgets)
           process(str)
         end
@@ -108,8 +116,8 @@ module Balotelli
 
       def process(str)
         if str =~ /\APING (.*)\z/
-          pong $1
-        elsif @on_connect && str =~ /End of \/MOTD command/i
+          pong Regexp.last_match(1)
+        elsif @on_connect && str =~ %r{End of \/MOTD command}i
           instance_eval(&remove_instance_variable(:@on_connect))
         elsif !(str =~ /(JOIN\s|PRIVMSG\s)/)
           process_table(str)
@@ -120,14 +128,14 @@ module Balotelli
 
       def process_message(str)
         if str =~ Core::Utils::PRIV_MSG_REGEX
-          metadata = { user: $1, channel: $2, message: $3 }
-          priv = !($2 =~ /#.+/)
+          metadata = { user: Regexp.last_match(1), channel: Regexp.last_match(2), message: Regexp.last_match(3) }
+          priv = !(Regexp.last_match(2) =~ /#.+/)
           if (match = match(metadata[:message], priv)) ||
-              (match = mod_match(metadata[:message], priv))
+             (match = mod_match(metadata[:message], priv))
             new_response(str, match, metadata, Core::PrivMsg, priv)
           end
         elsif str =~ Core::Utils::JOIN_REGEX
-          metadata = { user: $1, channel: $2 }
+          metadata = { user: Regexp.last_match(1), channel: Regexp.last_match(2) }
           if (match = match(:join)) || (match = mod_match(:join))
             new_response(str, match, metadata, Core::Join)
           end
@@ -144,13 +152,14 @@ module Balotelli
 
       def process_table(string)
         if @cvs.any? && string =~ (regex = Core::Utils.table_regex(@nick))
-          metadata = { channel: $2, message: $3 }
-          users = @cache[@to_process][metadata[:channel]] = metadata[:message]
-          until (str = sgets) =~ /End of \/NAME/i
+          metadata = { channel: Regexp.last_match(2), message: Regexp.last_match(3) }
+          users = @cache[:user_list][metadata[:channel]] = metadata[:message]
+          until (str = sgets) =~ %r{End of \/NAME}i
             users << " #{str.match(regex).captures.first}"
           end
-          @cache[@to_process][metadata[:channel]] = users.split(' ')
-          @cvs.shift.signal
+          @cache[:user_list][metadata[:channel]] = users.split(' ')
+          @cvs[metadata[:channel]].shift.signal
+          @cvs.delete(metadata[:channel]) if @cvs[metadata[:channel]].empty?
         end
       end
     end

data/lib/balotelli/config.rb

@@ -1,14 +1,14 @@
 module Balotelli
   module Config
-    FREENODE = ['chat.freenode.net', 6667]
-    QUAKENET = ['irc.quakenet.org', 6667]
-    RIZON = ['irc.rizon.net', 6667]
-    PIRC = ['irc.pirc.pl', 6667]
-    MOZNET = ['irc.mozilla.org', 6667]
+    FREENODE = ['chat.freenode.net'.freeze, 6667].freeze
+    QUAKENET = ['irc.quakenet.org'.freeze, 6667].freeze
+    RIZON = ['irc.rizon.net'.freeze, 6667].freeze
+    PIRC = ['irc.pirc.pl'.freeze, 6667].freeze
+    MOZNET = ['irc.mozilla.org'.freeze, 6667].freeze
 
     module_function
 
-    def build(server, name = ('balotelli%03d' % rand(1000)), pass = nil)
+    def build(server, name = format('balotelli%03d', rand(1000)), pass = nil)
       const_get(server.upcase).dup.push(name, pass)
     end
   end

data/lib/balotelli/core/irc.rb

@@ -20,9 +20,7 @@ module Balotelli
         sputs("NICK #{@nick}")
         sputs("USER #{@nick} 0 * :#{@nick}")
 
-        if block_given?
-          instance_variable_set(:@on_connect, block)
-        end
+        instance_variable_set(:@on_connect, block) if block_given?
       end
 
       def sgets

data/lib/balotelli/core/irc_logger.rb

@@ -27,7 +27,6 @@ module Balotelli
 
         des.instance_variable_set(:@log_file, log_file)
         des.instance_variable_set(:@logger, self)
-
         class << des
           alias_method :orig_sputs, :sputs
           private :orig_sputs
@@ -37,7 +36,7 @@ module Balotelli
             to_log = ">>#{str.inspect}\n"
             @log_file.info(to_log)
             if str =~ /\A:?\S+ (#\S+) .*/
-              @logger.channel_log($1.downcase, to_log)
+              @logger.channel_log(Regexp.last_match(1).downcase, to_log)
             end
             str
           end
@@ -50,7 +49,7 @@ module Balotelli
             to_log = "<<#{str.inspect}\n"
             @log_file.info(to_log)
             if str =~ /\A:?\S+ \S+ (#\S+) .*/
-              @logger.channel_log($1.downcase, to_log)
+              @logger.channel_log(Regexp.last_match(1).downcase, to_log)
             end
             str
           end
@@ -78,16 +77,13 @@ module Balotelli
       end
 
       def new_logger(file_name)
-        Logger.new(File.join(dir, file_name), 0, 1.0 / 0)
-          .tap do |l|
+        Logger.new(File.join(dir, file_name), 0, 1.0 / 0).tap do |l|
           l.formatter = LOG_FORMAT
         end
       end
 
       def check_dir
-        unless File.file?(dir)
-          FileUtils.mkdir_p(dir)
-        end
+        FileUtils.mkdir_p(dir) unless File.file?(dir)
       end
     end
   end

data/lib/balotelli/core/kick.rb

@@ -13,7 +13,7 @@ module Balotelli
         @klass.sputs("KICK #{channel} #{who} #{reason}")
       end
 
-      alias_method :execute, :execute!
+      alias execute execute!
     end
   end
 end

data/lib/balotelli/core/priv_msg.rb

@@ -7,11 +7,11 @@ module Balotelli
         @user_nick = @user.match(/\A(\S+)!.*/)[1]
         @channel = metadata[:channel]
         @content = metadata[:message]
-        if privacy
-          @responder = @user_nick
-        else
-          @responder = @channel
-        end
+        @responder = if privacy
+                       @user_nick
+                     else
+                       @channel
+                     end
       end
     end
   end

data/lib/balotelli/core/router.rb

@@ -6,11 +6,9 @@ module Balotelli
       end
 
       def on(route, option = {}, &block)
-        fail 'no block given' if block.nil?
+        raise 'no block given' if block.nil?
 
-        if !option.key?(:private) || route == :join
-          option[:private] = false
-        end
+        option[:private] = false if !option.key?(:private) || route == :join
 
         if option[:private] == :both
           on(route, option.clone.tap { |o| o[:private] = true }, &block)
@@ -21,7 +19,7 @@ module Balotelli
         @routes[route] ||= {}
 
         if @routes[route][option[:private]] && !option[:force]
-          fail "Route #{route.inspect}, private: #{option[:private]} already exists"
+          raise "Route #{route.inspect}, private: #{option[:private]} already exists"
         end
 
         @routes[route][option[:private]] = [block, self]
@@ -39,7 +37,7 @@ module Balotelli
       end
 
       def match(str, priv = false)
-        if m = @routes.detect { |k, v| match?(str, k) && v[priv] }
+        if (m = @routes.detect { |k, v| match?(str, k) && v[priv] })
           [m[0], m[1][priv], str]
         end
       end

data/lib/balotelli/core/utils.rb

@@ -1,9 +1,9 @@
 module Balotelli
   module Core
     module Utils
-      NICK_REGEX = /\A(\S+)!.*/.freeze
-      PRIV_MSG_REGEX = /\A:?(\S+) PRIVMSG (\S+) :?(.*)/.freeze
-      JOIN_REGEX = /\A:?(\S+) JOIN (\S+)/.freeze
+      NICK_REGEX = /\A(\S+)!.*/
+      PRIV_MSG_REGEX = /\A:?(\S+) PRIVMSG (\S+) :?(.*)/
+      JOIN_REGEX = /\A:?(\S+) JOIN (\S+)/
 
       module_function
 
@@ -12,7 +12,7 @@ module Balotelli
       end
 
       def table_regex(nick)
-        /\A:?(\S+) \d+ #{nick} \S (#\S+) :?(.*)/.freeze
+        /\A:?(\S+) \d+ #{nick} \S (#\S+) :?(.*)/
       end
     end
   end

data/lib/balotelli/version.rb

@@ -1,3 +1,3 @@
 module Balotelli
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balotelli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Marcin Henryk Bartkowiak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Simple IRC bot framework