tokite 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e2fe3544c3670e931721a0ce647c8b09db335835
-  data.tar.gz: 6ac94d96a79fa5fdaa76d81dedcdeb1c9bfb5e84
+SHA256:
+  metadata.gz: df86e7d4a9d7b0f255b606554fc0d39e2cdbb7f949ba586c824c3137ad5342e8
+  data.tar.gz: e3cadbe47f0ebd104eb4dc7809061c759b47867414771f13d6c21d5a8810948a
 SHA512:
-  metadata.gz: 46491fa456724eb6a327a35b5aca39cabca50975df29f892e390a39b13f2f749aa7d750e220801bfce026f0a63ac0de021b6fefce5e37e424bbf91d6d8a5348a
-  data.tar.gz: 492a5efb83efa8139efc8740250ac4f21c9a603df4bbfb845425b041cc592cbb7141268b775da0c008965efd3b6326ba1262cb0bcc791b29896685eb4af87b51
+  metadata.gz: fc465032bf4171b089fffef510ecad969418839242197c10409fa0902a4628b6ad94d1008446d63110fef169bad18d1b6797190403d1aa6ac77921cc99f26787
+  data.tar.gz: 14d7fc592455556266150de2a22d6f6f8323268db806e36d34d9bef381efb35ed57f3b0196d640a2da50afe3e7cb4dfd0808bee964b9327c9375e4559702e770

data/README.md

@@ -1,4 +1,4 @@
-# Tokite [![CircleCI](https://circleci.com/gh/cookpad/tokite.svg?style=svg)](https://circleci.com/gh/cookpad/tokite) [![Gem Version](https://badge.fury.io/rb/tokite.svg)](https://badge.fury.io/rb/tokite)
+# 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.
  
@@ -35,8 +35,8 @@ $ ./bin/rails tokite:yarn:install
 
 ## Configuration
 <table>
-<tr><th>GITHUB_CLIENT_ID</th><td>Google+ OAuth2 client ID</td></tr>
-<tr><th>GITHUB_CLIENT_SECRET</th><td>Google+ OAuth2 client secret</td></tr>
+<tr><th>GITHUB_CLIENT_ID</th><td>GitHub OAuth2 client ID</td></tr>
+<tr><th>GITHUB_CLIENT_SECRET</th><td>GitHub OAuth2 client secret</td></tr>
 <tr><th>GITHUB_HOST (optional)</th><td>GitHub Enterprise host</td></tr>
 <tr><th>SECRET_KEY_BASE</th><td><code>rails secret</code> key</td></tr>
 <tr><th>SLACK_WEBHOOK_URL</th><td>Slack incoming webhook url</td></tr>
@@ -73,6 +73,9 @@ Tokite support only below events now.
 <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>label:</td><td>Match pull_request or issue label.</td><td>label:Feature</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>requested_reviewer:</td><td>Match user name of review requested reviewer</td><td>requested_reviewer:hogelog</td></tr>
+<tr><td>requested_team:</td><td>Match team name of review requested team</td><td>requested_team:cookpad/chef</td></tr>
 <tr><td>unspecified</td><td>Match title or body field.</td><td>review please</td></tr>
 </table>

data/app/assets/stylesheets/tokite/application.scss

@@ -1,6 +1,6 @@
 @import "bulma/sass/utilities/initial-variables";
 
-// Bootstrap like colors
+// Bootstrap-like colors
 $white:  #fff;
 $black:  #000;
 $red:    #d9534f;
@@ -21,7 +21,3 @@ $dark: $grey-darker;
 $text: $grey-dark;
 
 @import "bulma/bulma";
-
-.vspace-40 {
-  margin: 40px 0;
-}

data/app/controllers/tokite/repositories_controller.rb

@@ -7,9 +7,12 @@ module Tokite
     end
 
     def new
-      github_repos = octokit_client.repositories.select{|r| r.permissions.admin }.delete_if(&:fork)
+      github_repos = octokit_client.repositories.
+        select{|r| r.permissions.admin }.
+        delete_if(&:fork).
+        delete_if(&:archived)
       @repositories = github_repos.map do |repo|
-        Repository.new(name: repo.full_name, url: repo.html_url)
+        Repository.new(name: repo.full_name, url: repo.html_url, private: repo.private)
       end
       Repository.all.pluck(:name).each do |existing_name|
         @repositories.delete_if {|repo| repo.name == existing_name }
@@ -17,11 +20,22 @@ module Tokite
     end
 
     def create
