slack-ruby-bot 0.12.0 → 0.13.0

data/lib/slack-ruby-bot/commands/unknown.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module Commands
     class Unknown < Base

data/lib/slack-ruby-bot/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module Config
     extend self
@@ -11,6 +13,7 @@ module SlackRubyBot
 
     def send_gifs?
       return false unless defined?(Giphy)
+
       v = boolean_from_env('SLACK_RUBY_BOT_SEND_GIFS')
       send_gifs.nil? ? (v.nil? || v) : send_gifs
     end

data/lib/slack-ruby-bot/hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'slack-ruby-bot/hooks/set'
 require 'slack-ruby-bot/hooks/hello'
 require 'slack-ruby-bot/hooks/message'

data/lib/slack-ruby-bot/hooks/hello.rb

@@ -1,15 +1,34 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module Hooks
     class Hello
-      attr_accessor :logger
+      attr_accessor :logger, :connected_at
 
       def initialize(logger)
         self.logger = logger
       end
 
       def call(client, _data)
-        return unless client && client.team
-        logger.info "Successfully connected team #{client.team.name} (#{client.team.id}) to https://#{client.team.domain}.slack.com."
+        return unless client&.team
+
+        new_connected_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        log = [
+          'Successfully',
+          connected_at ? 'reconnected' : 'connected',
+          "team #{client.team.name} (#{client.team.id}) to https://#{client.team.domain}.slack.com",
+          connected_at ? "after #{last_connection_till(new_connected_at)}s" : nil
+        ].compact.join(' ') + '.'
+
+        logger.info log
+
+        self.connected_at = new_connected_at
+      end
+
+      private
+
+      def last_connection_till(time)
+        (time - connected_at).round(2)
       end
     end
   end

data/lib/slack-ruby-bot/hooks/hook_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module Hooks
     module HookSupport

data/lib/slack-ruby-bot/hooks/message.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module Hooks
     class Message
       def call(client, data)
         return if message_to_self_not_allowed? && message_to_self?(client, data)
+
         data.text = data.text.strip if data.text
         result = child_command_classes.detect { |d| d.invoke(client, data) }
         result ||= built_in_command_classes.detect { |d| d.invoke(client, data) }
@@ -36,7 +39,7 @@ module SlackRubyBot
       #
       def child_command_classes
         command_classes.reject do |k|
-          k.name && k.name.starts_with?('SlackRubyBot::Commands::')
+          k.name&.starts_with?('SlackRubyBot::Commands::')
         end
       end
 
@@ -47,7 +50,7 @@ module SlackRubyBot
       #
       def built_in_command_classes
         command_classes.select do |k|
-          k.name && k.name.starts_with?('SlackRubyBot::Commands::') && k != SlackRubyBot::Commands::Unknown
+          k.name&.starts_with?('SlackRubyBot::Commands::') && k != SlackRubyBot::Commands::Unknown
         end
       end
     end

data/lib/slack-ruby-bot/hooks/set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module Hooks
     class Set
@@ -36,7 +38,7 @@ module SlackRubyBot
       end
 
       def flush_handlers
-        handlers.keys.each { |hook| register_callback(hook) }
+        handlers.each_key { |hook| register_callback(hook) }
       end
     end
   end

data/lib/slack-ruby-bot/mvc.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'slack-ruby-bot/mvc/mvc'

data/lib/slack-ruby-bot/mvc/controller/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module MVC
     module Controller
@@ -45,9 +47,7 @@ module SlackRubyBot
           def inherited(klass) # :nodoc:
             # Define the abstract ivar on subclasses so that we don't get
             # uninitialized ivar warnings
-            unless klass.instance_variable_defined?(:@abstract)
-              klass.instance_variable_set(:@abstract, false)
-            end
+            klass.instance_variable_set(:@abstract, false) unless klass.instance_variable_defined?(:@abstract)
             super
           end
 
@@ -64,6 +64,7 @@ module SlackRubyBot
 
             methods.each do |name|
               next if name[0] == '_'
+
               commands = lookup_command_name(name)
 
               # Generates a command for each controller method *and* its aliases

data/lib/slack-ruby-bot/mvc/model/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module MVC
     module Model

data/lib/slack-ruby-bot/mvc/mvc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../mvc/controller/base'
 
 require_relative '../mvc/model/base'

