lita 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d6c55cacef1663c210df90ff03f764bca2c3b3
-  data.tar.gz: 4696fa739de19bb0a0245fd855666fe6a5622f31
+  metadata.gz: 845ed36dd80800a50d3ae7bde6d4a4bf1050beb5
+  data.tar.gz: a0c53a123d9ce7f9c62ac9e78f3804c8901df54d
 SHA512:
-  metadata.gz: 7701c02aa161e08559b50e1133ea1227cc79d53f4278a772ef274b090fceb9a9bad22a317263f067adfe036a336fc6d3ba6d0a546b014387e12f49cf46d52ec7
-  data.tar.gz: b4b212cee5587adaf06f0ad8944715b9653a678f041e18d71258bbc4d52864f5cf575c3fb010161325153a42d6bde5271f722202383c5a3ca48b035e2685d204
+  metadata.gz: bc1f3239cde3d0997f65a53cfae703f3c361fb5881630bdd4261268560350b953289e8144bebe60d07fecbe68230b71c28316e35afdfd9caac550a3ce69d446e
+  data.tar.gz: 0750dc9bf141a7f1b36a23fb4cbf2e04386c7f58757fa0cd72db279ee4b5a3accc9f9d6d3b42a1b1a4b0995930506a6d4f8390f2ba075c49dd960a61f58ffcc1

data/lib/lita.rb

@@ -1,6 +1,7 @@
 require "forwardable"
 require "logger"
 require "rbconfig"
+require "readline"
 require "set"
 require "shellwords"
 require "thread"

data/lib/lita/adapter.rb

@@ -89,7 +89,7 @@ module Lita
     # @return [void]
     # @abstract This should be implemented by the adapter.
     [:join, :part, :run, :send_messages, :set_topic, :shut_down].each do |method|
-      define_method(method) do
+      define_method(method) do |*_args|
         Lita.logger.warn(I18n.t("lita.adapter.method_not_implemented", method: method))
       end
     end

data/lib/lita/adapters/shell.rb

@@ -43,15 +43,29 @@ module Lita
         message
       end
 
+      def normalize_history(input)
+        if input == "" || (Readline::HISTORY.size >= 2 && input == Readline::HISTORY[-2])
+          Readline::HISTORY.pop
+        end
+      end
+
+      def normalize_input(input)
+        input.chomp.strip
+      end
+
+      def read_input
+        Readline.readline("#{robot.name} > ", true)
+      end
+
       def run_loop
         loop do
-          print "#{robot.name} > "
-          input = $stdin.gets
+          input = read_input
           if input.nil?
             puts
             break
           end
-          input = input.chomp.strip
+          input = normalize_input(input)
+          normalize_history(input)
           break if input == "exit" || input == "quit"
           robot.receive(build_message(input, @source))
         end

data/lib/lita/handler.rb

@@ -63,20 +63,26 @@ module Lita
       def dispatch(robot, message)
         routes.each do |route|
           next unless route_applies?(route, message, robot)
-
           log_dispatch(route)
-
-          begin
-            response = Response.new(message, route.pattern)
-            Lita.hooks[:trigger_route].each { |hook| hook.call(response: response, route: route) }
-            new(robot).public_send(route.method_name, response)
-          rescue Exception => e
-            log_dispatch_error(e)
-            raise e if rspec_loaded?
-          end
+          dispatch_to_route(route, robot, message)
         end
       end
 
+      # Dispatch directly to a {Route}, ignoring route conditions.
+      # @param route [Route] The route to invoke.
+      # @param robot [Lita::Robot] The currently running robot.
+      # @param message [Lita::Message] The incoming message.
+      # @return [void]
+      # @since 3.3.0
+      def dispatch_to_route(route, robot, message)
+        response = Response.new(message, route.pattern)
+        Lita.hooks[:trigger_route].each { |hook| hook.call(response: response, route: route) }
+        new(robot).public_send(route.method_name, response)
+      rescue Exception => e
+        log_dispatch_error(e)
+        raise e if rspec_loaded?
+      end
+
       # Creates a new {Lita::HTTPRoute} which is used to define an HTTP route
       # for the built-in web server.
       # @see Lita::HTTPRoute