-      params[:names].each do |name|
-        github_repo = octokit_client.repository(name)
-        Repository.hook!(octokit_client, github_repo)
+      if params[:names].nil?
+        flash[:error] = "Error: No repository was selected"
+      else
+        github_repos = params[:names].map do |name|
+          octokit_client.repository(name)
+        end
+        errors = github_repos.select(&:archived).map(&:full_name)
+        if errors != []
+          flash[:error] = %(Error: The following repositories have been archived: #{errors.join(", ")})
+        else
+          github_repos.each do |repo|
+            Repository.hook!(octokit_client, repo)
+          end
+          flash[:info] = "Import repositories."
+        end
       end
-      flash[:info] = "Import repositories."
       redirect_to repositories_path
     end
 

data/app/controllers/tokite/rules_controller.rb

@@ -46,7 +46,7 @@ module Tokite
     private
 
     def rule_params
-      params.require(:rule).permit(:user_id, :name, :query, :channel, :icon_emoji, :additional_text)
+      params.require(:rule).permit(:user_id, :name, :query, :channel, :icon_emoji, :additional_text, :display_name)
     end
   end
 end

data/app/helpers/tokite/application_helper.rb

@@ -2,9 +2,9 @@ module Tokite
   module ApplicationHelper
     def nav_list_item(name, path, controllers)
       if controllers.include?(params[:controller])
-        link_to(name, path, class: "nav-item is-tab is-active")
+        link_to(name, path, class: "navbar-item is-tab is-active")
       else
-        link_to(name, path, class: "nav-item is-tab")
+        link_to(name, path, class: "navbar-item is-tab")
       end
     end
 

data/app/models/tokite/hook.rb

@@ -32,6 +32,7 @@ module Tokite
         if payloads.none? {|payload| payload[:channel] == rule.channel && payload[:emoji] == emoji && payload[:additional_text] == additional_text }
           payloads << {
             channel: rule.channel,
+            username: rule.display_name.presence || "tokite",
             text: event.slack_text,
             emoji: emoji,
             additional_text: additional_text,
@@ -40,8 +41,22 @@ module Tokite
         end
       end
       payloads.each do |payload|
-        notify!(channel: payload[:channel], text: payload[:text], icon_emoji: payload[:emoji], attachments: payload[:attachments])
-        notify!(channel: payload[:channel], text: payload[:additional_text], icon_emoji: payload[:emoji], parse: "full") if payload[:additional_text].present?
+        notify!(
+          channel: payload[:channel],
+          text: payload[:text],
+          icon_emoji: payload[:emoji],
+          attachments: payload[:attachments],
+          username: payload[:username]
+        )
+        if payload[:additional_text].present?
+          notify!(
+            channel: payload[:channel],
+            text: payload[:additional_text],
+            icon_emoji: payload[:emoji],
+            parse: "full",
+            username: payload[:username]
+          ) 
+        end
       end
     end
 

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

@@ -7,17 +7,18 @@ module Tokite
           repo: hook_params[:repository][:full_name],
           body: hook_params[:comment][:body],
           user: hook_params[:comment][:user][:login],
+          label: hook_params[:issue][:labels].map { |label| label[:name] },
         }
       end
-  
+
       def notify?
         %w(created).include?(hook_params[:action])
       end
-  
+
       def slack_text
         "[#{hook_params[:repository][:full_name]}] New comment by #{hook_params[:comment][:user][:login]} on issue <#{hook_params[:comment][:html_url]}|##{hook_params[:issue][:number]}: #{hook_params[:issue][:title]}>"
       end
-  
+
       def slack_attachment
         {
           fallback: hook_params[:comment][:body],

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

@@ -6,8 +6,9 @@ module Tokite
           event: "issues",
           repo: hook_params[:repository][:full_name],
           title: hook_params[:issue][:title],
-          body: hook_params[:issue][:body],
+          body: hook_params[:issue][:body] || "",
           user: hook_params[:issue][:user][:login],
+          label: hook_params[:issue][:labels].map { |label| label[:name] },
         }
       end
   
@@ -24,7 +25,7 @@ module Tokite
           title: "##{hook_params[:issue][:number]} #{hook_params[:issue][:title]}",
           title_link: hook_params[:issue][:html_url],
           fallback: "#{hook_params[:issue][:title]}\n#{hook_params[:issue][:body]}",
-          text: hook_params[:issue][:body],
+          text: hook_params[:issue][:body] || "",
           color: "good",
         }
       end

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

@@ -8,15 +8,32 @@ module Tokite
           title: hook_params[:pull_request][:title],
           body: hook_params[:pull_request][:body],
           user: hook_params[:pull_request][:user][:login],
