lita-github_pr_list 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beeb7009c49b1c0b9d0e0b4a545e026d44977136
-  data.tar.gz: f80eb0cd2ed89ead579fad36e4f8ed711d4f5651
+  metadata.gz: 92954eb65ab5ee5e43a5efc4ceff2739ed631dc4
+  data.tar.gz: b7c95004063f30bcca990cf590a8b4063fe0a9db
 SHA512:
-  metadata.gz: e6c011f75f9aedc132bf069e3a9ef837c9191951274209033cce5db6e105e5af3d9e099906c22dc8053cccbf175a18f2c92d6387002125460f008d968ccf6748
-  data.tar.gz: c6164d0556c112064ed90ca655c164df6526b7769c3fd3bb2cd3dffe2c99ed517c3d9d1ce3aba789e5f14a4e800e15ae6bf1fdd44c0992b3bfeecdcf797cedec
+  metadata.gz: d4ebb88010886876c09ce16f37b95019079ebc7aadd2430cadfb8a61ed3fb9955d49d7e4c1af07baede2dad81f4afc146122e73078fd6140523e6d625b0bef0d
+  data.tar.gz: 7d9466eae44d281956e3cac6fb5ac4edb09f0dcb7bf2af4f35083f7093409bdd7ce89cb1ce58adf64cb46a09a2135eab44c170921dc9af7678e4c51d6d47c878

data/lib/lita/github_pr_list/version.rb

@@ -1,5 +1,5 @@
 module Lita
   module GithubPrList
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/lita/github_pr_list/web_hook.rb

@@ -3,28 +3,40 @@ require "octokit"
 module Lita
   module GithubPrList
     class WebHook
-      attr_accessor :web_hook, :github_client, :github_organization, :github_pull_requests
+      attr_accessor :web_hook, :github_client, :github_organization, :github_pull_requests, :response
 
       def initialize(params = {})
         github_token = params.fetch(:github_token, nil)
         self.github_organization = params.fetch(:github_organization, nil)
         self.web_hook = params.fetch(:web_hook, nil)
+        self.response = params.fetch(:response, nil)
 
-        raise "invalid params in #{self.class.name}" if github_token.nil? || github_organization.nil? || web_hook.nil?
+        if github_token.nil? || github_organization.nil? || web_hook.nil? || response.nil?
+          raise "invalid params in #{self.class.name}"
+        end
 
         self.github_client = Octokit::Client.new(access_token: github_token, auto_paginate: true)
       end
 
       def add_hooks
-        github_client.repositories(github_organization).each do |repo|
-          config = { url: "#{web_hook}", content_type: "json" }
-          events = { events: ["issue_comment"] }
+        response.reply "Adding webhooks to #{github_organization}, this may take awhile..."
 
-          github_client.create_hook(repo.full_name, "web", config, events)
+        github_client.repositories(github_organization).each do |repo|
+          begin
+            create_hook(repo.full_name)
+          rescue => ex
+            if ex.errors.first[:message] == "Hook already exists on this repository"
+              next
+            end
+          end
         end
+
+        response.reply "Finished adding webhooks to #{github_organization}"
       end
 
       def remove_hooks
+        response.reply "Removing #{web_hook} webhooks from #{github_organization}, this may take awhile..."
+
         github_client.repositories(github_organization).each do |repo|
           github_client.hooks(repo.full_name).each do |hook|
             if hook.config.url == web_hook
@@ -32,6 +44,17 @@ module Lita
             end
           end
         end
+
+        response.reply "Finished removing webhooks from #{github_organization}"
+      end
+
+    private
+
+      def create_hook(repo_full_name)
+        config = { url: "#{web_hook}", content_type: "json" }
+        events = { events: ["issue_comment"] }
+
+        github_client.create_hook(repo_full_name, "web", config, events)
       end
 
     end

data/lib/lita/handlers/github_pr_list.rb

@@ -57,24 +57,21 @@ module Lita
       end
 
       def add_pr_hooks(response)
-        response.reply "Adding webhooks to #{github_organization}, this may take "\
-                       "awhile..."
-
         Lita::GithubPrList::WebHook.new(github_organization: github_organization,
                                         github_token: github_access_token,
-                                        web_hook: web_hook).add_hooks
+                                        web_hook: web_hook,
+                                        response: response).add_hooks
       end
 
       def remove_pr_hooks(response)
-        response.reply "Removing github_pr_list webhooks from #{github_organization},"\
-                        " this may take awhile..."
-
         Lita::GithubPrList::WebHook.new(github_organization: github_organization,
                                         github_token: github_access_token,
-                                        web_hook: web_hook).remove_hooks
+                                        web_hook: web_hook,
+                                        response: response).remove_hooks
       end
 
     private
+
       def github_organization
         Lita.config.handlers.github_pr_list.github_organization
       end

data/spec/lita/handlers/web_hook_spec.rb

@@ -35,7 +35,8 @@ describe Lita::Handlers::GithubPrList, lita_handler: true do
 
     send_command("pr add hooks")
 
-    expect(replies.last).to include("Adding webhooks to aaaaaabbbbbbcccccc, this may take awhile...")
+    expect(replies).to include("Adding webhooks to aaaaaabbbbbbcccccc, this may take awhile...")
+    expect(replies).to include("Finished adding webhooks to aaaaaabbbbbbcccccc")
   end
 
   it "removes web hooks from an org's repos" do
@@ -45,6 +46,20 @@ describe Lita::Handlers::GithubPrList, lita_handler: true do
 
     send_command("pr remove hooks")
 
-    expect(replies.last).to include("Removing github_pr_list webhooks from aaaaaabbbbbbcccccc, this may take awhile...")
+    expect(replies).to include("Removing https://example.com/hook webhooks from aaaaaabbbbbbcccccc, this may take awhile...")
+    expect(replies).to include("Finished removing webhooks from aaaaaabbbbbbcccccc")
+  end
+
+  it "catches exceptions when the hook already exists and continues" do
+    expect_any_instance_of(Octokit::Client).to receive(:repositories).and_return(repos)
+    expect_any_instance_of(Octokit::Client).to receive(:create_hook).twice.and_return(nil)
+    exception = Octokit::UnprocessableEntity.new
+    allow(exception).to receive(:errors).and_return([OpenStruct.new(message: "Hook already exists on this repository")])
+    allow(Lita::GithubPrList::WebHook).to receive(:create_hook).and_raise(exception)
+
+    send_command("pr add hooks")
+
+    expect(replies).to include("Adding webhooks to aaaaaabbbbbbcccccc, this may take awhile...")
+    expect(replies).to include("Finished adding webhooks to aaaaaabbbbbbcccccc")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-github_pr_list
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael van den Beuken