pechkin 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a2ecda5dd85e6cb2dd48ccb18eb1966559fa8d6539239b1e6def0377324c765
-  data.tar.gz: 9be0c8e01ceec5f0e19f2c44a9a7d10a2c09c32ddcec26d5fba5d43f808eaec2
+  metadata.gz: 3fa8abd425ad6a776104aabeeb6916d4b8b4d77ae0f0d7e24b75f102bb70b016
+  data.tar.gz: 1b5b43910b029f8553f54ddfa5d70a7195b2db86d35a38ba1fcffc37521b7d4b
 SHA512:
-  metadata.gz: 2bdf5bd548de267c3cfc9a7a45be9a451df75bf288e9403dfe1ed9e3f748318fd1acd85f5070f310890b5947b3f478ea4cdab817b8cba9902cf5f23ad35cd431
-  data.tar.gz: c18c214ef31484ccc3dd79af5c55270f1fdcea84ee198e7ef5c3adc39b76496914ba703bc2d5e7f45beec62fb25dd71942cdf323a82b02a35d641a6aec420d6c
+  metadata.gz: d636b920cb207c03ce1f96ceeb47ec478214743e0ef4f49895c07982fcf68d2b724d4006058ef00de6903c986c6f40e8678ebbb7ccdaa681d6b552cfb70111a1
+  data.tar.gz: 5254cb1f323cb46af16b889d82ffd565a9a0f30e5665cc6c5487e59926f25e66b8a573e004ffcf4c2a34b8f17187b0e67443ef5bf5ffec3b8e2a68e079557def

data/lib/pechkin/app/app_builder.rb

@@ -15,9 +15,7 @@ module Pechkin
         use Prometheus::Middleware::Collector, registry: prometheus
         # Add Auth check if found htpasswd file or it was excplicitly provided
         # See CLI class for configuration details
-        if options.htpasswd
-          use Pechkin::Auth::Middleware, auth_file: options.htpasswd
-        end
+        use Pechkin::Auth::Middleware, auth_file: options.htpasswd if options.htpasswd
         use Prometheus::Middleware::Exporter, registry: prometheus
 
         run app
@@ -34,7 +32,7 @@ module Pechkin
         file = File.open(log_file, File::WRONLY | File::APPEND)
         Logger.new(file)
       else
-        Logger.new(STDOUT)
+        Logger.new($stdout)
       end
     end
   end

data/lib/pechkin/app/request_handler.rb

@@ -2,7 +2,7 @@ module Pechkin
   # Http requests handler. We need fresh instance per each request. To keep
   # internal state isolated
   class RequestHandler
-    REQ_PATH_PATTERN = %r{^/(.+)/([^/]+)/?$}
+    REQ_PATH_PATTERN = %r{^/(.+)/([^/]+)/?$}.freeze
 
     attr_reader :req, :handler,
                 :channel_id, :message_id,

data/lib/pechkin/auth.rb

@@ -5,6 +5,7 @@ module Pechkin
     # Utility class for altering htpasswd files
     class Manager
       attr_reader :htpasswd
+
       def initialize(htpasswd)
         @htpasswd = htpasswd
       end

data/lib/pechkin/channel.rb

@@ -3,7 +3,7 @@ module Pechkin
   class Chanel
     attr_accessor :logger
 
-    def initialize(connector, channel_list, logger = ::Logger.new(STDOUT))
+    def initialize(connector, channel_list, logger = ::Logger.new($stdout))
       @connector = connector
       @channel_list = channel_list
       @channel_list = [channel_list] unless channel_list.is_a?(Array)

data/lib/pechkin/cli.rb

@@ -13,7 +13,7 @@ module Pechkin
     # @opt names [Array<String>] list of command line keys
     # @opt desc [String] option description
     # @opt type [Class] argument type to parse from command line, e.g. Integer
-    def opt(name, default: nil, names:, desc: '', type: nil)
+    def opt(name, names:, default: nil, desc: '', type: nil)
       @cli_options ||= []
 
       # raise ':names is nil or empty' if names.nil? || names.empty?

data/lib/pechkin/command/base.rb

@@ -9,7 +9,7 @@ module Pechkin
       #   command behaviour
       # @opt stdout [IO] IO object which represents STDOUT
       # @opt stderr [IO] IO object which represents STDERR
-      def initialize(options, stdout: STDOUT, stderr: STDERR)
+      def initialize(options, stdout: $stdout, stderr: $stderr)
         @options = options
         @stdout = stdout
         @stderr = stderr

data/lib/pechkin/command/send_data.rb

@@ -29,6 +29,7 @@ module Pechkin
         d = if data.start_with?('@')
               file = data[1..-1]
               raise "File not found #{file}" unless File.exist?(file)
+
               IO.read(file)
             else
               data

data/lib/pechkin/configuration/configuration_loader.rb

@@ -17,7 +17,7 @@ module Pechkin
       when 'slack'
         Connector::Slack.new(bot.token, bot.name)
       else
-        raise 'Unknown connector ' + bot.connector + ' for ' + bot.name
+        raise "Unknown connector #{bot.connector} for #{bot.name}"
       end
     end
 

data/lib/pechkin/configuration/configuration_loader_bots.rb