data/lib/slack-ruby-bot/mvc/view/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module MVC
     module View

data/lib/slack-ruby-bot/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
 
 require 'rubygems'
@@ -7,6 +9,6 @@ require 'rack/test'
 require 'config/environment'
 require 'slack-ruby-bot'
 
-Dir[File.join(File.dirname(__FILE__), 'rspec/support', '**/*.rb')].each do |file|
+Dir[File.join(File.dirname(__FILE__), 'rspec/support', '**/*.rb')].sort.each do |file|
   require file
 end

data/lib/slack-ruby-bot/rspec/support/bots_for_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Testing
   class WeatherBot < SlackRubyBot::Bot
     help do

data/lib/slack-ruby-bot/rspec/support/slack-ruby-bot/it_behaves_like_a_slack_bot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_examples 'a slack ruby bot' do
   context 'not configured' do
     before do

data/lib/slack-ruby-bot/rspec/support/slack-ruby-bot/not_respond.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
 
 RSpec::Matchers.define :not_respond do
   match do |actual|
-    client = if respond_to?(:client)
-               send(:client)
-             else
-               SlackRubyBot::Client.new
-             end
+    client = respond_to?(:client) ? send(:client) : SlackRubyBot::Client.new
 
     message_command = SlackRubyBot::Hooks::Message.new
     channel, user, message, attachments = parse(actual)

data/lib/slack-ruby-bot/rspec/support/slack-ruby-bot/respond_with_error.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
 
 RSpec::Matchers.define :respond_with_error do |error, error_message|
   match do |actual|
-    client = if respond_to?(:client)
-               send(:client)
-             else
-               SlackRubyBot::Client.new
-             end
+    client = respond_to?(:client) ? send(:client) : SlackRubyBot::Client.new
 
     message_command = SlackRubyBot::Hooks::Message.new
     channel, user, message, attachments = parse(actual)

data/lib/slack-ruby-bot/rspec/support/slack-ruby-bot/respond_with_slack_message.rb

@@ -1,33 +1,36 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
+
 RSpec::Matchers.define :respond_with_slack_message do |expected|
   include SlackRubyBot::SpecHelpers
+
   match do |actual|
     client = respond_to?(:client) ? send(:client) : SlackRubyBot::Client.new
-    def client.test_messages
-      @test_received_messages
-    end
-
-    def client.say(options = {})
-      super
-      @test_received_messages = @test_received_messages.nil? ? [] : @test_received_messages
-      @test_received_messages.push options
-    end
 
     message_command = SlackRubyBot::Hooks::Message.new
     channel, user, message, attachments = parse(actual)
 
     allow(Giphy).to receive(:random) if defined?(Giphy)
 
-    allow(client).to receive(:message)
+    allow(client).to receive(:message) do |options|
+      @messages ||= []
+      @messages.push options
+    end
+
     message_command.call(client, Hashie::Mash.new(text: message, channel: channel, user: user, attachments: attachments))
-    @messages = client.test_messages
-    expect(client).to have_received(:message).with(hash_including(channel: channel, text: expected)).once
+
+    matcher = have_received(:message).once
+    matcher = matcher.with(hash_including(channel: channel, text: expected)) if channel && expected
+
+    expect(client).to matcher
+
     true
   end
 
   failure_message do |_actual|
     message = "expected to receive message with text: #{expected} once,\n received:"
-    message += @messages.count.zero? ? 'No response messages received' : @messages.inspect
+    message += @messages&.any? ? @messages.inspect : 'none'
     message
   end
 end

data/lib/slack-ruby-bot/rspec/support/slack-ruby-bot/respond_with_slack_messages.rb

@@ -1,38 +1,47 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
+
 RSpec::Matchers.define :respond_with_slack_messages do |expected|
   include SlackRubyBot::SpecHelpers
+
   match do |actual|
-    raise ArgumentError, 'respond_with_slack_messages expects an array of ordered responses' unless expected.respond_to? :each
-    client = respond_to?(:client) ? send(:client) : SlackRubyBot::Client.new
-    def client.test_messages
-      @test_received_messages
-    end
+    raise ArgumentError, 'respond_with_slack_messages expects an array of ordered responses' if expected && !expected.respond_to?(:each)
 
