lita 4.6.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 411c330d69cc62203d31374e506722511a8582aa
-  data.tar.gz: 36b57d4429140175ab4baa79a322dc13beac79c0
+SHA256:
+  metadata.gz: 055bddddd7e8a6659039339de7eed646d12916e70869ca54be4e5d3547ec39fb
+  data.tar.gz: 4765f8c35b5e3f8deec77a3ea6a7a4333e4ce6220adefc713df7d51e966dc175
 SHA512:
-  metadata.gz: 287c23415f235842e613290b117557624affe4e1357430e873128066f719d6a7d79fd1847a52a97c30b91d40d8a7a1cf6287c2044a05f619749d023bee55fd78
-  data.tar.gz: 4a44d63d33e8420f474a48ef63311f4f324f272da4dedf60399e86ee3f69b7a1c9f29d61adb092a18759e1b1341ede9fe31b57026666d1f118668e138fbe3b5e
+  metadata.gz: 6ebf1592790f08cebd83768ab4cecb872ca33f200ad0b79d1de7e8e2495d28f5a8757054e3c4b641d199453be3aec8e8414b5e4c216c5c6df1fa9be98ac3d873
+  data.tar.gz: a5cee53960718b60109d95480bba07c8950ae42ec386169f87e9cbc18f7e91bfcaa85e1fdf609f76531080d8ef6639050d6d06b611cec3e29c23f49d528797f0

data/.travis.yml

@@ -2,19 +2,18 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - jruby-9.0.0.0
-  - rbx-2
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby
 matrix:
   allow_failures:
     - rvm: jruby-9.0.0.0
-    - rvm: rbx-2
   fast_finish: true
-script: bundle exec rake
+script: script/ci
 before_install:
   - gem update --system
+  - gem update bundler
 services:
   - redis-server
 branches:

data/Rakefile

@@ -1,8 +1 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "rubocop/rake_task"
-
-RSpec::Core::RakeTask.new
-RuboCop::RakeTask.new
-
-task default: [:spec, :rubocop]

data/lib/lita/adapter.rb

@@ -47,7 +47,7 @@ module Lita
       # @param hash [Hash] An optional hash of values to be interpolated in the string.
       # @return [String] The translated string.
       def translate(key, hash = {})
-        I18n.translate("lita.adapters.#{namespace}.#{key}", hash)
+        I18n.translate("lita.adapters.#{namespace}.#{key}", **hash)
       end
 
       alias_method :t, :translate

data/lib/lita/common.rb

@@ -12,7 +12,12 @@ module Lita
       I18n.reload!
     end
 
-    # Sets I18n.locale, normalizing the provided locale name.
+    # Sets +I18n.locale+, normalizing the provided locale name.
+    #
+    # Note that setting this only affects the current thread. Since handler
+    # methods are dispatched in new threads, changing the locale globally will
+    # require calling this method at the start of every handler method.
+    # Alternatively, use {Lita#default_locale=} which will affect all threads.
     # @param new_locale [Symbol, String] The code of the locale to use.
     # @return [void]
     # @since 3.0.0
@@ -20,6 +25,16 @@ module Lita
       I18n.locale = new_locale.to_s.tr("_", "-")
     end
 
+    # Sets +I18n.default_locale+, normalizing the provided locale name.
+    #
+    # This is preferred over {Lita#locale=} as it affects all threads.
+    # @param new_locale [Symbol, String] The code of the locale to use.
+    # @return [void]
+    # @since 4.8.0
+    def default_locale=(new_locale)
+      I18n.default_locale = new_locale.to_s.tr("_", "-")
+    end
+
     # The absolute path to Lita's templates directory.
     # @return [String] The path.
     # @since 3.0.0
@@ -33,3 +48,4 @@ I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
 Lita.load_locales(Dir[File.join(Lita.template_root, "locales", "*.yml")])
 I18n.enforce_available_locales = false
 Lita.locale = ENV["LANG"] unless ENV["LANG"].nil?
+Lita.default_locale = ENV["LANG"] unless ENV["LANG"].nil?

data/lib/lita/config.rb

@@ -43,6 +43,7 @@ module Lita
         config.robot.name = "Lita"
         config.robot.adapter = :shell
         config.robot.locale = I18n.locale
+        config.robot.default_locale = I18n.default_locale
         config.robot.log_level = :info
         config.robot.admins = nil
         config.robot.log_formatter = nil

data/lib/lita/default_configuration.rb

@@ -131,6 +131,7 @@ module Lita
         config :alias, type: String
         config :adapter, types: [String, Symbol], default: :shell
         config :locale, types: [String, Symbol], default: I18n.locale
+        config :default_locale, types: [String, Symbol], default: I18n.default_locale
         config :log_level, types: [String, Symbol], default: :info do
           validate do |value|
             unless LOG_LEVELS.include?(value.to_s.downcase.strip)