@@ -157,7 +163,7 @@ module Lita
 
       # Determines whether or not an incoming messages should trigger a route.
       def route_applies?(route, message, robot)
-        RouteValidator.new(route, message, robot).call
+        RouteValidator.new(self, route, message, robot).call
       end
 
       # Checks if RSpec is loaded. If so, assume we are testing and let handler

data/lib/lita/handlers/info.rb

@@ -9,12 +9,16 @@ module Lita
 
       http.get "/lita/info", :web
 
-      # Replies with the current version of the Lita.
+      # Replies with the current version of Lita, the current version of Redis,
+      # and Redis memory usage.
       # @param response [Lita::Response] The response object.
       # @return [void]
       # @since 3.0.0
       def chat(response)
-        response.reply "Lita #{Lita::VERSION} - http://www.lita.io/"
+        response.reply(
+          %(Lita #{Lita::VERSION} - https://www.lita.io/),
+          %(Redis #{redis_version} - Memory used: #{redis_memory_usage})
+        )
       end
 
       # Returns JSON with basic information about the robot.
@@ -24,13 +28,30 @@ module Lita
       def web(_request, response)
         response.headers["Content-Type"] = "application/json"
         json = MultiJson.dump(
-          lita_version: Lita::VERSION,
           adapter: Lita.config.robot.adapter,
-          robot_name: robot.name,
-          robot_mention_name: robot.mention_name
+          lita_version: Lita::VERSION,
+          redis_memory_usage: redis_memory_usage,
+          redis_version: redis_version,
+          robot_mention_name: robot.mention_name,
+          robot_name: robot.name
         )
         response.write(json)
       end
+
+      # A hash of information about Redis.
+      def redis_info
+        @redis_info ||= redis.info
+      end
+
+      # The current version of Redis.
+      def redis_version
+        redis_info["redis_version"]
+      end
+
+      # The amount of memory Redis is using.
+      def redis_memory_usage
+        redis_info["used_memory_human"]
+      end
     end
 
     Lita.register_handler(Info)

data/lib/lita/route_validator.rb

@@ -2,6 +2,9 @@ module Lita
   # Determines if an incoming message should trigger a route.
   # @api private
   class RouteValidator
+    # The handler class the route belongs to.
+    attr_reader :handler
+
     # The incoming message.
     attr_reader :message
 
@@ -11,7 +14,8 @@ module Lita
     # The route being checked.
     attr_reader :route
 
-    def initialize(route, message, robot)
+    def initialize(handler, route, message, robot)
+      @handler = handler
       @route = route
       @message = message
       @robot = robot
@@ -20,11 +24,11 @@ module Lita
     # Returns a boolean indicating whether or not the route should be triggered.
     # @return [Boolean] Whether or not the route should be triggered.
     def call
-      return unless passes_route_hooks?(route, message, robot)
       return unless command_satisfied?(route, message)
       return if from_self?(message, robot)
       return unless matches_pattern?(route, message)
       return unless authorized?(message.user, route.required_groups)
+      return unless passes_route_hooks?(route, message, robot)
 
       true
     end
@@ -49,7 +53,7 @@ module Lita
     # Allow custom route hooks to reject the route
     def passes_route_hooks?(route, message, robot)
       Lita.hooks[:validate_route].all? do |hook|
-        hook.call(route: route, message: message, robot: robot)
+        hook.call(handler: handler, route: route, message: message, robot: robot)
       end
     end
 

data/lib/lita/rspec.rb

@@ -9,9 +9,6 @@ end
 major, *_unused = RSpec::Core::Version::STRING.split(/\./)
 abort I18n.t("lita.rspec.version_3_required") if major.to_i < 3
 
-major, minor, *_unused = RSpec::Mocks::Version::STRING.split(/\./)
-abort I18n.t("lita.rspec.mocks_expect_syntax_required") if major == "2" && minor.to_i < 14
-
 require_relative "rspec/handler"
 
 module Lita

data/lib/lita/version.rb

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

data/lita.gemspec

@@ -28,11 +28,12 @@ Gem::Specification.new do |spec|
   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_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.0.0.beta1"
+  spec.add_development_dependency "rspec", ">= 3.0.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"

data/spec/lita/adapters/shell_spec.rb

@@ -8,14 +8,13 @@ describe Lita::Adapters::Shell do
   describe "#run" do
     before do
       allow(subject).to receive(:puts)
-      allow(subject).to receive(:print)
-      allow($stdin).to receive(:gets).and_return("foo", "exit")
+      allow(Readline).to receive(:readline).and_return("foo", "exit")
       allow(robot).to receive(:trigger)
       allow(robot).to receive(:receive)
     end
 
     it "passes input to the Robot and breaks on an exit message" do
-      expect(subject).to receive(:print).with("#{robot.name} > ").twice
+      expect(Readline).to receive(:readline).with("#{robot.name} > ", true).twice
       expect(robot).to receive(:receive).with(an_instance_of(Lita::Message))
       subject.run
     end

data/spec/lita/handlers/info_spec.rb

@@ -10,20 +10,56 @@ describe Lita::Handlers::Info, lita_handler: true do
   describe "#chat" do
     it "responds with the current version of Lita" do
       send_command("info")
-      expect(replies.last).to include(Lita::VERSION)
+      expect(replies.first).to include(Lita::VERSION)
     end
 
     it "responds with a link to the website" do
       send_command("info")
-      expect(replies.last).to include("lita.io")
+      expect(replies.first).to include("lita.io")
+    end
+
+    it "responds with the Redis version and memory usage" do
+      send_command("info")
+      expect(replies.last).to match(/Redis [\d\.]+ - Memory used: [\d\.]+[BKMG]/)
     end
   end
 
   describe "#web" do
-    it "returns JSON with info about the running robot" do
+    let(:json) { MultiJson.load(response.body.join) }
+
+    it "returns JSON" do
       subject.web(request, response)
       expect(response.headers["Content-Type"]).to eq("application/json")
-      expect(response.body.join).to include(%("lita_version":"#{Lita::VERSION}"))
+    end
+
+    it "includes the current version of Lita" do
+      subject.web(request, response)
+      expect(json).to include("lita_version" => Lita::VERSION)
+    end
+
+    it "includes the adapter being used" do
+      subject.web(request, response)
+      expect(json).to include("adapter" => Lita.config.robot.adapter.to_s)
+    end
+
+    it "includes the robot's name" do
+      subject.web(request, response)
+      expect(json).to include("robot_name" => robot.name)
+    end
+
+    it "includes the robot's mention name" do
+      subject.web(request, response)
+      expect(json).to include("robot_mention_name" => robot.mention_name)
+    end
+
+    it "includes the Redis version" do
+      subject.web(request, response)
+      expect(json).to have_key("redis_version")
+    end
+
+    it "includes the Redis memory usage" do
+      subject.web(request, response)
+      expect(json).to have_key("redis_memory_usage")
     end
   end
 end

data/spec/spec_helper.rb

@@ -14,9 +14,6 @@ require "lita/rspec"
 RSpec.configure do |config|
   config.mock_with :rspec do |mocks_config|
     mocks_config.verify_doubled_constant_names = true
-    # Enable config option when a new rspec-mocks beta including this patch is released:
-    # https://github.com/rspec/rspec-mocks/pull/615
-    #
-    # mocks_config.verify_partial_doubles = true
+    mocks_config.verify_partial_doubles = true
   end
 end

data/templates/locales/en.yml

@@ -72,7 +72,6 @@ en:
     rspec:
       full_suite_required: Lita::RSpec requires both RSpec::Mocks and RSpec::Expectations.
       version_3_required: RSpec::Core 3 or greater is required to use Lita::RSpec.
-      mocks_expect_syntax_required: RSpec::Mocks 2.14 or greater is required to use Lita::RSpec.
       route_failure: |-
         Expected message "%{message}" to route to :%{route}, but didn't.
       negative_route_failure: |-

data/templates/plugin/gemspec.tt

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.0.0.beta2"
+  spec.add_development_dependency "rspec", ">= 3.0.0"
   <%- if config[:coveralls] -%>
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement