lita 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84bc810d10e1bb7f969577c1670a4c9c72e0ffbb
-  data.tar.gz: 81b164c6c02ad46b14002c2ac9beac67755802f0
+  metadata.gz: 82c5e0d68ab472c4415df6cad75ebdf1fe52fd56
+  data.tar.gz: 7d7ff0871dbc15991a0edb9cf1526a4c49d53366
 SHA512:
-  metadata.gz: dfff3d4d0fd43f3efb59ce330c7d7f06e1220f873b46ca3e0e2b15b2eb038aa8737bcd0b036c05094fbab2849cef40236883c703ee8d0e54b8c0f3b242e79b72
-  data.tar.gz: 86802672a9ee263a436dfc4a3f75dcacf14a6fb7e635999cb7ef62d1d12dac7d7623a36e643c3a5941471ff23525c6cc6da8bf065fc2f2436f3647082ca6c7fe
+  metadata.gz: 6326e3526c0a63f9cba4a8b0fadbed2312a3c29321e3833e1b4ddaedd10ee7dbfa5cc060c4c115ca3c8251b150aa0fb5bad8ea9174376429c23281ec710d8632
+  data.tar.gz: 21f439582fe5b648ba954924ee9743b29a7a50f457507a7f5966f586eca96f9845d608f584a57d7c4f3d54d0fbfcdd535c235a89192183a479143595cdd3b8e7

data/lib/lita.rb

@@ -75,6 +75,7 @@ module Lita
       ConfigurationBuilder.load_user_config(config_path)
       ConfigurationBuilder.freeze_config(config)
       ConfigurationValidator.new(self).call
+      hooks[:config_finalized].each { |hook| hook.call(config_path: config_path) }
       self.locale = config.robot.locale
       Robot.new.run
     end

data/lib/lita/cli.rb

@@ -90,8 +90,9 @@ module Lita
     # @param name [String] The name for the new adapter.
     # @return [void]
     def adapter(name)
-      generate_templates(generate_config(name, "adapter"))
-      license_message
+      config = generate_config(name, "adapter")
+      generate_templates(config)
+      post_messages(config)
     end
 
     desc "handler NAME", "Generates a new Lita handler"
@@ -99,8 +100,9 @@ module Lita
     # @param name [String] The name for the new handler.
     # @return [void]
     def handler(name)
-      generate_templates(generate_config(name, "handler"))
-      license_message
+      config = generate_config(name, "handler")
+      generate_templates(config)
+      post_messages(config)
     end
 
     desc "extension NAME", "Generates a new Lita extension"
@@ -108,8 +110,9 @@ module Lita
     # @param name [String] The name for the new extension.
     # @return [void]
     def extension(name)
-      generate_templates(generate_config(name, "extension"))
-      license_message
+      config = generate_config(name, "extension")
+      generate_templates(config)
+      post_messages(config)
     end
 
     desc "version", "Outputs the current version of Lita"
@@ -122,6 +125,10 @@ module Lita
 
     private
 
+    def badges_message
+      say I18n.t("lita.cli.badges_reminder"), :yellow
+    end
+
     def generate_config(name, plugin_type)
       name, gem_name = normalize_names(name)
       constant_name = name.split(/_/).map(&:capitalize).join
@@ -198,10 +205,24 @@ module Lita
     end
 
     def optional_content
+      travis = yes?(I18n.t("lita.cli.travis_question"))
+      coveralls = yes?(I18n.t("lita.cli.coveralls_question"))
+      if travis || coveralls
+        say I18n.t("lita.cli.badges_message")
+        badges = yes?(I18n.t("lita.cli.badges_question"))
+        github_user = ask(I18n.t("lita.cli.github_user_question")) if badges
+      end
       {
-        travis: yes?(I18n.t("lita.cli.travis_question")),
-        coveralls: yes?(I18n.t("lita.cli.coveralls_question"))
+        travis: travis,
+        coveralls: coveralls,
+        badges: badges,
+        github_user: github_user
       }
     end