data/lib/lita/handler/common.rb

@@ -33,7 +33,7 @@ module Lita
         # @return [String] The translated string.
         # @since 3.0.0
         def translate(key, hash = {})
-          I18n.translate("lita.handlers.#{namespace}.#{key}", hash)
+          I18n.translate("lita.handlers.#{namespace}.#{key}", **hash)
         end
 
         alias_method :t, :translate

data/lib/lita/handlers/info.rb

@@ -40,7 +40,11 @@ module Lita
 
       # A hash of information about Redis.
       def redis_info
-        @redis_info ||= redis.info
+        @redis_info ||= begin
+          r = redis.redis
+          r = r.redis while r.respond_to?(:redis)
+          r.info
+        end
       end
 
       # The current version of Redis.

data/lib/lita/message.rb

@@ -11,6 +11,11 @@ module Lita
     # @return [Lita::Source] The message source.
     attr_reader :source
 
+    # A hash of arbitrary data that can be populated by Lita adapters and extensions.
+    # @return [Hash] The extension data.
+    # @since 4.7.0
+    attr_reader :extensions
+
     # @!method user
     #   The user who sent the message.
     #   @return [Lita::User] The user.
@@ -34,6 +39,7 @@ module Lita
       @robot = robot
       @body = body
       @source = source
+      @extensions = {}
 
       name_pattern = "@?#{Regexp.escape(@robot.mention_name)}[:,]?\\s+"
       alias_pattern = "#{Regexp.escape(@robot.alias)}\\s*" if @robot.alias

data/lib/lita/rspec/handler.rb

@@ -64,7 +64,6 @@ module Lita
             let(:robot) { Robot.new(registry) }
             let(:source) { Source.new(user: user) }
             let(:user) { User.create("1", name: "Test User") }
-            let(:replies) { robot.chat_service.sent_messages }
           end
         end
 
@@ -76,6 +75,12 @@ module Lita
         end
       end
 
+      # An array of strings that have been sent by the robot during the course of a test.
+      # @return [Array<String>] The replies.
+      def replies
+        robot.chat_service.sent_messages
+      end
+
       # Sends a message to the robot.
       # @param body [String] The message to send.
       # @param as [Lita::User] The user sending the message.

data/lib/lita/template.rb

@@ -23,7 +23,7 @@ module Lita
 
     # @param source [String] A string to use as the template's content.
     def initialize(source)
-      @erb = ERB.new(source, $SAFE, "<>")
+      @erb = ERB.new(source, trim_mode: "<>")
       self.helpers = Set.new
     end
 

data/lib/lita/version.rb

@@ -1,4 +1,4 @@
 module Lita
   # The current version of Lita.
-  VERSION = "4.6.0"
+  VERSION = "4.8.0"
 end

data/lita.gemspec

@@ -18,23 +18,23 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_runtime_dependency "bundler", ">= 1.3"
-  spec.add_runtime_dependency "faraday", ">= 0.8.7"
-  spec.add_runtime_dependency "http_router", ">= 0.11.2"
-  spec.add_runtime_dependency "ice_nine", ">= 0.11.0"
-  spec.add_runtime_dependency "i18n", ">= 0.6.9"
-  spec.add_runtime_dependency "multi_json", ">= 1.7.7"
-  spec.add_runtime_dependency "puma", ">= 2.7.1"
-  spec.add_runtime_dependency "rack", ">= 1.5.2"
-  spec.add_runtime_dependency "rb-readline", ">= 0.5.1"
-  spec.add_runtime_dependency "redis-namespace", ">= 1.3.0"
-  spec.add_runtime_dependency "thor", ">= 0.18.1"
+  spec.add_runtime_dependency "bundler", ">= 2.0"
+  spec.add_runtime_dependency "faraday", ">= 1.0"
+  spec.add_runtime_dependency "http_router", ">= 0.11"
+  spec.add_runtime_dependency "ice_nine", ">= 0.11"
+  spec.add_runtime_dependency "i18n", ">= 1.8"
+  spec.add_runtime_dependency "multi_json", ">= 1.15"
+  spec.add_runtime_dependency "puma", ">= 4.3"
+  spec.add_runtime_dependency "rack", ">= 2.2"
+  spec.add_runtime_dependency "rb-readline", ">= 0.5"
+  spec.add_runtime_dependency "redis-namespace", ">= 1.7"
+  spec.add_runtime_dependency "thor", ">= 1.0"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rspec", ">= 3.0.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"

data/script/ci

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+bundle exec rspec
+bundle exec rubocop

data/spec/lita/configuration_builder_spec.rb

@@ -3,6 +3,15 @@ require "spec_helper"
 describe Lita::ConfigurationBuilder do
   let(:config) { subject.build }
 