+          label: hook_params[:pull_request][:labels].map { |label| label[:name] },
+          requested_reviewer: hook_params[:requested_reviewer]&.[](:login) || hook_params[:pull_request][:requested_reviewers].map { |reviewer| reviewer[:login] },
+          requested_team: hook_params[:pull_request][:requested_teams].map { |team| parse_team_name(team) },
         }
       end
 
+      def parse_team_name(team)
+        html_url = team[:html_url]
+        if /\/orgs\/(?<org_name>[^\s\/]+)\/teams\/(?<team_name>[^\s\/]+)\z/ =~ html_url
+          org_name + "/" + team_name
+        else
+          team[:slug] || team[:name]
+        end
+      end
+
       def notify?
-        %w(opened).include?(hook_params[:action])
+        %w(opened review_requested).include?(hook_params[:action])
       end
 
       def slack_text
-        "[#{hook_params[:repository][:full_name]}] Pull request submitted by <#{hook_params[:pull_request][:user][:html_url]}|#{hook_params[:pull_request][:user][:login]}>"
+        case hook_params[:action]
+        when 'opened'
+          "[#{hook_params[:repository][:full_name]}] Pull request submitted by <#{hook_params[:pull_request][:user][:html_url]}|#{hook_params[:pull_request][:user][:login]}>"
+        when 'review_requested'
+          "[#{hook_params[:repository][:full_name]}] Pull request review requested by <#{hook_params[:pull_request][:user][:html_url]}|#{hook_params[:pull_request][:user][:login]}>"
+        end
       end
 
       def slack_attachment

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

@@ -5,16 +5,17 @@ module Tokite
         {
           event: "pull_request_review",
           repo: hook_params[:repository][:full_name],
-          body: hook_params[:review][:body],
+          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]
+        if hook_params[:action] != "submitted"
+          false
+        elsif hook_params[:review][:state] == "commented"
+          hook_params[:review][:body] != nil
         else
           true
         end
@@ -35,7 +36,6 @@ module Tokite
       end
 
       def slack_attachment
-        return unless hook_params[:review][:body]
         case hook_params[:review][:state]
           when "commented"
           when "approved"
@@ -44,8 +44,8 @@ module Tokite
             color = "warning"
         end
         {
-          fallback: hook_params[:review][:body],
-          text: hook_params[:review][:body],
+          fallback: hook_params[:review][:body] || "",
+          text: hook_params[:review][:body] || "",
           color: color,
         }
       end

data/app/models/tokite/rule.rb

@@ -47,8 +47,8 @@ module Tokite
     private
 
     def validate_query
-      SearchQuery.parse(query)
-    rescue SearchQuery::ParseError => e
+      SearchQuery.validate(query)
+    rescue SearchQuery::QueryError => e
       errors.add(:query, e.message)
     end
 

data/app/models/tokite/search_query.rb

@@ -6,7 +6,11 @@ module Tokite
 
     DEFAULT_FIELDS = %i(title body)
 
-    class ParseError < StandardError
+    class QueryError < StandardError
+    end
+    class QueryParseError < QueryError
+    end
+    class QueryRegexpError < QueryError
     end
   
     class Parser < Parslet::Parser
@@ -37,7 +41,16 @@ module Tokite
     def self.parse(query)
       Array.wrap(parser.parse(query))
     rescue Parslet::ParseFailed => e
-      raise ParseError, e
+      raise QueryParseError, e
+    end
+
+    def self.validate(query)
+      tree = SearchQuery.parse(query)
+      tree.each do |word|
+        Regexp.compile(word[:regexp_word].to_s, Regexp::IGNORECASE) if word[:regexp_word]
+      end
+    rescue RegexpError => e
+      raise QueryRegexpError, e
     end
 
     def initialize(query)
@@ -49,13 +62,25 @@ module Tokite
       tree.all? do |word|
         field = word[:field]
         if field
-          targets = doc[field.to_sym] ? [doc[field.to_sym].downcase] : []
+          targets =
+            case doc[field.to_sym]
+            when Array
+              doc[field.to_sym].map(&:downcase)
+            when nil
+              []
+            else
+              [doc[field.to_sym].downcase]
+            end
         else
           targets = DEFAULT_FIELDS.map{|field| doc[field]&.downcase }.compact
         end
         if word[:regexp_word]
-          regexp = Regexp.compile(word[:regexp_word].to_s, Regexp::IGNORECASE)
-          matched = targets.any?{|text| regexp.match?(text) }
+          begin
+            regexp = Regexp.compile(word[:regexp_word].to_s, Regexp::IGNORECASE)
+            matched = targets.any?{|text| regexp.match?(text) }
+          rescue RegexpError
+            matched = false
+          end
         else
           value = word[:word].to_s.downcase
           matched = targets.any?{|text| text.index(value) }

