tokite 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93c9e70ee7ad42fe6addd071c719a4e99d501e08
-  data.tar.gz: c4402fec11b740e86ced9bdfa9b575a0a834cbf9
+  metadata.gz: 61507370f117a063a32e900733d2aed4110f03db
+  data.tar.gz: 28fa71535585bcb3e540242c9129587997f5bacf
 SHA512:
-  metadata.gz: 9e729210aee4fe79beb3b6aa0cd9793125dd74040116ec457d8c938c87864303a9b89193e44d34c96c5038742da00f9c69ba033586305899b6168b572bd03f52
-  data.tar.gz: a22b3fc1e2344aaef19ee1b78f66039b2aee377f723f079f5310dccaca4908d9d377576abe4f7aaafcc0a5effc79000a35e4ee2d666759d474e87b9bbfeb00c5
+  metadata.gz: a4f6e950763b194f47a781d8fd90aaa31f17a0e06eb19253daf73841c53286f457ba26d98e4f77acec4775a15c5a7e89c2b030074a5fb0fbf44e25a55f3a2c14
+  data.tar.gz: 7bae44d0e99c447ab6e02d1054a025176a858fcab9aab169eecf2c86294931df30a968d7391961141360085f11f456fb14989fffa4b3fa07b6cb5eb1d0b8e9e3

data/README.md

@@ -57,9 +57,10 @@ Tokite support only below events now.
 
 <table>
 <tr><th>Name</th><th>Example</th></tr>
-<tr><td>Plain text</td><td>hoge fuga moge</td></tr>
-<tr><td>Quoted text</td><td>hoge/fuga/moge</td></tr>
-<tr><td>Regular expression</td><td>/hoge|fuga|moge/</td></tr>
+<tr><td>Plain word</td><td>hoge fuga moge</td></tr>
+<tr><td>Quoted word</td><td>"hoge fuga moge"</td></tr>
+<tr><td>Regular expression word</td><td>/hoge|fuga|moge/</td></tr>
+<tr><td>Exclude word</td><td> -/(hoge|fuga|moge)/ -user:hogelog</td></tr>
 </table>
 
 ### Supported query field
@@ -68,8 +69,9 @@ Tokite support only below events now.
 <tr><th>Name</th><th>Description</th><th>Example</th></tr>
 <tr><td>repo:</td><td>Match repository name.</td><td>repo:hogelog/tokite</td></tr>
 <tr><td>title:</td><td>Match pull_request or issues title.</td><td>title:Bug</td></tr>
-<tr><td>event:</td><td>Match event type pull_request, issues or issue_comment.</td><td>event:/(pull_request|issues)/</td></tr>
+<tr><td>event:</td><td>Match event type pull_request, issues, issue_comment, pull_request_review, pull_request_review_comment.</td><td>event:/pull_request|issues|pull_request_review|pull_request_review_comment/</td></tr>
 <tr><td>body:</td><td>Match body text.</td><td>body:"review please"</td></tr>
 <tr><td>user:</td><td>Match user name.</td><td>user:hogelog</td></tr>
-<tr><td>unspecified</td><td>Match title or body field.</td><td>hogelog</td></tr>
+<tr><td>review_state:</td><td>Match pull_request_review state.</td><td>review_state:/commented|approved|changes_requested/</td></tr>
+<tr><td>unspecified</td><td>Match title or body field.</td><td>review please</td></tr>
 </table>

data/app/jobs/tokite/notify_github_hook_event_job.rb

@@ -1,9 +1,13 @@
+require "tokite/exception_logger"
+
 module Tokite
   class NotifyGithubHookEventJob < ApplicationJob
     queue_as :default
   
     def perform(payload)
       Rails.application.config.slack_notifier.ping(payload)
+    rescue Slack::Notifier::APIError => e
+      ExceptionLogger.log(e, level: :warn)
     end
   end
 end

data/app/models/tokite/hook.rb

