lita-github_pr_list 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c4e62b1eeab49ac40512da9403bb11946227e3
-  data.tar.gz: 5001ebf7fbf1e89a909596fd436c9c18052703a8
+  metadata.gz: 538889f825d06f30a87200c3d0d500ba7efb3ed8
+  data.tar.gz: b0aca30a6d3c4927d08f614f2fc890d36b8fada5
 SHA512:
-  metadata.gz: 9e27625abe54b25ebf1db2058adfd10a711590f32c448cec5fc9cdfcaf51a6b5fe3985c0eaf6e458e753887712f15fd53d4492e4c9f90b494578e742a9bff635
-  data.tar.gz: e000305831859e03ae47166921a48ef29c06b33b30f5377e5dcf6f6f370aa72c9a25c1538c105e33df702d9353f5af8fd9cad6d30db3020c46c290f4265de007
+  metadata.gz: 120c98b331ef3f20e8eabb92c6023149fc44e6e49a6ac4682c84da11ee63ab744065762507de71c9492237911cea4f2eaf9bcbc5e4a7020762ef7b558e9911f0
+  data.tar.gz: 207c0582466140f972f62d3513e6afa3216a03c51123ca31937a8ab89ea5e086d6481a6bacbbe2f0803984e49a4b641ecaaed0892872d588768ec446258f9ec3

data/lib/lita/github_pr_list/comment_hook.rb

@@ -1,8 +1,8 @@
 module Lita
   module GithubPrList
     class CommentHook
-      attr_accessor :request, :response, :payload, :commenter, :issue_owner, :issue_title, :issue_body, :status,
-                    :issue_html_url, :redis, :github_organization, :github_client
+      attr_accessor :request, :response, :payload, :commenter, :issue_owner, :issue_title, :issue_body,
+                    :status, :comment_body, :issue_html_url, :redis, :github_organization, :github_client
 
       def initialize(params = {})
         self.response = params.fetch(:response, nil)
@@ -20,21 +20,22 @@ module Lita
         self.issue_owner = redis.get("alias:#{payload["issue"]["user"]["login"]}") || payload["issue"]["user"]["login"]
         self.issue_title = payload["issue"]["title"]
         self.issue_html_url = payload["issue"]["html_url"]
-        self.issue_body = payload["comment"]["body"]
+        self.issue_body = payload["issue"]["body"]
+        self.comment_body = payload["comment"]["body"]
       end
 
       def message
         self.status = repo_status(payload["repository"]["full_name"], payload["issue"])
-        if !status[:last_comment].empty?
-          if status[:last_comment].include? Lita::GithubPrList::Status::REVIEW_EMOJI
+        if !comment_body.empty?
+          if comment_body.match Lita::GithubPrList::Status::REVIEW_REGEX
             "@#{commenter} is currently reviewing: #{issue_title}. #{issue_html_url}, @#{commenter}++"
-          elsif status[:last_comment].include? Lita::GithubPrList::Status::FAIL_EMOJI
+          elsif comment_body.match Lita::GithubPrList::Status::FAIL_REGEX
             "@#{issue_owner} your pull request: #{issue_title} has failed. #{issue_html_url}"
-          elsif status[:last_comment].include? Lita::GithubPrList::Status::FIXED_EMOJI
+          elsif comment_body.match Lita::GithubPrList::Status::FIXED_REGEX
             "#{issue_title} has been fixed: #{issue_html_url}"
-          elsif status[:list].include? Lita::GithubPrList::Status::PASS_DEV_EMOJI
+          elsif comment_body.match Lita::GithubPrList::Status::PASS_DEV_REGEX
             pass_dev?
-          elsif status[:list].include? Lita::GithubPrList::Status::PASS_DESIGN_EMOJI
+          elsif comment_body.match Lita::GithubPrList::Status::PASS_DESIGN_REGEX
             pass_design?
           end
         else
@@ -44,20 +45,16 @@ module Lita
 
     private
       def pass_dev?
-        if self.status[:list].include? Lita::GithubPrList::Status::PASS_DESIGN_EMOJI
-          "@#{issue_owner} your pull request: #{issue_title} has passed. #{issue_html_url}"
-        else
-          resp = "@#{issue_owner} your pull request: #{issue_title} has passed DEV REVIEW. #{issue_html_url}"
-          if self.status[:list].include?(Lita::GithubPrList::Status::DESIGN_REVIEW_REQUIRED) && !status[:list].include?(Lita::GithubPrList::Status::PASS_DESIGN_EMOJI)
-            resp += " - You still require DESIGN REVIEW"
-          end
-          resp
+        resp = "@#{issue_owner} your pull request: #{issue_title} has passed DEV REVIEW. #{issue_html_url}"
+        if issue_body.match(Lita::GithubPrList::Status::DESIGN_REVIEW_REGEX) && !status[:list].include?(Lita::GithubPrList::Status::PASS_DESIGN_EMOJI)
+          resp += " - You still require DESIGN REVIEW"
         end
+        resp
       end
 
       def pass_design?
         resp = "@#{issue_owner} your pull request: #{issue_title} has passed DESIGN. #{issue_html_url}"
-        if self.status[:list].include?(Lita::GithubPrList::Status::DEV_REVIEW_REQUIRED) && !status[:list].match(Lita::GithubPrList::Status::PASS_DEV_EMOJI)
+        if issue_body.match(Lita::GithubPrList::Status::DEV_REVIEW_REGEX) && !status[:list].include?(Lita::GithubPrList::Status::PASS_DEV_EMOJI)
           resp += " - You still require DEV REVIEW"
         end
         resp

