lita-gerrit 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b03451be7c4f9b02a9918c28150d316349a208
-  data.tar.gz: dd4ce8c6c1a8db621ef707922286ef3be66f03b7
+  metadata.gz: 3b203e85230aa8bad7bba1b02adc97fe69462fb3
+  data.tar.gz: d58f748675e6055d824dfa4dfef42e5fcd9ffe33
 SHA512:
-  metadata.gz: cfaa0fce79d0d2f1026d25dfbf2ebc15bf24bf2293a9ba40d88310cb2889a3df20a90d9695b63df16ed4eeb02918797bc36e2011ec822218f63f4e722a500825
-  data.tar.gz: d3f5d01f1b65d4c530d6e26b36ac231b93604702bd919b8b021c3bca39c849f18c21a5ba829a7062c73ffd90a043a9f35a675473843308e73d9ebcae6e9ac4af
+  metadata.gz: 8a68658534cf347da6a1fa4695bfd941b4e938f261461de172f152f0accbd921e843e9ca7bbcc1ea410175f631718f2410b6e6c8cf2bd4be0b624d04f1ef6097
+  data.tar.gz: 9f395162979bc89a2b7ec4c5d2d8dfdbc69d6e7054550f2b3d75996701fe4cf59a9bba7a36b74684a95b9a9c59bb6c83740395fdb3c4658f93cb63efc967eebf

data/contrib/lita-gerrit-hook

@@ -35,7 +35,7 @@ options = {
 
 opts.each do |opt, arg|
   key = opt.gsub(/^--/, "")
-  options[key] = URI.encode(arg)
+  options[key] = arg
 end
 
 request = Net::HTTP.post_form(URI.parse(lita_url), options)

data/lib/lita/handlers/gerrit.rb

@@ -28,11 +28,11 @@ module Lita
         case http_resp.code
         when 200
           change = MultiJson.load(http_resp.body.lines.to_a[1..-1].join)
-          message = "gerrit: #{change["subject"]} by #{change["owner"]["name"]} in #{change["project"]}. #{change_link}"
+          message = "[gerrit] [#{change["project"]}] \"#{change["subject"]}\" by #{change["owner"]["name"]}. #{change_link}"
         when 404
-          message = "Change ##{change_id} does not exist"
+          message = "[gerrit] Change ##{change_id} does not exist"
         else
-          raise "Failed to fetch #{change_uri} (#{http_resp.code})"
+          raise "[gerrit] Failed to fetch #{change_uri} (#{http_resp.code})"
         end
 
         response.reply(message)
@@ -74,24 +74,56 @@ module Lita
         Lita.logger.error(e.message)
       end
 
+      #
+      # Notification from Jenkins build
+      #
+
+      http.post "/gerrit/build/:room", :build_notification
+
+      def build_notification(request, response)
+        target = Source.new(room: request.env["router.params"][:room])
+        notification = MultiJson.load(request.body.read)
+        build = notification["build"]
+        params = build["parameters"]
+
+        message = "[jenkins] [#{params["GERRIT_PROJECT"]}] Build %s for \"#{params["GERRIT_CHANGE_SUBJECT"]}\" by #{params["GERRIT_PATCHSET_UPLOADER_NAME"]}"
+
+        if build["phase"] == "FINALIZED"
+          case build["status"]
+          when "FAILURE"
+            message = message % "FAILED"
+            message += " (#{build["full_url"]})"
+          when "SUCCESS"
+            message = message % "OK"
+          else
+            message = message % "UNKNOWN"
+          end
+
+          robot.send_message(target, message)
+        end
+
+      rescue Exception => e
+        robot.send_message(target, "[jenkins] failed to process Gerrit build event (#{e.message})")
+      end
+
       private
 
       # List of supported hooks
       # (https://gerrit-review.googlesource.com/Documentation/config-hooks.html#_supported_hooks)
 
       def patchset_created(params)
-        message = "gerrit: patchset %s has been uploaded by %s in %s. %s"
-        message % [params["patchset"], params["uploader"], params["project"], params["change-url"]]
+        message = "[gerrit] [%s] %s uploaded patchset %s. %s"
+        message % [params["project"], params["uploader"], params["patchset"], params["change-url"]]
       end
 
       def comment_added(params)
-        message = "gerrit(%s): %s commented %s (V:%s/CR:%s)"
+        message = "[gerrit] [%s]: %s commented %s (V:%s/CR:%s)"
         message % [params["project"], params["author"], params["change-url"], params["verified"], params["reviewed"]]
       end
 
       def change_merged(params)
-        message = "gerrit: Merge of %s by %s in %s"
-        message % [params["change-url"], params["submitted"], params["project"]]
+        message = "[gerrit] [%s] %s merged %s"
+        message % [params["project"], params["submitter"], params["change-url"]]
       end
     end
 

data/lita-gerrit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-gerrit"
-  spec.version       = "0.0.2"
+  spec.version       = "0.1.0"
   spec.authors       = ["Jonathan Amiez"]
   spec.email         = ["jonathan.amiez@gmail.com"]
   spec.description   = "Gerrit API client and hook events handler"

data/spec/fixtures/build_notification.json

@@ -0,0 +1,47 @@
+{
+  "name": "chef-gerrit_tests",
+  "url": "job/chef-gerrit_tests/",
+  "build": {
+    "full_url": "http://jenkins.example.loc/job/chef-gerrit_tests/315/",
+    "number": 315,
+    "phase": "FINALIZED",
+    "status": "SUCCESS",
+    "url": "job/chef-gerrit_tests/315/",
+    "scm": {
+      "url": "ssh://gerrit.example.loc:29418/sysadmin/chef.git",
+      "branch": "detached",
+      "commit": "f97200b5d5bbf5bd242f645f29e089e47fa51ff3"
+    },
+    "parameters": {
+      "GERRIT_HOST": "gerrit.example.loc",
+      "GERRIT_PATCHSET_UPLOADER": "\"Hervé\" <herve@example.com>",
+      "GERRIT_EVENT_ACCOUNT_NAME": "Hervé",
+      "GERRIT_EVENT_TYPE": "patchset-created",
+      "GERRIT_CHANGE_ID": "I29a79eae813c7662736dd1a1f9074cc316301918",
+      "GERRIT_TOPIC": "es_http_compress",
+      "GERRIT_CHANGE_NUMBER": "3705",
+      "GERRIT_VERSION": "2.8.1",
+      "GERRIT_PATCHSET_UPLOADER_NAME": "Hervé",
+      "GERRIT_CHANGE_COMMIT_MESSAGE": "aGFwcm94eTogZW5hYmxlIEhUVFAgY29tcHJlc3Npb24gb24ga2liYW5hIGZyb250ZW5kCgpDaGFuZ2UtSWQ6IEkyOWE3OWVhZTgxM2M3NjYyNzM2ZGQxYTFmOTA3NGNjMzE2MzAxOTE4Cg==",
+      "GERRIT_PATCHSET_UPLOADER_EMAIL": "herve@example.com",
+      "GERRIT_PORT": "29418",
+      "GERRIT_EVENT_HASH": "-108092174",
+      "GERRIT_BRANCH": "master",
+      "GERRIT_NAME": "gerrit.example.loc",
+      "GERRIT_CHANGE_OWNER_NAME": "Hervé",
+      "GERRIT_EVENT_ACCOUNT": "\"Hervé\" <herve@example.com>",
+      "GERRIT_EVENT_ACCOUNT_EMAIL": "herve@example.com",
+      "GERRIT_CHANGE_OWNER": "\"Hervé\" <herve@example.com>",
+      "GERRIT_CHANGE_URL": "http://gerrit.example.loc:8080/3705",
+      "GERRIT_SCHEME": "ssh",
+      "GERRIT_CHANGE_SUBJECT": "haproxy: enable HTTP compression on kibana frontend",
+      "GERRIT_REFSPEC": "refs/changes/05/3705/2",
+      "GERRIT_PATCHSET_NUMBER": "2",
+      "GERRIT_PATCHSET_REVISION": "f97200b5d5bbf5bd242f645f29e089e47fa51ff3",
+      "GERRIT_PROJECT": "sysadmin/chef",
+      "GERRIT_CHANGE_OWNER_EMAIL": "herve@example.com"
+    },
+    "artifacts": {
+    }
+  }
+}

data/spec/fixtures/change_details.json

@@ -0,0 +1,18 @@
+)]}'
+{
+  "kind": "gerritcodereview#change",
+  "id": "chef~master~Ib0b61ed3eebb8e22596a8401bf976949d798826a",
+  "project": "chef",
+  "branch": "master",
+  "topic": "beanstalk",
+  "change_id": "Ib0b61ed3eebb8e22596a8401bf976949d798826a",
+  "subject": "haproxy : migrate beanstalk frontend",
+  "status": "MERGED",
+  "created": "2014-03-14 12:42:15.320000000",
+  "updated": "2014-03-17 10:32:21.311000000",
+  "_sortkey": "002bcd180000096b",
+  "_number": 42,
+  "owner": {
+    "name": "John Doe"
+  }
+}

data/spec/lita/handlers/gerrit_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "stringio"
 
 describe Lita::Handlers::Gerrit, lita_handler: true do
 
@@ -13,12 +14,9 @@ describe Lita::Handlers::Gerrit, lita_handler: true do
   it { routes("get me gerrit 123, please").to(:change_details) }
   it { doesnt_route("gerrit foo").to(:change_details) }
 
-  it { routes_http(:post, "/gerrit/hooks").to(:hook) }
-
   describe "#change_details" do
-    let(:response) do
-      double("HTTParty::Response")
-    end
+    let(:response) { double("HTTParty::Response") }
+    let(:body) { File.read("spec/fixtures/change_details.json") }
 
     before do
       allow(HTTParty).to receive(:get).and_return(response)
@@ -26,31 +24,9 @@ describe Lita::Handlers::Gerrit, lita_handler: true do
 
     it "replies with the title and URL for the issue" do
       allow(response).to receive(:code).and_return(200)
-
-      allow(response).to receive(:body).and_return(<<-JSON.chomp
-)]}'
-{
-  "kind": "gerritcodereview#change",
-  "id": "chef~master~Ib0b61ed3eebb8e22596a8401bf976949d798826a",
-  "project": "chef",
-  "branch": "master",
-  "topic": "beanstalk",
-  "change_id": "Ib0b61ed3eebb8e22596a8401bf976949d798826a",
-  "subject": "haproxy : migrate beanstalk frontend",
-  "status": "MERGED",
-  "created": "2014-03-14 12:42:15.320000000",
-  "updated": "2014-03-17 10:32:21.311000000",
-  "_sortkey": "002bcd180000096b",
-  "_number": 42,
-  "owner": {
-    "name": "John Doe"
-  }
-}
-JSON
-      )
+      allow(response).to receive(:body).and_return(body)
 
       send_command("gerrit 42")
-
       expect(replies.last).to eq("gerrit: haproxy : migrate beanstalk frontend by John Doe in chef. https://gerrit.example.com/42")
     end
 
@@ -70,4 +46,43 @@ JSON
       expect(replies.last).to match("Error: Failed to fetch https://gerrit.example.com/a/changes/42 (500)")
     end
   end
+
+  it { routes_http(:post, "/gerrit/hooks").to(:hook) }
+
+  describe "#hook" do
+    let(:request) do
+      request = double("Rack::Request")
+      allow(request).to receive(:params).and_return(params)
+      request
+    end
+
+    let(:response) { Rack::Response.new }
+
+    let(:params) { double("Hash") }
+  end
+
+  it { routes_http(:post, "/gerrit/build/myroom").to(:build_notification) }
+  it { doesnt_route_http(:post, "/gerrit/build/").to(:build_notification) }
+
+  describe "#build_notification" do
+    let(:request) { double("Rack::Request") }
+    let(:response) { Rack::Response.new }
+    let(:env) { {"router.params" => { :room => "myroom" }} }
+    let(:body) { File.read("spec/fixtures/build_notification.json") }
+
+    context "build finalized" do
+      before do
+        allow(request).to receive(:env).and_return(env)
+        allow(request).to receive(:body).and_return(StringIO.new(body))
+      end
+
+      it "notifies the applicable room" do
+        expect(robot).to receive(:send_message) do |target, message|
+          expect(target.room).to eq("myroom")
+          expect(message).to eq('jenkins: Build "haproxy: enable HTTP compression on kibana frontend" by Hervé in sysadmin/chef OK')
+        end
+        subject.build_notification(request, response)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-gerrit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Jonathan Amiez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -125,6 +125,8 @@ files:
 - lib/lita-gerrit.rb
 - lib/lita/handlers/gerrit.rb
 - lita-gerrit.gemspec
+- spec/fixtures/build_notification.json
+- spec/fixtures/change_details.json
 - spec/lita/handlers/gerrit_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/josqu4red/lita-gerrit
@@ -153,5 +155,7 @@ signing_key:
 specification_version: 4
 summary: Retrieve change status from chat and display events
 test_files:
+- spec/fixtures/build_notification.json
+- spec/fixtures/change_details.json
 - spec/lita/handlers/gerrit_spec.rb
 - spec/spec_helper.rb