tokite 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed46c4561bc0d16d27c9ea6bbc79b31b840e4e97
-  data.tar.gz: e348d0f776400676808b4b5fe3bb5f4257872af0
+  metadata.gz: cb6c1963e12671ffb181f21e5a803cb8647b0fca
+  data.tar.gz: 70dd44f3f98fd90d117bba39141ce8bea4f3c18e
 SHA512:
-  metadata.gz: 6aa4f62ed0f3e02a80d51f7327fe5ae6368667a13a55661dcabfda6632e69b399dfe5469b3ae93a0dd8169f916a7b6ba5815c3b6f6ac8b9ce5df1ef8c33ea33d
-  data.tar.gz: '0951d5b98aec5e9ae357cee76d1f2f71891da7483f8db70ec035d5add538c3fb49a9f18e5c944b5027c89b8077efe4010abad6ef5e3cf44ae8dc29ddae73ad2a'
+  metadata.gz: 54a5e28cc53e790c81e14015b50c7240c895d5653feb512921654655f453f39165b30f625faf525c69c05d1dd1b4c3fd11c1a25a4f098b2593d5335800c43690
+  data.tar.gz: e843fd54bdd8091a801a55deaa32e8dcdf39980fd74551c26ec50987c4ab753b237430347915c6e2136147fa0486e06031854e90babbcc4e479dce22f6cb2b72

data/README.md

@@ -1,4 +1,4 @@
-# Tokite [![CircleCI](https://circleci.com/gh/hogelog/tokite.svg?style=svg)](https://circleci.com/gh/hogelog/tokite)
+# Tokite [![CircleCI](https://circleci.com/gh/hogelog/tokite.svg?style=svg)](https://circleci.com/gh/hogelog/tokite) [![Gem Version](https://badge.fury.io/rb/tokite.svg)](https://badge.fury.io/rb/tokite)
 
 Tokite send GitHub event (pull-request, issue and comment) to Slack.
  

data/app/models/tokite/hook.rb

@@ -19,15 +19,27 @@ module Tokite
   
     def fire!
       return unless event.notify?
+      payloads = []
       Rule.matched_rules(event).each do |rule|
         attachment = event.slack_attachment
         attachment[:fallback] += "\n\n#{rule.slack_attachment_fallback}"
         attachment[:text] += "\n\n#{rule.slack_attachment_text}"
         emoji = rule.icon_emoji.chomp.presence
         additional_text = rule.additional_text
-  
-        notify!(channel: rule.channel, text: event.slack_text, icon_emoji: emoji, attachments: [attachment])
-        notify!(channel: rule.channel, text: additional_text, icon_emoji: emoji, parse: "full") if additional_text.present?
+
+        if payloads.none? {|payload| payload[:channel] == rule.channel && payload[:icon_emoji] == emoji && payload[:additional_text] == additional_text }
+          payloads << {
+            channel: rule.channel,
+            text: event.slack_text,
+            icon_emoji: emoji,
+            additional_text: additional_text,
+            attachments: [attachment],
+          }
+        end
+      end
+      payloads.each do |payload|
+        notify!(channel: payload[:channel], text: payload[:text], icon_emoji: payload[:emoji], attachments: payload[:attachment])
+        notify!(channel: payload[:channel], text: payload[:additional_text], icon_emoji: payload[:emoji], parse: "full") if payload[:additional_text].present?
       end
     end
   

data/app/models/tokite/search_query.rb

@@ -3,7 +3,7 @@ require "parslet"
 module Tokite
   class SearchQuery
     attr_reader :query, :tree
-  
+
     class ParseError < StandardError
     end
   
@@ -11,12 +11,11 @@ module Tokite
       rule(:space) { match('\s').repeat(1) }
       rule(:space?) { space.maybe }
   
-      rule(:escape) { str('\\').ignore }
       rule(:quot) { str('"') }
-      rule(:quoted_char) { escape >> any | match('[^"]') }
+      rule(:quoted_char) { (str('\\').ignore >> any) | match('[^"]') }
       rule(:char) { match('[^\s]') }
       rule(:slash) { str('/') }
-      rule(:regexp_char) { escape >> any | match('[^/]') }
+      rule(:regexp_char) { (str('\\').ignore >> slash) | match('[^/]') }
   
       rule(:regexp_word) { slash >> regexp_char.repeat(1).as(:regexp_word) >> slash }
       rule(:quot_word) { quot >> quoted_char.repeat(1).as(:word) >> quot }
@@ -37,7 +36,7 @@ module Tokite
     rescue Parslet::ParseFailed => e
       raise ParseError, e
     end
-  
+
     def initialize(query)
       @query = query
       @tree = Array.wrap(self.class.parse(query))
@@ -52,8 +51,8 @@ module Tokite
           targets = doc.values.map(&:downcase)
         end
         if word[:regexp_word]
-          regexp = word[:regexp_word].to_s.downcase
-          targets.any?{|text| text.match(regexp) }
+          regexp = Regexp.compile(word[:regexp_word].to_s, Regexp::IGNORECASE)
+          targets.any?{|text| regexp.match?(text) }
         else
           value = word[:word].to_s.downcase
           targets.any?{|text| text.index(value) }

data/config/initializers/slack_notifier.rb

@@ -1,6 +1,9 @@
 if ENV["SLACK_WEBHOOK_URL"]
   Tokite::Engine.config.slack_notifier = Slack::Notifier.new ENV["SLACK_WEBHOOK_URL"] do
-    defaults username: ENV.fetch("SLACK_NAME", "tokite"),
-             icon_emoji: ENV.fetch("SLACK_ICON_EMOJI", ":sunglasses:")
+    if ENV["SLACK_ICON_EMOJI"]
+      defaults username: ENV.fetch("SLACK_NAME", "tokite"), icon_emoji: ENV["SLACK_ICON_EMOJI"]
+    else
+      defaults username: ENV.fetch("SLACK_NAME", "tokite")
+    end
   end
 end

data/lib/tokite/version.rb

@@ -1,3 +1,3 @@
 module Tokite
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tokite
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - hogelog