+  # For some reason RSpec is no longer capturing tracebacks to
+  # stderr, so we do it manually to avoid cluttering the test output.
+  around do |example|
+    stderr = $stderr
+    $stderr = StringIO.new
+    example.run
+    $stderr = stderr
+  end
+
   describe ".load_user_config" do
     it "loads and evals lita_config.rb" do
       allow(File).to receive(:exist?).and_return(true)

data/spec/lita/default_configuration_spec.rb

@@ -233,6 +233,16 @@ describe Lita::DefaultConfiguration, lita: true do
       expect(config.robot.locale).to eq(:es)
     end
 
+    it "has a default default locale" do
+      expect(config.robot.default_locale).to eq(I18n.default_locale)
+    end
+
+    it "can set a default locale" do
+      config.robot.default_locale = :es
+
+      expect(config.robot.default_locale).to eq(:es)
+    end
+
     it "has a default log level" do
       expect(config.robot.log_level).to eq(:info)
     end

data/spec/lita/handler/http_router_spec.rb

@@ -92,7 +92,7 @@ describe handler, lita_handler: true do
     it "calls the error handler with the exception as argument" do
       expect(registry.config.robot.error_handler).to receive(:call).with(instance_of(TypeError))
 
-      expect { http.get("/boom") }.to raise_error(TypeError, "String can't be coerced into Fixnum")
+      expect { http.get("/boom") }.to raise_error(TypeError, "String can't be coerced into Integer")
     end
   end
 end

data/spec/lita/message_spec.rb

@@ -21,6 +21,14 @@ describe Lita::Message do
     expect(subject.source).to eq(source)
   end
 
+  describe "#extensions" do
+    it "can be populated with arbitrary data" do
+      subject.extensions[:foo] = :bar
+
+      expect(subject.extensions[:foo]).to eq(:bar)
+    end
+  end
+
   describe "#args" do
     it "returns an array of the 2nd through nth word in the message" do
       subject = described_class.new(robot, "args foo bar", source)

data/spec/lita/robot_spec.rb

@@ -77,6 +77,15 @@ describe Lita::Robot, lita: true do
   describe "#run" do
     let(:thread) { instance_double("Thread", :abort_on_exception= => true, join: nil) }
 
+    # For some reason RSpec is no longer capturing tracebacks to
+    # stderr, so we do it manually to avoid cluttering the test output.
+    around do |example|
+      stderr = $stderr
+      $stderr = StringIO.new
+      example.run
+      $stderr = stderr
+    end
+
     before do
       allow_any_instance_of(Lita::Adapters::Shell).to receive(:run)
       allow_any_instance_of(Puma::Server).to receive(:run)

data/spec/lita/rspec_spec.rb

@@ -117,6 +117,12 @@ describe handler_class, lita_handler: true do
       send_message("message")
       expect(replies).to eq(["Test User"])
     end
+
+    it "does not memoize #replies on first access" do
+      replies
+      send_message("message")
+      expect(replies).to eq(["Test User"])
+    end
   end
 
   describe "#channel" do

data/spec/lita_spec.rb

@@ -58,6 +58,13 @@ describe Lita do
     end
   end
 
+  describe ".default_locale=" do
+    it "sets I18n.default_locale to the normalized locale" do
+      expect(I18n).to receive(:default_locale=).with("zh-TW")
+      described_class.default_locale = "zh_TW"
+    end
+  end
+
   describe ".redis" do
     let(:redis_namespace) { instance_double("Redis") }
 
@@ -84,8 +91,15 @@ describe Lita do
       around do |example|
         test_mode = Lita.test_mode?
         Lita.test_mode = false
+
+        stderr = $stderr
+        $stderr = StringIO.new
+
         example.run
+
         Lita.test_mode = test_mode
+
+        $stderr = stderr
       end
 
       it "logs a fatal warning and raises an exception if it can't connect to Redis" do

data/spec/spec_helper.rb

@@ -1,9 +1,4 @@
 require "simplecov"
-require "coveralls"
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
 SimpleCov.start { add_filter "/spec/" }
 
 require "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Jimmy Cuadra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,154 +16,154 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: http_router
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +332,7 @@ files:
 - lib/lita/util.rb
 - lib/lita/version.rb
 - lita.gemspec
+- script/ci
 - spec/lita/adapter_spec.rb
 - spec/lita/adapters/shell_spec.rb
 - spec/lita/authorization_spec.rb
@@ -390,7 +391,7 @@ homepage: https://github.com/jimmycuadra/lita
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -398,16 +399,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: ChatOps framework for Ruby. Lita is a robot companion for your chat room.
 test_files:
@@ -450,4 +450,3 @@ test_files:
 - spec/templates/basic.irc.erb
 - spec/templates/helpers.erb
 - spec/templates/interpolated.erb
-has_rdoc: