lita 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 587288247dc60338bb91eb3914f9d40d3ca8a59a
-  data.tar.gz: d015472e6b10d7cecc199b89e4164d8430297f06
+  metadata.gz: 21f001a7ad45ff1f2e3a87b07a5eecdc94c27669
+  data.tar.gz: 8e1369a2294bc07f39f0a360daa1b07ba4d4d3d5
 SHA512:
-  metadata.gz: 506d911b55c472c89625f9de45a6d22054b958ad68092e1d873844e4b453c77ed6c635b5c8447a5405ebec0249e4b21dd7d35ef1393b948802ccbb6a583d68bb
-  data.tar.gz: 0ea3074f7d44da4b24f8440ecf909aa9b7b5ee1b1c011f603d57e6f9c97e4b7288d24ac210d042c56b9471990db74aa028034a5b54745f27e9f17054bc683b9e
+  metadata.gz: 19cb7bc31c045032d5dad49affce04967068ad982288ac63b10374542ad81364daba7fbde3ac2e1d71231b42bc8722e0fcb7d2229f3173b91c22993d95d999f3
+  data.tar.gz: 1ab1fd0f6b5b81bd1193dfcd2793a15279fb790211988aa6261870a793768f70e7db3ce46923548c27306c173532ac0fc84545ce5bcb4b596281ef05ed211008

data/lib/lita.rb

@@ -52,12 +52,16 @@ module Lita
           begin
             client.ping
           rescue Redis::BaseError => e
-            Lita.logger.fatal I18n.t(
-              "lita.redis.exception",
-              message: e.message,
-              backtrace: e.backtrace.join("\n")
-            )
-            abort
+            if Lita.test_mode?
+              raise RedisError, I18n.t("lita.redis.test_mode_exception", message: e.message)
+            else
+              Lita.logger.fatal I18n.t(
+                "lita.redis.exception",
+                message: e.message,
+                backtrace: e.backtrace.join("\n")
+              )
+              abort
+            end
           end
         end
       end

data/lib/lita/errors.rb

@@ -7,4 +7,8 @@ module Lita
   # violated by the default value of the attribute.
   # @since 4.0.0
   class ValidationError < Error; end
+
+  # An exception raised when Lita can't connect to Redis in test mode.
+  # @since 4.0.3
+  class RedisError < Error; end
 end

data/lib/lita/version.rb

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

data/spec/lita_spec.rb

@@ -75,11 +75,25 @@ describe Lita do
       expect(described_class.redis).to eql(described_class.redis)
     end
 
-    it "logs a fatal warning and raises an exception if it can't connection to Redis" do
+    it "raises a RedisError if it can't connect to Redis" do
       allow(redis_namespace).to receive(:ping).and_raise(Redis::CannotConnectError)
+      expect { Lita.redis }.to raise_error(Lita::RedisError, /could not connect to Redis/)
+    end
+
+    context "with test mode off" do
+      around do |example|
+        test_mode = Lita.test_mode?
+        Lita.test_mode = false
+        example.run
+        Lita.test_mode = test_mode
+      end
 
-      expect(Lita.logger).to receive(:fatal)
-      expect { Lita.redis }.to raise_error(SystemExit)
+      it "logs a fatal warning and raises an exception if it can't connect to Redis" do
+        allow(redis_namespace).to receive(:ping).and_raise(Redis::CannotConnectError)
+
+        expect(Lita.logger).to receive(:fatal)
+        expect { Lita.redis }.to raise_error(SystemExit)
+      end
     end
   end
 

data/templates/locales/en.yml

@@ -113,6 +113,9 @@ en:
         %{message}
         Full backtrace:
         %{backtrace}
+      test_mode_exception: |
+        Lita could not connect to Redis. The exception was:
+        %{message}
     robot:
       unknown_adapter: "Unknown adapter: :%{adapter}."
     rspec:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler