blur 2.1.3 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e3a0bf486ae6b8b30c925220195462b412e23bd62e767e2996c698273d5bf18
-  data.tar.gz: 733539cbd3f671eb799f541523031ca42303184db7866b5113058486c664c95a
+  metadata.gz: 6c4add65cc3b256a41629f69bb62065d523f60a5cd934d8b4c1045b326113ce6
+  data.tar.gz: f55fbec4a5863465d61f110ceeb1fe3b7f89d6a6d9fc659ac30907ef7921e510
 SHA512:
-  metadata.gz: 8517510ecd51f045b995fcd42d00d1da7587d7fb2f36911e59bc6ed9f2478e7076b2bcdfca1290001e276392f3ad63dc9829fb90a0b67432e1223ca4bde5e48f
-  data.tar.gz: 0bac6a2de2bc5d1d8294ba2d9342ffde0d39fedc40b318d73a5c5e187c1de298ad371a94bf4c67bd6433ee7ba896d24cd945408c869d3c4a4149a289b54ac6fd
+  metadata.gz: 05bc91b4a941bfe212e42d9a0c56d6e7969aa01e9cde2fa86946dc0f24244b462de299683d06875e2ea3bdad7e32280afd869cac6874d0fd7ef1f3d9bfa10d63
+  data.tar.gz: 9ca64c3952d10ccb6c9dce8a51723da4b81643b46d2090aa72b72886965d8973da540a6b9da477254493baf99d1ad2174b7c5129557f963fb08db892ce42a632

data/executables/blur

@@ -1,21 +1,20 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
-$:.unshift File.join __dir__, '../library'
+require_relative '../library/blur'
 
 require 'optparse'
 
 options = {
   verbose: false,
-  environment: 'development',
   config_path: 'config.yml'
 }
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: #$0 [-c <config>] [-e <env>]"
+  opts.banner = "Usage: #{$PROGRAM_NAME} [-c <config>] [-e <env>]"
 
-  opts.separator ""
-  opts.separator "Specific options:"
+  opts.separator ''
+  opts.separator 'Specific options:'
 
   opts.on '-v', '--[no-]verbose', 'Enable verbose logging' do |verbose|
     options[:verbose] = verbose
@@ -41,22 +40,24 @@ end.parse!
 
 begin
   require 'blur'
-rescue LoadError => exception
+rescue LoadError => e
   puts 'Ruby was unable to load the blur library!'
   puts
   puts "Please ensure that you've installed it using the following command:"
   puts 'gem install blur'
-  raise exception
-  exit 1
+  raise e
 end
 
+puts "Blur #{Blur.version}"
+
 config_path = File.expand_path options[:config_path]
-unless File.readable? config_path
-  fail "Configuration file `#{config_path}' is not readable"
-  exit 1
-end
+puts "Loading configuration file `#{config_path}' .."
 
-@client = Blur::Client.new options
-@client.connect
+raise "Configuration file `#{config_path}' is not readable" unless File.readable? config_path
+
+EM.run do
+  @client = Blur::Client.new options
+  @client.connect
+end
 
 # vim: syntax=ruby

data/library/blur/callbacks.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Blur
   module Callbacks
@@ -16,14 +16,12 @@ module Blur
     # @return [true, false] True if any callbacks were invoked, nil otherwise
     def emit name, *args
       # Trigger callbacks in scripts before triggering events in the client.
-      EM.defer { notify_scripts name, *args }
+      notify_scripts name, *args
 
       matching_callbacks = callbacks[name]
       return false unless matching_callbacks&.any?
 
-      EM.defer do
-        matching_callbacks.each { |callback| callback.call *args }
-      end
+      matching_callbacks.each { |callback| callback.call *args }
     end
 
     # Add a new event callback.
@@ -37,20 +35,18 @@ module Blur
     protected
 
     def notify_scripts name, *args
-      scripts = @scripts.values.select{|script| script.class.events.key? name }
+      scripts = @scripts.values.select { |script| script.class.events.key? name }
       scripts.each do |script|
-        begin
-          script.class.events[name].each do |method|
-            if method.is_a? Proc
-              method.call script, *args
-            else
-              script.__send__ method, *args
-            end
+        script.class.events[name].each do |method|
+          if method.is_a? Proc
+            method.call script, *args
+          else
+            script.__send__ method, *args
           end
-        rescue => exception
-          STDERR.puts "#{exception.class}: #{exception.message}"
-          STDERR.puts nil, 'Backtrace:', '---', exception.backtrace
         end
+      rescue StandardError => e
+        warn "#{e.class}: #{e.message}"
+        warn nil, 'Backtrace:', '---', e.backtrace
       end
     end
   end

data/library/blur/channel.rb

@@ -1,11 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Blur
   # The +Channel+ class is used for encapsulating a channel and its properties.
   #
   # Users inside the channel is stored in the {#channels} attribute.
   #
-  # Modes can be set for a channel, but Blur is not 
+  # Modes can be set for a channel, but Blur is not
   # {http://www.irc.org/tech_docs/005.html ISupport}-compliant yet.
   #
   # @todo make so that channels *and* users belongs to the network, and not
@@ -26,8 +26,8 @@ module Blur
     # Instantiate a user with a nickname, a network and a user list.
     def initialize name, network = nil
       @name    = name
-      @users = []
-      @modes   = String.new
+      @users   = []
+      @modes   = ''
       @network = network
     end
 
@@ -39,9 +39,9 @@ module Blur
 
       modes.each_char do |char|
         case char
-        when ?+
+        when '+'
           addition = true
-        when ?-
+        when '-'
           addition = false
         else
           addition ? @modes.concat(char) : @modes.delete!(char)
@@ -58,9 +58,12 @@ module Blur
 
     # Convert it to a debug-friendly format.
     def inspect
-      %{#<#{self.class.name}:0x#{self.object_id.to_s 16} @name=#{@name.inspect} @topic=#{@topic.inspect} @users=#{@users.inspect}}
+      "#<#{self.class.name}:0x#{object_id.to_s 16} " \
+        "@name=#{@name.inspect} " \
+        "@topic=#{@topic.inspect} " \
+        "@users=#{@users.inspect}>"
     end
-    
+
     # Called when YAML attempts to save the object, which happens when a
     # scripts cache contains this user and the script is unloaded.
     def to_yaml options = {}

data/library/blur/client.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'blur/handling'
+require_relative './handling'
 
 module Blur
   # The +Client+ class is the controller of the low-level access.
@@ -10,13 +10,9 @@ module Blur
   class Client
     include Callbacks
     include Handling
-    include Logging
-
-    # Client error.
-    Error = Class.new StandardError
 
     # The default environment.
-    ENVIRONMENT = ENV['BLUR_ENV'] || 'development'.freeze
+    ENVIRONMENT = ENV['BLUR_ENV'] || 'development'
 
     # The default configuration.
     DEFAULT_CONFIG = {
@@ -25,9 +21,9 @@ module Blur
         'scripts_dir' => 'scripts/',
         'networks' => []
       },
-      'scripts' => {},
+      'scripts' => {}
     }.freeze
-    
+
     # @return [Array] a list of instantiated networks.
     attr_accessor :networks
     # @return [Hash] client configuration.
@@ -49,12 +45,10 @@ module Blur
       @scripts = {}
       @networks = []
       @config_path = options[:config_path]
-      @environment = options[:environment]
+      @environment = options[:environment] || ENVIRONMENT
       @verbose = options[:verbose] == true
 
-      unless @config_path
-        raise ConfigError, 'missing config file path in :config_path option'
-      end
+      raise ConfigError, 'missing config file path in :config_path option' unless @config_path
 
       load_config!
 
@@ -68,23 +62,25 @@ module Blur
 
       trap 2, &method(:quit)
     end
-    
+
     # Connect to each network available that is not already connected, then
     # proceed to start the run-loop.
     def connect
       networks = @networks.reject &:connected?
-      
-      EventMachine.run do
-        load_scripts!
-        networks.each &:connect
 
-        EventMachine.error_handler do |exception|
-          log.error "#{exception.message ^ :bold} on line #{exception.line.to_s ^ :bold}"
-          puts exception.backtrace.join "\n"
-        end
+      load_scripts!
+      networks.each &:connect
+
+      EventMachine.error_handler do |exception|
+        message_pattern = /^.*?:(\d+):/
+        backtrace = exception.backtrace.first
+        error_line = backtrace.match(message_pattern)[1].to_i + 1
+
+        puts "#{exception.message} on line #{error_line.to_s}"
+        puts exception.backtrace.join "\n"
       end
     end
-    
+
     # Is called when a command have been received and parsed, this distributes
     # the command to the loader, which then further distributes it to events
     # and scripts.
@@ -92,26 +88,23 @@ module Blur
     # @param [Network] network the network that received the command.
     # @param [Network::Command] command the received command.
     def got_message network, message
-      if @verbose
-        log "#{'←' ^ :green} #{message.command.to_s.ljust(8, ' ') ^ :light_gray} #{message.parameters.map(&:inspect).join ' '}"
-      end
+      puts "← #{message.command.to_s.ljust(8, ' ')} #{message.parameters.map(&:inspect).join ' '}" if @verbose
+
       name = :"got_#{message.command.downcase}"
 
-      if respond_to? name
-        __send__ name, network, message
-      end
+      __send__ name, network, message if respond_to? name
     end
-    
+
     # Called when a network connection is either closed, or terminated.
     def network_connection_closed network
       emit :connection_close, network
     end
-    
+
     # Try to gracefully disconnect from each network, unload all scripts and
     # exit properly.
     #
     # @param [optional, Symbol] signal The signal received by the system, if any.
-    def quit signal = :SIGINT
+    def quit _signal = :SIGINT
       @networks.each do |network|
         network.transmit :QUIT, 'Got SIGINT?'
         network.disconnect
@@ -161,11 +154,11 @@ module Blur
     # @raise [Exception] if there was any problems loading the file
     def load_script_file file_path
       load file_path, true
-    rescue Exception => exception
+    rescue Exception => e
       warn "The script `#{file_path}' failed to load"
-      warn "#{exception.class}: #{exception.message}"
+      warn "#{e.class}: #{e.message}"
       warn ''
-      warn 'Backtrace:', '---', exception.backtrace
+      warn 'Backtrace:', '---', e.backtrace
     end
 
     # Instantiates each +SuperScript+ in the +Blur.scripts+ list by manually
@@ -194,7 +187,7 @@ module Blur
     # This method will call #unloaded on the instance of each loaded script to
     # give it a chance to clean up any resources.
     def unload_scripts!
-      @scripts.each do |name, script|
+      @scripts.each do |_name, script|
         script.__send__ :unloaded if script.respond_to? :unloaded
       end.clear
 
@@ -209,14 +202,14 @@ module Blur
     def load_config!
       config = YAML.load_file @config_path
 
-      if config.key? @environment
-        @config = config[@environment]
-        @config.deeper_merge! DEFAULT_CONFIG
-
-        emit :config_load
-      else
-        raise Error, "No configuration found for specified environment `#{@environment}'"
+      unless config.key? @environment
+        raise ClientError, "No configuration found for specified environment `#{@environment}'"
       end
+
+      @config = config[@environment]
+      @config.deeper_merge! DEFAULT_CONFIG
+
+      emit :config_load
     end
   end
 end