lita-travis 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1072692efa24f4d512b195af6168c21e114716e
-  data.tar.gz: ec64ee981f77169dc2bdb4d86dde83c6f9201f82
+  metadata.gz: 281766fc85013339455d961b7e50a8d474652096
+  data.tar.gz: 6344a3fdf756025ef3c61b0320b67cf4bfa3ac28
 SHA512:
-  metadata.gz: 1181b5516fa27600b97c46a30e444ff557c099c64286b15e56eaf0722d77d66b706903400b9c0209edb1d48409ff24f74da9959b3b696f2fd96ba2ccad2d1592
-  data.tar.gz: f226287b1396ac42cec81af17a0a4ee63373f10bb5fa35df272f3a61a4d62f0c74b7b8ca96a6577d8ffad6fe95e983bacec5cb66c5b286c4afb5b780ed80dd4b
+  metadata.gz: e58c006f89c8bc6fa830e06c89761a63e512e12c7df7767868c6494f67d96244ff729e26f757dcf1a65ba1924921a91972596b5526e9426aa8729983303ae8f9
+  data.tar.gz: bdafa443957cad73565a555b140f9d8e15f86b85990860379b48dbecf75b9254580917be1b7bf1e2fcacc5031d837f26e1e57a6085e33511af9d5f1f7f970108

data/README.md

@@ -22,7 +22,8 @@ gem "lita-travis"
 
 ### Optional attributes
 
-* `repos` (Hash) - A map of repositories to allow notifications for and the chat rooms to post them in. The keys should be strings in the format "github_username/repository_name" and the values should be either a string room name or an array of string room names. Default: `{}`.
+* `repos` (Hash) - A hash of repositories names and the chat rooms to post their notifications in. The keys should be strings in the format "github_username/repository_name" and the values should be either a string room name or an array of string room names. Default: `{}`.
+* `default_rooms` (String, Array<String>) - A string room name or an array of string room names where notifications for repositories not explicitly specified in the `repos` hash should be sent. If `nil`, notifications for unknown repositories will be ignored. Default: `nil`.
 
 ### Example
 
@@ -30,9 +31,10 @@ gem "lita-travis"
 Lita.configure do |config|
   config.handlers.travis.token = "abcdefg123"
   config.handlers.travis.repos = {
-    "username/repo1" => "#someroom",
-    "username/repo2" => ["#someroom", "#someotherroom"]
+    "username/repo1" => "#repo1_team",
+    "username/repo2" => ["#repo2_team", "#other_team"]
   }
+  config.handlers.travis.default_rooms = "#engineering"
 end
 ```
 

data/lib/lita/handlers/travis.rb

@@ -9,6 +9,7 @@ module Lita
       def self.default_config(config)
         config.token = nil
         config.repos = {}
+        config.default_rooms = nil
       end
 
       http.post "/travis", :receive
@@ -26,9 +27,7 @@ module Lita
         begin
           MultiJson.load(json)
         rescue MultiJson::LoadError => e
-          Lita.logger.error(
-            "Could not parse JSON payload from Travis CI: #{e.message}"
-          )
+          Lita.logger.error(t("parse_error", message: e.message))
           return
         end
       end
@@ -39,11 +38,16 @@ module Lita
 
       def notify_rooms(repo, data)
         rooms = rooms_for_repo(repo) or return
-        message = <<-MSG.chomp
-[Travis CI] #{repo}: #{data["status_message"]} at \
-#{data["commit"][0...7]} (#{data["branch"]}) by #{data["committer_name"]} \
-- #{data["compare_url"]}
-        MSG
+
+        message = t(
+          "message",
+          repo: repo,
+          status_message: data["status_message"],
+          commit: data["commit"][0...7],
+          branch: data["branch"],
+          committer_name: data["committer_name"],
+          compare_url: data["compare_url"]
+        )
 
         rooms.each do |room|
           target = Source.new(room: room)
@@ -53,13 +57,14 @@ module Lita
 
       def rooms_for_repo(repo)
         rooms = Lita.config.handlers.travis.repos[repo]
+        default_rooms = Lita.config.handlers.travis.default_rooms
 
         if rooms
           Array(rooms)
+        elsif default_rooms
+          Array(default_rooms)
         else
-          Lita.logger.warn <<-WARNING.chomp
-Notification from Travis CI for unconfigured project: #{repo}
-WARNING
+          Lita.logger.warn(t("no_room_configured"), repo: repo)
           return
         end
       end
@@ -68,17 +73,12 @@ WARNING
         token = Lita.config.handlers.travis.token
 
         unless token
-          Lita.logger.warn <<-WARNING.chomp
-Notification from Travis CI could not be validated because \
-Lita.config.handlers.token is not set.
-          WARNING
+          Lita.logger.warn(t("no_token"))
           return
         end
 
         unless Digest::SHA2.hexdigest("#{repo}#{token}") == auth_hash
-          Lita.logger.warn <<-WARNING.chomp
-Notification from Travis CI did not pass authentication.
-          WARNING
+          Lita.logger.warn(t("auth_failed"), repo: repo)
           return
         end
 
@@ -89,3 +89,7 @@ Notification from Travis CI did not pass authentication.
     Lita.register_handler(Travis)
   end
 end
+
+Lita.load_locales Dir[File.expand_path(
+  File.join("..", "..", "..", "..", "locales", "*.yml"), __FILE__
+)]

data/lita-travis.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-travis"
-  spec.version       = "0.1.2"
+  spec.version       = "0.2.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{A Lita handler for receiving notifications from Travis CI.}

data/locales/en.yml

@@ -0,0 +1,15 @@
+en:
+  lita:
+    handlers:
+      travis:
+        auth_failed: "Notification from Travis CI for %{repo} did not pass authentication."
+        parse_error: "Could not parse JSON payload from Travis CI: %{message}"
+        message: >-
+          [Travis CI] %{repo}: %{status_message} at %{commit} (%{branch}) by
+          %{committer_name} - %{compare_url}"
+        no_room_configured: >-
+          Notification from Travis CI for %{repo} ignored because no rooms were specified in the
+          config.repos hash, and no default rooms were specified in config.default_rooms.
+        no_token: >-
+          Notification from Travis CI could not be validated because Lita.config.handlers.token
+          is not set.

data/spec/lita/handlers/travis_spec.rb

@@ -102,16 +102,33 @@ describe Lita::Handlers::Travis, lita_handler: true do
       end
     end
 
-    context "without setting a value for the repo in config.repos" do
+    context "with only config.default_rooms set" do
       before do
         Lita.config.handlers.travis.token = "abc123"
+        Lita.config.handlers.travis.default_rooms = "#default"
         allow(request).to receive(:env).and_return(valid_env)
         allow(params).to receive(:[]).with("payload").and_return(valid_payload)
       end
 
-      it "logs a warning that the request was invalid" do
+      it "sends a notification message to the applicable rooms" do
+        expect(robot).to receive(:send_message) do |target, message|
+          expect(target.room).to eq("#default")
+          expect(message).to include("[Travis CI]")
+        end
+        subject.receive(request, response)
+      end
+    end
+
+    context "without setting a value for the repo in config.repos and no default" do
+      before do
+        Lita.config.handlers.travis.token = "abc123"
+        allow(request).to receive(:env).and_return(valid_env)
+        allow(params).to receive(:[]).with("payload").and_return(valid_payload)
+      end
+
+      it "logs a warning that the request was ignored" do
         expect(Lita.logger).to receive(:warn) do |warning|
-          expect(warning).to include("unconfigured project")
+          expect(warning).to include("ignored because no rooms were specified")
         end
         subject.receive(request, response)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-travis
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -110,6 +110,7 @@ files:
 - lib/lita-travis.rb
 - lib/lita/handlers/travis.rb
 - lita-travis.gemspec
+- locales/en.yml
 - spec/lita/handlers/travis_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jimmycuadra/lita-travis