data/app/views/layouts/tokite/application.html.haml

@@ -9,17 +9,19 @@
 
   %body
     - if current_user
-      %nav.nav.has-shadow
-        .container
-          .nav-left
+      %nav.navbar.has-shadow
+        .navbar-menu.is-active
+          .navbar-start
             = nav_list_item "Top", root_path, ["top"]
             = nav_list_item "Users", users_path, ["users"]
             = nav_list_item "Rules", rules_path, ["rules"]
             = nav_list_item "Repositories", repositories_path, ["repositories"]
-          .nav-right
-            %span.nav-item.is-tab= current_user.name_with_provider
+          .navbar-end
+            %span.navbar-item= current_user.name_with_provider
 
     %section.section
+      - if flash[:error]
+        .notification.is-danger= flash[:error]
       - if flash[:info]
         .notification.is-success= flash[:info]
 

data/app/views/tokite/repositories/index.html.haml

@@ -1,11 +1,11 @@
 - if current_user_token
   = link_to "Watch new repositories", new_repository_path, class: "button is-primary"
 
-.vspace-40
+.my-6
 
 %h1.title Watching repositories
 
-%table.table.is-bordered
+%table.table.is-bordered.is-hoverable
   - @repositories.each do |repo|
     %tr
       %td= link_to repo.name, repo.url

data/app/views/tokite/repositories/new.html.haml

@@ -7,9 +7,11 @@
             %label.checkbox
               = check_box_tag "names[]", repo.name, false, id: "names_#{sanitize_to_id(repo.name)}", multiple: true
               = repo.name
+              - if repo.private?
+                %span.tag.is-danger{style: "height: 1.5em"} private
               = link_to "@", repo.url
 
-    .vspace-40
+    .my-6
 
     .field
       .control

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

@@ -4,13 +4,14 @@
   = form_text_field f, :channel, size: 40, class: "input"
   = form_text_field f, :icon_emoji, size: 40, class: "input"
   = form_text_field f, :additional_text, size: 40, class: "input"
+  = form_text_field f, :display_name, size: 40, class: "input"
   .field.columns
     .column.is-8= f.submit "Update", class: "button is-primary"
     - if @rule.persisted?
       .column.is-2= link_to "Transfer", new_rule_transfers_path(@rule), class: "button is-primary"
       .column.is-2= link_to "Delete", rule_path(@rule), method: :delete, data: { confirm: %(Delete "#{@rule.name}"?) }, class: "button is-danger"
 
-.message.vspace-40
+.message.my-6
   .message-header
     Query description
   .message-body
@@ -58,10 +59,22 @@
         %td user:
         %td Match user name.
         %td user:hogelog
+      %tr
+        %td label:
+        %td Match pull_request or issue label.
+        %td label:Feature
       %tr
         %td review_state:
         %td Match pull_request_review state.
         %td review_state:/commented|approved|changes_requested/
+      %tr
+        %td requested_reviewer:
+        %td Match user name of review requested reviewer.
+        %td requested_reviewer:hogelog
+      %tr
+        %td requested_team:
+        %td Match team name of review requested team.
+        %td requested_team:cookpad/chef
       %tr
         %td unspecified
         %td Match title or body field.

data/lib/tokite/version.rb

@@ -1,3 +1,3 @@
 module Tokite
-  VERSION = '0.4.1'
+  VERSION = '0.5.1'
 end

data/schema/tokite_repositories.schema

@@ -2,6 +2,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
+  t.boolean  "private",                null: false, default: false
 end
 
 add_index "tokite_repositories", ["name"], name: "tokite_repositories_uniq_name", unique: true, using: :btree

data/schema/tokite_rules.schema

@@ -3,10 +3,11 @@ create_table "tokite_rules", force: :cascade do |t|
   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   "icon_emoji",      limit: 30,   null: false, default: ""
   t.string   "additional_text", limit: 200,  null: false, default: ""
   t.datetime "created_at",                   null: false
   t.datetime "updated_at",                   null: false
+  t.string   "display_name",    limit: 60,   null: false, default: ""
 end
 
 add_index "tokite_rules", ["user_id", "name"], name: "tokite_rule_uniq_name", unique: true, using: :btree

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tokite
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - hogelog
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: '5.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: '5.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.8.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +162,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +261,7 @@ homepage: https://github.com/cookpad/tokite/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -270,9 +276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Customizable Slack notification from GitHub
 test_files: []