@@ -6,6 +6,8 @@ module Tokite
       "pull_request" => HookEvent::PullRequest,
       "issues" => HookEvent::Issues,
       "issue_comment" => HookEvent::IssueComment,
+      "pull_request_review" => HookEvent::PullRequestReview,
+      "pull_request_review_comment" => HookEvent::PullRequestReviewComment,
     }.freeze
   
     def self.fire!(github_event, hook_params)

data/app/models/tokite/hook_event/pull_request_review.rb

@@ -0,0 +1,54 @@
+module Tokite
+  module HookEvent
+    class PullRequestReview < BaseEvent
+      def fields
+        {
+          event: "pull_request_review",
+          repo: hook_params[:repository][:full_name],
+          body: hook_params[:review][:body],
+          user: hook_params[:review][:user][:login],
+          review_state: hook_params[:review][:state],
+        }
+      end
+
+      def notify?
+        return false unless hook_params[:action] == "submitted"
+        if hook_params[:review][:state] == "commented"
+          hook_params[:review][:body]
+        else
+          true
+        end
+      end
+
+      def slack_text
+        repo = "<#{hook_params[:repository][:html_url]}|[#{hook_params[:repository][:full_name]}]>"
+        user = "<#{hook_params[:review][:user][:html_url]}|#{hook_params[:review][:user][:login]}>"
+        title = "<#{hook_params[:pull_request][:html_url]}|##{hook_params[:pull_request][:number]} #{hook_params[:pull_request][:title]}>"
+        case hook_params[:review][:state]
+          when "commented"
+            "#{repo} New comment by #{user} on pull request #{title}"
+          when "approved"
+            "#{repo} #{user} approved #{title}"
+          when "changes_requested"
+            "#{repo} #{user} requested changes #{title}"
+        end
+      end
+
+      def slack_attachment
+        return unless hook_params[:review][:body]
+        case hook_params[:review][:state]
+          when "commented"
+          when "approved"
+            color = "good"
+          when "changes_requested"
+            color = "warning"
+        end
+        {
+          fallback: hook_params[:review][:body],
+          text: hook_params[:review][:body],
+          color: color,
+        }
+      end
+    end
+  end
+end

data/app/models/tokite/hook_event/pull_request_review_comment.rb

@@ -0,0 +1,35 @@
+module Tokite
+  module HookEvent
+    class PullRequestReviewComment < BaseEvent
+      def fields
+        {
+          event: "pull_request_review_comment",
+          repo: hook_params[:repository][:full_name],
+          body: hook_params[:comment][:body],
+          user: hook_params[:comment][:user][:login],
+        }
+      end
+
+      def notify?
+        hook_params[:action] == "created"
+      end
+
+      def slack_text
+        nil
+      end
+
+      def slack_attachment
+        user = hook_params[:comment][:user][:login]
+        line = hook_params[:comment][:position]
+        path = hook_params[:comment][:path]
+        footer_url = hook_params[:comment][:html_url]
+        footer_text = "Comment by #{user} on line #{line} of #{path}"
+        {
+          fallback: "#{hook_params[:comment][:body]}\n#{footer_text}",
+          text: hook_params[:comment][:body],
+          footer: "<#{footer_url}|#{footer_text}>"
+        }
+      end
+    end
+  end
+end

data/app/models/tokite/rule.rb

@@ -3,7 +3,8 @@ module Tokite
     attr_reader :search_query
   
     belongs_to :user
-  
+
+    validates :name, presence: true
     validate :validate_query
     validate :validate_user_id
     validate :validate_channel

data/app/models/tokite/search_query.rb

@@ -22,10 +22,11 @@ module Tokite
       rule(:regexp_word) { slash >> regexp_char.repeat(1).as(:regexp_word) >> slash }
       rule(:quot_word) { quot >> quoted_char.repeat(1).as(:word) >> quot }
       rule(:plain_word) { (match('[^\s/"]') >> match('[^\s]').repeat).as(:word) }
+      rule(:exclude) { match('-').as(:exclude) }
       rule(:field) { match('\w').repeat(1).as(:field) }
-      rule(:word) { (field >> str(':') >> space?).maybe >> (regexp_word | quot_word | plain_word) }
+      rule(:word) { exclude.maybe >> (field >> str(':') >> space?).maybe >> (regexp_word | quot_word | plain_word) }
   
-      rule(:query) { word >> (space >> word).repeat }
+      rule(:query) { space? >> word >> (space >> word).repeat >> space? }
       root :query
     end
   
@@ -54,11 +55,12 @@ module Tokite
         end
         if word[:regexp_word]
           regexp = Regexp.compile(word[:regexp_word].to_s, Regexp::IGNORECASE)
-          targets.any?{|text| regexp.match?(text) }
+          matched = targets.any?{|text| regexp.match?(text) }
         else
           value = word[:word].to_s.downcase
-          targets.any?{|text| text.index(value) }
+          matched = targets.any?{|text| text.index(value) }
         end
+        word[:exclude].present? ? !matched : matched
       end
     end
   end

data/app/views/tokite/rules/_form.html.haml

@@ -20,14 +20,17 @@
         %th Name
         %th Example
       %tr
-        %td Plain text
+        %td Plain word
         %td hoge fuga moge
       %tr
-        %td Quoted text
+        %td Quoted word
         %td "hoge fuga moge"
       %tr
-        %td Regular expression
+        %td Regular expression word
         %td /(hoge|fuga|moge)/
+      %tr
+        %td Exclude word
+        %td -/(hoge|fuga|moge)/ -user:hogelog
 
     %h2 Supported query field
     %table.table.is-bordered
@@ -45,8 +48,8 @@
         %td title:Bug
       %tr
         %td event:
-        %td Match event type pull_request, issues or issue_comment.
-        %td event:/(pull_request|issues)/
+        %td Match event type pull_request, issues, issue_comment, pull_request_review, pull_request_review_comment.
+        %td event:/pull_request|issues|pull_request_review|pull_request_review_comment/
       %tr
         %td body:
         %td Match body text.
@@ -55,7 +58,11 @@
         %td user:
         %td Match user name.
         %td user:hogelog
+      %tr
+        %td review_state:
+        %td Match pull_request_review state.
+        %td review_state:/commented|approved|changes_requested/
       %tr
         %td unspecified
         %td Match title or body field.
-        %td hogelog
+        %td review please

data/config/initializers/slack_notifier.rb

@@ -1,5 +1,11 @@
 if ENV["SLACK_WEBHOOK_URL"]
-  Tokite::Engine.config.slack_notifier = Slack::Notifier.new ENV["SLACK_WEBHOOK_URL"] do
+  webhook_url = ENV["SLACK_WEBHOOK_URL"]
+elsif Rails.env.test?
+  webhook_url = "https://example.com/notify"
+end
+
+if webhook_url
+  Tokite::Engine.config.slack_notifier = Slack::Notifier.new webhook_url do
     if ENV["SLACK_ICON_EMOJI"]
       defaults username: ENV.fetch("SLACK_NAME", "tokite"), icon_emoji: ENV["SLACK_ICON_EMOJI"]
     else

data/lib/tasks/tokite.rake

@@ -25,13 +25,11 @@ namespace :tokite do
   
     desc "Install schema"
     task :install do
-      tokite_schema_dir = app_path("schema/tokite")
-      mkdir(tokite_schema_dir) unless Dir.exist?(tokite_schema_dir)
-
       schema_dir = app_path("schema")
-      mkdir(schema_dir) unless Dir.exist?(schema_dir)
+      tokite_schema_dir = app_path("schema/tokite")
+      mkdir_p(tokite_schema_dir) unless Dir.exist?(tokite_schema_dir)
 
-      Dir.glob("#{engine_path("schema")}/*").each do |src_path|
+      Dir.glob("#{engine_path("schema")}/**/*.schema").each do |src_path|
         basename = File.basename(src_path)
         if File.exist?(File.join(tokite_schema_dir, basename))
           puts "Skip install schema #{src_path}"