+
+    def post_messages(config)
+      license_message
+      badges_message if config[:badges]
+    end
   end
 end

data/lib/lita/default_configuration.rb

@@ -139,6 +139,11 @@ module Lita
           end
         end
         config :admins
+        config :error_handler, default: -> (_error) {} do
+          validate do |value|
+            "must respond to #call" unless value.respond_to?(:call)
+          end
+        end
       end
     end
   end

data/lib/lita/handler/chat_router.rb

@@ -88,6 +88,7 @@ module Lita
         route.callback.call(handler, response)
       rescue Exception => e
         log_dispatch_error(e)
+        robot.config.robot.error_handler.call(e)
         raise e if Lita.test_mode?
       end
 

data/lib/lita/http_callback.rb

@@ -18,9 +18,14 @@ module Lita
       if request.head?
         response.status = 204
       else
-        handler = @handler_class.new(env["lita.robot"])
+        begin
+          handler = @handler_class.new(env["lita.robot"])
 
-        @callback.call(handler, request, response)
+          @callback.call(handler, request, response)
+        rescue Exception => e
+          env["lita.robot"].config.robot.error_handler.call(e)
+          raise
+        end
       end
 
       response.finish

data/lib/lita/rspec/handler.rb

@@ -28,10 +28,16 @@ module Lita
         def prepare_handlers(base)
           base.class_eval do
             before do
+              handlers = Set.new(
+                [described_class] + Array(base.metadata[:additional_lita_handlers])
+              )
+
               if Lita.version_3_compatibility_mode?
-                allow(Lita).to receive(:handlers).and_return(Set.new([described_class]))
+                allow(Lita).to receive(:handlers).and_return(handlers)
               else
-                registry.register_handler(described_class)
+                handlers.each do |handler|
+                  registry.register_handler(handler)
+                end
               end
             end
           end

data/lib/lita/version.rb

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

data/spec/lita/handler/chat_router_spec.rb

@@ -157,6 +157,8 @@ handler = Class.new do
     "Test"
   end
 
+  route(/boom/) { |_response| 1 + "2" }
+
   route(/one/) { |response| response.reply "got one" }
   route(/two/) { |response| response.reply "got two" }
 
@@ -189,4 +191,12 @@ describe handler, lita_handler: true do
       expect(replies.last).to eq("got three")
     end
   end
+
+  context "when the handler raises an exception" 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 { send_message("boom!") }.to raise_error(TypeError)
+    end
+  end
 end

data/spec/lita/handler/http_router_spec.rb

@@ -13,6 +13,7 @@ handler = Class.new do
   http.get ":var/otherwise/identical/path", :no_constraint
   http.get("block") { |_request, response| response.write("block") }
   http.get "middleware", :middleware
+  http.get "boom", :boom
 
   def web(_request, response)
     response.write("it worked")
@@ -40,6 +41,10 @@ handler = Class.new do
     response["Custom-Header"] = request.env["header_value"] if request.env["use_header"]
     response.write("middleware worked") if request.env["custom_rack_middleware_working"]
   end
+
+  def boom(_request, _response)
+    1 + "2"
+  end
 end
 
 describe handler, lita_handler: true do
@@ -82,6 +87,14 @@ describe handler, lita_handler: true do
     expect(response.status).to eq(200)
     expect(response.body).to eq("block")
   end
+
+  context "when the handler raises an exception" 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")
+    end
+  end
 end
 
 describe handler, lita_handler: true do

data/spec/lita/rspec/handler_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+handler_class = Class.new(Lita::Handler) do
+  namespace "testclass"
+
+  def self.name
+    "Lita::Handlers::Test"
+  end
+end
+
+additional_handler_class = Class.new(Lita::Handler) do
+  namespace "testclass"
+
+  config :test_property, type: String, default: "a string"
+
+  def self.name
+    "Lita::Handlers::TestBase"
+  end
+end
+
+describe handler_class, lita_handler: true, additional_lita_handlers: additional_handler_class do
+  context 'when the "additional_lita_handlers" metadata is provided' do
+    it "loads additional handlers into the registry" do
+      expect(registry.handlers).to include(additional_handler_class)
+    end
+
+    it "populates config from additional handlers" do
+      expect(registry.config.handlers.testclass.test_property).to eq("a string")
+    end
+  end
+end