-    def client.say(options = {})
-      super
-      @test_received_messages = @test_received_messages.nil? ? [] : @test_received_messages
-      @test_received_messages.push options
-    end
+    client = respond_to?(:client) ? send(:client) : SlackRubyBot::Client.new
 
     message_command = SlackRubyBot::Hooks::Message.new
     channel, user, message, attachments = parse(actual)
 
     allow(Giphy).to receive(:random) if defined?(Giphy)
 
-    allow(client).to receive(:message)
+    @messages ||= []
+    allow(client).to receive(:message) do |options|
+      @messages.push options
+    end
+
     message_command.call(client, Hashie::Mash.new(text: message, channel: channel, user: user, attachments: attachments))
-    @messages = client.test_messages
+
     @responses = []
-    expected.each do |exp|
-      @responses.push(expect(client).to(have_received(:message).with(hash_including(channel: channel, text: exp)).once))
+
+    if expected&.any?
+      expected.each do |exp|
+        @responses.push(expect(client).to(have_received(:message).with(hash_including(channel: channel, text: exp)).once))
+      end
+    else
+      expect(@messages.size).to be > 1
     end
+
     true
   end
+
   failure_message do |_actual|
-    message = ''
-    expected.each do |exp|
-      message += "Expected text: #{exp}, got #{@messages[expected.index(exp)] || 'No Response'}\n" unless @responses[expected.index(exp)]
+    if expected&.any?
+      expected.map do |exp|
+        "Expected text: #{exp}, got #{@messages[expected.index(exp)] || 'none'}" unless @responses[expected.index(exp)]
+      end.compact.join("\n")
+    else
+      "Expected to receive multiple messages, got #{@messages.any? ? @messages.size : 'none'}"
     end
-    message
   end
 end

data/lib/slack-ruby-bot/rspec/support/slack-ruby-bot/start_typing.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'rspec/expectations'
+
+RSpec::Matchers.define :start_typing do |expected|
+  include SlackRubyBot::SpecHelpers
+
+  match do |actual|
+    client = respond_to?(:client) ? send(:client) : SlackRubyBot::Client.new
+
+    message_command = SlackRubyBot::Hooks::Message.new
+
+    allow(client).to receive(:typing) do |options|
+      @test_options = options
+    end
+
+    channel, user, message, attachments = parse(actual)
+    message_command.call(client, Hashie::Mash.new(text: message, channel: channel, user: user, attachments: attachments))
+
+    matcher = have_received(:typing).once
+    matcher = matcher.with(expected) if expected&.any?
+    expect(client).to matcher
+
+    true
+  end
+
+  failure_message do |_actual|
+    message = "expected to receive typing with: #{expected} once,\n received:"
+    message += @test_options&.any? ? @test_options.inspect : ' none'
+    message
+  end
+end

data/lib/slack-ruby-bot/rspec/support/slack_api_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.before :all do
     ENV['SLACK_API_TOKEN'] ||= 'test'

data/lib/slack-ruby-bot/rspec/support/slack_ruby_bot_configure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.before :each do
     SlackRubyBot.configure do |c|

data/lib/slack-ruby-bot/rspec/support/spec_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module SpecHelpers
     private

data/lib/slack-ruby-bot/rspec/support/vcr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vcr'
 
 VCR.configure do |config|

data/lib/slack-ruby-bot/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   class Server
     include Loggable

data/lib/slack-ruby-bot/support/loggable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
   module Loggable
     def self.included(base)

data/lib/slack-ruby-bot/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackRubyBot
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.13.0'
 end

data/lib/slack_ruby_bot.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'slack-ruby-bot'

data/slack-ruby-bot.gemspec

@@ -1,4 +1,6 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'slack-ruby-bot/version'
 
 Gem::Specification.new do |s|
@@ -14,12 +16,13 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/slack-ruby/slack-ruby-bot'
   s.licenses = ['MIT']
   s.summary = 'The easiest way to write a Slack bot in Ruby.'
+  s.required_ruby_version = '>= 2.3'
   s.add_dependency 'hashie'
   s.add_dependency 'slack-ruby-client', '>= 0.14.0'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop', '0.58.2'
+  s.add_development_dependency 'rubocop', '0.80.1'
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'webmock'
 end