data/lib/tokite/exception_logger.rb

@@ -0,0 +1,15 @@
+module Tokite
+  class ExceptionLogger
+    def self.callbacks
+      @callbacks ||= []
+    end
+
+    def self.configure(callback)
+      callbacks << callback
+    end
+
+    def self.log(e, options = {})
+      callbacks.each{|callback| callback.call(e, options) }
+    end
+  end
+end

data/lib/tokite/version.rb

@@ -1,3 +1,3 @@
 module Tokite
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/schema/Schemafile

@@ -0,0 +1,3 @@
+Dir.glob(File.expand_path("../*.schema", __FILE__)).each do |path|
+  require path
+end

data/schema/tokite_repositories.schema

@@ -0,0 +1,7 @@
+create_table "tokite_repositories", force: :cascade do |t|
+  t.string   "name",       limit: 200, null: false
+  t.string   "url",        limit: 200, null: false
+  t.datetime "created_at",             null: false
+end
+
+add_index "tokite_repositories", ["name"], name: "tokite_repositories_uniq_name", unique: true, using: :btree

data/schema/tokite_rules.schema

@@ -0,0 +1,12 @@
+create_table "tokite_rules", force: :cascade do |t|
+  t.integer  "user_id",                      null: false
+  t.string   "name",            limit: 50,   null: false
+  t.string   "query",           limit: 2000, null: false
+  t.string   "channel",         limit: 100,  null: false
+  t.string   "icon_emoji",      limit: 20,   null: false, default: ""
+  t.string   "additional_text", limit: 200,  null: false, default: ""
+  t.datetime "created_at",                   null: false
+  t.datetime "updated_at",                   null: false
+end
+
+add_index "tokite_rules", ["user_id", "name"], name: "tokite_rule_uniq_name", unique: true, using: :btree

data/schema/tokite_secure_user_tokens.schema

@@ -0,0 +1,8 @@
+create_table "tokite_secure_user_tokens", force: :cascade do |t|
+  t.integer  "user_id",               null: false
+  t.string   "token",      limit: 40, null: false
+  t.datetime "created_at",            null: false
+  t.datetime "updated_at",            null: false
+end
+
+add_index "tokite_secure_user_tokens", ["user_id"], name: "tokite_secure_user_token_uniq_user_id", unique: true, using: :btree

data/schema/tokite_users.schema

@@ -0,0 +1,10 @@
+create_table "tokite_users", force: :cascade do |t|
+  t.string   "provider",   limit: 20,                  null: false
+  t.string   "uid",        limit: 40,                  null: false
+  t.string   "name",       limit: 40,                  null: false
+  t.string   "image_url",  limit: 200,                 null: false
+  t.datetime "created_at",                             null: false
+  t.datetime "updated_at",                             null: false
+end
+
+add_index "tokite_users", ["provider", "uid"], name: "tokite_user_uniq_provider_uid", unique: true, using: :btree

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tokite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - hogelog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -210,6 +210,8 @@ files:
 - app/models/tokite/hook_event/issue_comment.rb
 - app/models/tokite/hook_event/issues.rb
 - app/models/tokite/hook_event/pull_request.rb
+- app/models/tokite/hook_event/pull_request_review.rb
+- app/models/tokite/hook_event/pull_request_review_comment.rb
 - app/models/tokite/repository.rb
 - app/models/tokite/revision.rb
 - app/models/tokite/rule.rb
@@ -242,7 +244,13 @@ files:
 - lib/tasks/yarn.rake
 - lib/tokite.rb
 - lib/tokite/engine.rb
+- lib/tokite/exception_logger.rb
 - lib/tokite/version.rb
+- schema/Schemafile
+- schema/tokite_repositories.schema
+- schema/tokite_rules.schema
+- schema/tokite_secure_user_tokens.schema
+- schema/tokite_users.schema
 homepage: https://github.com/hogelog/tokite/
 licenses:
 - MIT