@@ -15,9 +15,7 @@ module Pechkin
     def load_bots_configuration(working_dir, bots)
       bots_dir = File.join(working_dir, 'bots')
 
-      unless File.directory?(bots_dir)
-        raise ConfigurationError, "'#{bots_dir}' is not a directory"
-      end
+      raise ConfigurationError, "'#{bots_dir}' is not a directory" unless File.directory?(bots_dir)
 
       Dir["#{bots_dir}/*.yml"].each do |bot_file|
         name = File.basename(bot_file, '.yml')

data/lib/pechkin/configuration/configuration_loader_channels.rb

@@ -22,9 +22,7 @@ module Pechkin
     def load_channels_configuration(working_dir, channels)
       channels_dir = File.join(working_dir, 'channels')
 
-      unless File.directory?(channels_dir)
-        raise ConfigurationError, "'#{channels_dir}' is not a directory"
-      end
+      raise ConfigurationError, "'#{channels_dir}' is not a directory" unless File.directory?(channels_dir)
 
       Dir["#{channels_dir}/*"].each do |channel_dir|
         next unless File.directory?(channel_dir)
@@ -63,9 +61,7 @@ module Pechkin
         message_config = YAML.safe_load(IO.read(file))
         name = File.basename(file, '.yml')
 
-        if message_config.key?('template')
-          message_config['template'] = get_template(message_config['template'])
-        end
+        message_config['template'] = get_template(message_config['template']) if message_config.key?('template')
 
         messages[name] = message_config
       end

data/lib/pechkin/configuration/configuration_loader_views.rb

@@ -15,9 +15,7 @@ module Pechkin
     def load_views_configuration(working_dir, views)
       views_dir = File.join(working_dir, 'views')
 
-      unless File.directory?(views_dir)
-        raise ConfigurationError, "'#{views_dir}' is not a directory"
-      end
+      raise ConfigurationError, "'#{views_dir}' is not a directory" unless File.directory?(views_dir)
 
       Dir["#{views_dir}/**/*.erb"].each do |f|
         relative_path = f["#{views_dir}/".length..-1]

data/lib/pechkin/connector/slack.rb

@@ -4,6 +4,8 @@ module Pechkin
       attr_reader :name
 
       def initialize(bot_token, name)
+        super()
+
         @headers = { 'Authorization' => "Bearer #{bot_token}" }
         @name = name
       end

data/lib/pechkin/connector/telegram.rb

@@ -4,6 +4,8 @@ module Pechkin
       attr_reader :name
 
       def initialize(bot_token, name)
+        super()
+
         @bot_token = bot_token
         @name = name
       end

data/lib/pechkin/exceptions.rb

@@ -4,7 +4,10 @@ module Pechkin
       super("No such channel #{channel_name}")
     end
   end
+
   class MessageNotFoundError < StandardError; end
+
   class MessageContentIsEmptyError < StandardError; end
+
   class ConfigurationError < StandardError; end
 end

data/lib/pechkin/handler.rb

@@ -5,7 +5,7 @@ module Pechkin
     attr_reader :channels, :message_matcher
     attr_accessor :logger
 
-    def initialize(channels, stdout = STDOUT, stderr = STDERR)
+    def initialize(channels, stdout = $stdout, stderr = $stderr)
       @channels = channels
       # Create empty logger by default
       @logger = Logger.new(IO::NULL)

data/lib/pechkin/message_matcher.rb

@@ -1,5 +1,6 @@
 module Pechkin
   class MessageMatchError < StandardError; end
+
   # Allows to match message configuration against received data.
   #
   # Data is checked againts either allow or forbid rules. But not both at the
@@ -51,11 +52,12 @@ module Pechkin
     # can take one field in rule and check it separately as new rule. If all
     # fields are passed check then whole rule passed.
     def check_rule(top_rule, sub_rule, data)
-      result = if sub_rule.is_a?(Hash)
+      result = case sub_rule
+               when Hash
                  check_hash_rule(top_rule, sub_rule, data)
-               elsif sub_rule.is_a?(Array)
+               when Array
                  check_array_rule(top_rule, sub_rule, data)
-               elsif sub_rule.is_a?(String)
+               when String
                  check_string_rule(top_rule, sub_rule, data)
                else
                  sub_rule.eql?(data)

data/lib/pechkin/version.rb

@@ -1,7 +1,7 @@
 module Pechkin
   # Keeps actual version
   module Version
-    VERSION = [1, 3, 2].freeze
+    VERSION = [1, 4, 0].freeze
     class << self
       def version_string
         VERSION.join('.')

data/lib/pechkin.rb

@@ -28,8 +28,8 @@ module Pechkin # :nodoc:
       cmd = Command::Dispatcher.new(options).dispatch
       cmd.execute
     rescue StandardError => e
-      warn 'Error: ' + e.message
-      warn "\t" + e.backtrace.reverse.join("\n\t") if options.debug?
+      warn "Error: #{e.message}"
+      warn "\t#{e.backtrace.reverse.join("\n\t")}" if options.debug?
       exit 2
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pechkin
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htauth
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: powerpack
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.2.3
 description: 
 email: ilya.arkhanhelsky at gmail.com
 executables:
@@ -117,16 +117,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Web service to proxy webhooks to Telegram Bot API