data/lib/lita/github_pr_list/version.rb

@@ -1,5 +1,5 @@
 module Lita
   module GithubPrList
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/spec/fixtures/design/issue_comment_event_passed.json

@@ -70,7 +70,7 @@
     },
     "created_at": "2014-07-01T17:21:15Z",
     "updated_at": "2014-07-01T17:21:15Z",
-    "body": "Passed :elephant: :elephant: :elephant:"
+    "body": "Passed :art: :art: :art:"
   },
   "repository": {
     "id": 20000106,

data/spec/fixtures/issue_comment_event_passed.json

@@ -42,7 +42,7 @@
     "created_at": "2014-07-01T17:21:15Z",
     "updated_at": "2014-07-01T17:21:15Z",
     "closed_at": null,
-    "body": "It looks like you accidently spelled 'commit' with two 't's."
+    "body": "It looks like you accidently spelled 'commit' with two 't's. :elephant: :art:"
   },
   "comment": {
     "url": "https://api.github.com/repos/baxterthehacker/public-repo/issues/comments/47684681",

data/spec/fixtures/issue_comment_event_passed_design.json

@@ -42,7 +42,7 @@
     "created_at": "2014-07-01T17:21:15Z",
     "updated_at": "2014-07-01T17:21:15Z",
     "closed_at": null,
-    "body": "It looks like you accidently spelled 'commit' with two 't's."
+    "body": "It looks like you accidently spelled 'commit' with two 't's. :elephant: :art:"
   },
   "comment": {
     "url": "https://api.github.com/repos/baxterthehacker/public-repo/issues/comments/47684681",
@@ -70,7 +70,7 @@
     },
     "created_at": "2014-07-01T17:21:15Z",
     "updated_at": "2014-07-01T17:21:15Z",
-    "body": "Passed DESIGN :art: :art: :art:"
+    "body": "Passed DESIGN :art::art::art:"
   },
   "repository": {
     "id": 20000106,

data/spec/fixtures/issue_comment_event_passed_emoji.json

@@ -42,7 +42,7 @@
     "created_at": "2014-07-01T17:21:15Z",
     "updated_at": "2014-07-01T17:21:15Z",
     "closed_at": null,
-    "body": "It looks like you accidently spelled 'commit' with two 't's."
+    "body": "It looks like you accidently spelled 'commit' with two 't's. :elephant: :art:"
   },
   "comment": {
     "url": "https://api.github.com/repos/baxterthehacker/public-repo/issues/comments/47684681",

data/spec/lita/handlers/comment_hook_spec.rb

@@ -104,28 +104,29 @@ describe Lita::Handlers::GithubPrList, lita_handler: true do
     github_handler = Lita::Handlers::GithubPrList.new robot
     github_handler.comment_hook(request, response)
 
-    expect(replies.last).to include("@mcwaffle1234 your pull request: Spelling error in the README file has passed."\
+    expect(replies.last).to include("@mcwaffle1234 your pull request: Spelling error in the README file has passed DESIGN."\
                                     " https://github.com/baxterthehacker/public-repo/issues/47")
     expect(replies.last).to_not include(" - You still require DEV REVIEW")
   end
+
   context "Design/Dev passed and book is used" do
     it "returns - currently reviewing" do
       expect_any_instance_of(Octokit::Client).to receive(:issue_comments).and_return(issue_comments_passed_both_book_after)
 
-      request = Rack::Request.new("rack.input" => StringIO.new(issue_comment_event_passed_design))
+      request = Rack::Request.new("rack.input" => StringIO.new(issue_comment_event_in_review))
       response = Rack::Response.new(['Hello'], 200, { 'Content-Type' => 'text/plain' })
 
       github_handler = Lita::Handlers::GithubPrList.new robot
       github_handler.comment_hook(request, response)
 
       expect(replies.last).to include("@baxterthehacker is currently reviewing: Spelling error in the README file."\
-                                      " https://github.com/baxterthehacker/public-repo/issues/47")
+                                      " https://github.com/baxterthehacker/public-repo/issues/47,"\
+                                      " @baxterthehacker++")
       expect(replies.last).to_not include("@mcwaffle1234 your pull request: Spelling error in the README file has passed."\
                                       " https://github.com/baxterthehacker/public-repo/issues/47")
     end
   end
 
-
   it "mentions the github user in the room and tell them they failed" do
     expect_any_instance_of(Octokit::Client).to receive(:issue_comments).and_return(issue_comments_failed)
 
@@ -179,18 +180,6 @@ describe Lita::Handlers::GithubPrList, lita_handler: true do
                                     " https://github.com/baxterthehacker/public-repo/issues/47")
   end
 
-  it "it says nothing" do
-    expect_any_instance_of(Octokit::Client).to receive(:issue_comments).and_return(issue_comments_trivial)
-
-    request = Rack::Request.new("rack.input" => StringIO.new(issue_comment_event_passed_design_context))
-    response = Rack::Response.new(['Hello'], 200, { 'Content-Type' => 'text/plain' })
-
-    github_handler = Lita::Handlers::GithubPrList.new robot
-    github_handler.comment_hook(request, response)
-
-    expect(replies.last).to eq(nil)
-  end
-
   context "starting out with an initial elephant" do
     it "mentions the github user in the room and tell them they passed" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-github_pr_list
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: List open pull requests for an organization.