data/spec/lita_spec.rb

@@ -176,6 +176,12 @@ describe Lita do
       described_class.run("path/to/config")
     end
 
+    it "calls config_finalized hooks" do
+      described_class.register_hook(:config_finalized, hook)
+      expect(hook).to receive(:call).with(config_path: "path/to/config")
+      described_class.run("path/to/config")
+    end
+
     it "raises if the configuration is not valid" do
       allow(validator).to receive(:call).and_raise(SystemExit)
 

data/templates/locales/en.yml

@@ -76,6 +76,15 @@ en:
         to the root of the repository.
 
         Common open source software licenses can be found at http://choosealicense.com/.
+      badges_message: >-
+        If your plugin's Git repository will be hosted on GitHub, build status and code coverage
+        badges can be automatically added to your README.
+      badges_question: >-
+        Would you like to add these badges? ("yes" or "no", default is "no")
+      github_user_question: What is your GitHub username?
+      badges_reminder: >-
+        Remember, for badges to be displayed in your plugin's README, you must host your project on
+        GitHub. Additionally, you will need to configure the project on Travis CI and Coveralls.io.
     config:
       adapter_deprecated:
         config.adapter is deprecated and will be removed in Lita 5.0. Use config.adapters instead.

data/templates/plugin/README.tt

@@ -1,5 +1,16 @@
 # <%= config[:gem_name] %>
 
+<%- if config[:badges] -%>
+<%- if config[:travis] -%>
+[![Build Status](https://travis-ci.org/<%= config[:github_user] %>/<%= config[:gem_name] %>.png?branch=master)](https://travis-ci.org/<%= config[:github_user] %>/<%= config[:gem_name] %>)
+<%- end -%>
+<%- if config[:coveralls] -%>
+[![Coverage Status](https://coveralls.io/repos/<%= config[:github_user] %>/<%= config[:gem_name] %>/badge.png)](https://coveralls.io/r/<%= config[:github_user] %>/<%= config[:gem_name] %>)
+<%- end -%>
+<%- if config[:travis] || config[:coveralls] -%>
+
+<%- end -%>
+<%- end -%>
 TODO: Add a description of the plugin.
 
 ## Installation
@@ -27,7 +38,3 @@ TODO: Describe any configuration attributes the plugin exposes.
 ## Usage
 
 TODO: Describe the plugin's features and how to use them.
-
-## License
-
-[MIT](http://opensource.org/licenses/MIT)

data/templates/plugin/gemspec.tt

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.description   = "TODO: Add a description"
   spec.summary       = "TODO: Add a summary"
   spec.homepage      = "TODO: Add a homepage"
-  spec.license       = "MIT"
+  spec.license       = "TODO: Add a license"
   spec.metadata      = { "lita_plugin_type" => "<%= config[:plugin_type] %>" }
 
   spec.files         = `git ls-files`.split($/)
@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "lita", ">= <%= config[:required_lita_version] %>"
 
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rspec", ">= 3.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -354,6 +354,7 @@ files:
 - spec/lita/plugin_builder_spec.rb
 - spec/lita/response_spec.rb
 - spec/lita/robot_spec.rb
+- spec/lita/rspec/handler_spec.rb
 - spec/lita/rspec_spec.rb
 - spec/lita/source_spec.rb
 - spec/lita/template_resolver_spec.rb
@@ -430,6 +431,7 @@ test_files:
 - spec/lita/plugin_builder_spec.rb
 - spec/lita/response_spec.rb
 - spec/lita/robot_spec.rb
+- spec/lita/rspec/handler_spec.rb
 - spec/lita/rspec_spec.rb
 - spec/lita/source_spec.rb
 - spec/lita/template_resolver_spec.rb