Create Slack Slash command service

17 files changed, 156 insertions, 51 deletions

diff --git a/Gemfile b/Gemfile
index 5eb8c32b168..a59b874248b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -170,7 +170,7 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
 gem 'gemnasium-gitlab-service', '~> 0.2'
 
 # Slack integration
-gem 'slack-notifier', '~> 1.2.0'
+gem 'slack-notifier', '~> 1.5.1'
 
 # Asana integration
 gem 'asana', '~> 0.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 23e45ddc16f..f33b171e1d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -687,7 +687,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slack-notifier (1.2.1)
+    slack-notifier (1.5.1)
     slop (3.6.0)
     spinach (0.8.10)
       colorize
@@ -957,7 +957,7 @@ DEPENDENCIES
   sidekiq-cron (~> 0.4.4)
   sidekiq-limit_fetch (~> 3.4)
   simplecov (= 0.12.0)
-  slack-notifier (~> 1.2.0)
+  slack-notifier (~> 1.5.1)
   spinach-rails (~> 0.2.1)
   spinach-rerun-reporter (~> 0.0.2)
   spring (~> 1.7.0)
diff --git a/app/models/project.rb b/app/models/project.rb
index 5d092ca42c2..7f3a4debfc6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -96,6 +96,7 @@ class Project < ActiveRecord::Base
   has_one :gemnasium_service, dependent: :destroy
   has_one :mattermost_slash_commands_service, dependent: :destroy
   has_one :mattermost_notification_service, dependent: :destroy
+  has_one :slack_slash_commands_service, dependent: :destroy
   has_one :slack_notification_service, dependent: :destroy
   has_one :buildkite_service, dependent: :destroy
   has_one :bamboo_service, dependent: :destroy
diff --git a/app/models/project_services/slack_slash_commands_service.rb b/app/models/project_services/slack_slash_commands_service.rb
new file mode 100644
index 00000000000..9c66f95eef9
--- /dev/null
+++ b/app/models/project_services/slack_slash_commands_service.rb
@@ -0,0 +1,49 @@
+class SlackSlashCommandsService < ChatService
+  include TriggersHelper
+
+  prop_accessor :token
+
+  def can_test?
+    false
+  end
+
+  def title
+    'Slack Slash Command'
+  end
+
+  def description
+    "Perform common operations on GitLab in Slack"
+  end
+
+  def to_param
+    'slack_slash_commands'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'token', placeholder: '' }
+    ]
+  end
+
+  def trigger(params)
+    return nil unless valid_token?(params[:token])
+
+    user = find_chat_user(params)
+    unless user
+      url = authorize_chat_name_url(params)
+      return Gitlab::ChatCommands::Presenters::Access.new(url).authorize
+    end
+
+    Gitlab::ChatCommands::Command.new(project, user, params).execute
+  end
+
+  private
+
+  def find_chat_user(params)
+    ChatNames::FindUserService.new(self, params).execute
+  end
+
+  def authorize_chat_name_url(params)
+    ChatNames::AuthorizeUserService.new(self, params).execute
+  end
+end
diff --git a/app/models/service.rb b/app/models/service.rb
index 0bbab078cf6..8abd8e73e43 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -216,11 +216,12 @@ class Service < ActiveRecord::Base
       jira
       kubernetes
       mattermost_slash_commands
+      mattermost_notification
       pipelines_email
       pivotaltracker
       pushover
       redmine
-      mattermost_notification
+      slack_slash_commands
       slack_notification
       teamcity
     ]
diff --git a/app/views/projects/services/mattermost_slash_commands/_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_help.html.haml
index a676c0290a0..2bdd4cd148c 100644
--- a/app/views/projects/services/mattermost_slash_commands/_help.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml
@@ -1,4 +1,4 @@
-- pretty_path_with_namespace = "#{@project ? @project.namespace.name : 'namespace'} / #{@project ? @project.name : 'name'}"
+- pretty_path_with_namespace = "#{@project.namespace ? @project.namespace.name : 'namespace'} / #{@project ? @project.name : 'name'}"
 - run_actions_text = "Perform common operations on this project: #{pretty_path_with_namespace}"
 
 .well
diff --git a/changelogs/unreleased/zj-slack-slash-commands.yml b/changelogs/unreleased/zj-slack-slash-commands.yml
new file mode 100644
index 00000000000..9f4c8681ad0
--- /dev/null
+++ b/changelogs/unreleased/zj-slack-slash-commands.yml
@@ -0,0 +1,4 @@
+---
+title: Refactor presenters ChatCommands
+merge_request: 7846
+author: 
diff --git a/lib/gitlab/chat_commands/deploy.rb b/lib/gitlab/chat_commands/deploy.rb
index 0eed1fce0dc..6bb854dc080 100644
--- a/lib/gitlab/chat_commands/deploy.rb
+++ b/lib/gitlab/chat_commands/deploy.rb
@@ -4,7 +4,7 @@ module Gitlab
       include Gitlab::Routing.url_helpers
 
       def self.match(text)
-        /\Adeploy\s+(?<from>.*)\s+to+\s+(?<to>.*)\z/.match(text)
+        /\Adeploy\s+(?<from>\S+.*)\s+to+\s+(?<to>\S+.*)\z/.match(text)
       end
 
       def self.help_message
diff --git a/lib/gitlab/chat_commands/help.rb b/lib/gitlab/chat_commands/help.rb
new file mode 100644
index 00000000000..e76733f5445
--- /dev/null
+++ b/lib/gitlab/chat_commands/help.rb
@@ -0,0 +1,28 @@
+module Gitlab
+  module ChatCommands
+    class Help < BaseCommand
+      # This class has to be used last, as it always matches. It has to match
+      # because other commands were not triggered and we want to show the help
+      # command
+      def self.match(_text)
+        true
+      end
+
+      def self.help_message
+        'help'
+      end
+
+      def self.allowed?(_project, _user)
+        true
+      end
+
+      def execute(commands)
+        Gitlab::ChatCommands::Presenters::Help.new(commands).present(trigger)
+      end
+
+      def trigger
+        params[:command]
+      end
+    end
+  end
+end
diff --git a/lib/mattermost/presenter.rb b/lib/gitlab/chat_commands/presenters/mattermost.rb
index 67eda983a74..67eda983a74 100644
--- a/lib/mattermost/presenter.rb
+++ b/lib/gitlab/chat_commands/presenters/mattermost.rb
diff --git a/spec/lib/gitlab/chat_commands/command_spec.rb b/spec/lib/gitlab/chat_commands/command_spec.rb
index bfc6818ac08..ed8d25a526a 100644
--- a/spec/lib/gitlab/chat_commands/command_spec.rb
+++ b/spec/lib/gitlab/chat_commands/command_spec.rb
@@ -64,7 +64,7 @@ describe Gitlab::ChatCommands::Command, service: true do
       context 'and user can not create deployment' do
         it 'returns action' do
           expect(subject[:response_type]).to be(:ephemeral)
-          expect(subject[:text]).to start_with('Whoops! That action is not allowed')
+          expect(subject[:text]).to start_with('Whoops! This action is not allowed')
         end
       end
 
@@ -74,7 +74,7 @@ describe Gitlab::ChatCommands::Command, service: true do
         end
 
         it 'returns action' do
-          expect(subject[:text]).to include('Deployment from staging to production started')
+          expect(subject[:text]).to include('Deployment started from staging to production')
           expect(subject[:response_type]).to be(:in_channel)
         end
 
@@ -91,4 +91,26 @@ describe Gitlab::ChatCommands::Command, service: true do
       end
     end
   end
+
+  describe '#match_command' do
+    subject { described_class.new(project, user, params).match_command.first }
+
+    context 'IssueShow is triggered' do
+      let(:params) { { text: 'issue show 123' } }
+
+      it { is_expected.to eq(Gitlab::ChatCommands::IssueShow) }
+    end
+
+    context 'IssueCreate is triggered' do
+      let(:params) { { text: 'issue create my title' } }
+
+      it { is_expected.to eq(Gitlab::ChatCommands::IssueCreate) }
+    end
+
+    context 'IssueSearch is triggered' do
+      let(:params) { { text: 'issue search my query' } }
+
+      it { is_expected.to eq(Gitlab::ChatCommands::IssueSearch) }
+    end
+  end
 end
diff --git a/spec/models/project_services/chat_message/build_message_spec.rb b/spec/models/project_services/chat_message/build_message_spec.rb
index b71d153f814..50ad5013df9 100644
--- a/spec/models/project_services/chat_message/build_message_spec.rb
+++ b/spec/models/project_services/chat_message/build_message_spec.rb
@@ -10,7 +10,7 @@ describe ChatMessage::BuildMessage do
       tag: false,
 
       project_name: 'project_name',
-      project_url: 'example.gitlab.com',
+      project_url: 'http://example.gitlab.com',
 
       commit: {
         status: status,
@@ -48,10 +48,10 @@ describe ChatMessage::BuildMessage do
   end
 
   def build_message(status_text = status)
-    "<example.gitlab.com|project_name>:" \
-    " Commit <example.gitlab.com/commit/" \
+    "<http://example.gitlab.com|project_name>:" \
+    " Commit <http://example.gitlab.com/commit/" \
     "97de212e80737a608d939f648d959671fb0a0142/builds|97de212e>" \
-    " of <example.gitlab.com/commits/develop|develop> branch" \
+    " of <http://example.gitlab.com/commits/develop|develop> branch" \
     " by hacker #{status_text} in #{duration} #{'second'.pluralize(duration)}"
   end
 end
diff --git a/spec/models/project_services/chat_message/issue_message_spec.rb b/spec/models/project_services/chat_message/issue_message_spec.rb
index ebe0ead4408..190ff4c535d 100644
--- a/spec/models/project_services/chat_message/issue_message_spec.rb
+++ b/spec/models/project_services/chat_message/issue_message_spec.rb
@@ -10,14 +10,14 @@ describe ChatMessage::IssueMessage, models: true do
         username: 'test.user'
       },
       project_name: 'project_name',
-      project_url: 'somewhere.com',
+      project_url: 'http://somewhere.com',
 
       object_attributes: {
         title: 'Issue title',
         id: 10,
         iid: 100,
         assignee_id: 1,
-        url: 'url',
+        url: 'http://url.com',
         action: 'open',
         state: 'opened',
         description: 'issue description'
@@ -40,11 +40,11 @@ describe ChatMessage::IssueMessage, models: true do
   context 'open' do
     it 'returns a message regarding opening of issues' do
       expect(subject.pretext).to eq(
-        '<somewhere.com|[project_name>] Issue opened by test.user')
+        '[<http://somewhere.com|project_name>] Issue opened by test.user')
       expect(subject.attachments).to eq([
         {
           title: "#100 Issue title",
-          title_link: "url",
+          title_link: "http://url.com",
           text: "issue description",
           color: color,
         }
@@ -60,7 +60,7 @@ describe ChatMessage::IssueMessage, models: true do
 
     it 'returns a message regarding closing of issues' do
       expect(subject.pretext). to eq(
-        '<somewhere.com|[project_name>] Issue <url|#100 Issue title> closed by test.user')
+        '[<http://somewhere.com|project_name>] Issue <http://url.com|#100 Issue title> closed by test.user')
       expect(subject.attachments).to be_empty
     end
   end
diff --git a/spec/models/project_services/chat_message/merge_message_spec.rb b/spec/models/project_services/chat_message/merge_message_spec.rb
index 07c414c6ca4..cc154112e90 100644
--- a/spec/models/project_services/chat_message/merge_message_spec.rb
+++ b/spec/models/project_services/chat_message/merge_message_spec.rb
@@ -10,14 +10,14 @@ describe ChatMessage::MergeMessage, models: true do
           username: 'test.user'
       },
       project_name: 'project_name',
-      project_url: 'somewhere.com',
+      project_url: 'http://somewhere.com',
 
       object_attributes: {
         title: "Issue title\nSecond line",
         id: 10,
         iid: 100,
         assignee_id: 1,
-        url: 'url',
+        url: 'http://url.com',
         state: 'opened',
         description: 'issue description',
         source_branch: 'source_branch',
@@ -31,8 +31,8 @@ describe ChatMessage::MergeMessage, models: true do
   context 'open' do
     it 'returns a message regarding opening of merge requests' do
       expect(subject.pretext).to eq(
-        'test.user opened <somewhere.com/merge_requests/100|merge request !100> '\
-        'in <somewhere.com|project_name>: *Issue title*')
+        'test.user opened <http://somewhere.com/merge_requests/100|merge request !100> '\
+        'in <http://somewhere.com|project_name>: *Issue title*')
       expect(subject.attachments).to be_empty
     end
   end
@@ -43,8 +43,8 @@ describe ChatMessage::MergeMessage, models: true do
     end
     it 'returns a message regarding closing of merge requests' do
       expect(subject.pretext).to eq(
-        'test.user closed <somewhere.com/merge_requests/100|merge request !100> '\
-        'in <somewhere.com|project_name>: *Issue title*')
+        'test.user closed <http://somewhere.com/merge_requests/100|merge request !100> '\
+        'in <http://somewhere.com|project_name>: *Issue title*')
       expect(subject.attachments).to be_empty
     end
   end
diff --git a/spec/models/project_services/chat_message/note_message_spec.rb b/spec/models/project_services/chat_message/note_message_spec.rb
index 31936da40a2..da700a08e57 100644
--- a/spec/models/project_services/chat_message/note_message_spec.rb
+++ b/spec/models/project_services/chat_message/note_message_spec.rb
@@ -11,15 +11,15 @@ describe ChatMessage::NoteMessage, models: true do
             avatar_url: 'http://fakeavatar'
         },
         project_name: 'project_name',
-        project_url: 'somewhere.com',
+        project_url: 'http://somewhere.com',
         repository: {
             name: 'project_name',
-            url: 'somewhere.com',
+            url: 'http://somewhere.com',
         },
         object_attributes: {
             id: 10,
             note: 'comment on a commit',
-            url: 'url',
+            url: 'http://url.com',
             noteable_type: 'Commit'
         }
     }
@@ -37,8 +37,8 @@ describe ChatMessage::NoteMessage, models: true do
 
     it 'returns a message regarding notes on commits' do
       message = described_class.new(@args)
-      expect(message.pretext).to eq("test.user <url|commented on " \
-      "commit 5f163b2b> in <somewhere.com|project_name>: " \
+      expect(message.pretext).to eq("test.user <http://url.com|commented on " \
+      "commit 5f163b2b> in <http://somewhere.com|project_name>: " \
       "*Added a commit message*")
       expected_attachments = [
           {
@@ -63,8 +63,8 @@ describe ChatMessage::NoteMessage, models: true do
 
     it 'returns a message regarding notes on a merge request' do
       message = described_class.new(@args)
-      expect(message.pretext).to eq("test.user <url|commented on " \
-      "merge request !30> in <somewhere.com|project_name>: " \
+      expect(message.pretext).to eq("test.user <http://url.com|commented on " \
+      "merge request !30> in <http://somewhere.com|project_name>: " \
       "*merge request title*")
       expected_attachments = [
           {
@@ -90,8 +90,8 @@ describe ChatMessage::NoteMessage, models: true do
     it 'returns a message regarding notes on an issue' do
       message = described_class.new(@args)
       expect(message.pretext).to eq(
-        "test.user <url|commented on " \
-        "issue #20> in <somewhere.com|project_name>: " \
+        "test.user <http://url.com|commented on " \
+        "issue #20> in <http://somewhere.com|project_name>: " \
         "*issue title*")
       expected_attachments = [
           {
@@ -115,8 +115,8 @@ describe ChatMessage::NoteMessage, models: true do
 
     it 'returns a message regarding notes on a project snippet' do
       message = described_class.new(@args)
-      expect(message.pretext).to eq("test.user <url|commented on " \
-      "snippet #5> in <somewhere.com|project_name>: " \
+      expect(message.pretext).to eq("test.user <http://url.com|commented on " \
+      "snippet #5> in <http://somewhere.com|project_name>: " \
       "*snippet title*")
       expected_attachments = [
           {
diff --git a/spec/models/project_services/chat_message/push_message_spec.rb b/spec/models/project_services/chat_message/push_message_spec.rb
index b781c4505db..24928873bad 100644
--- a/spec/models/project_services/chat_message/push_message_spec.rb
+++ b/spec/models/project_services/chat_message/push_message_spec.rb
@@ -10,7 +10,7 @@ describe ChatMessage::PushMessage, models: true do
       project_name: 'project_name',
       ref: 'refs/heads/master',
       user_name: 'test.user',
-      project_url: 'url'
+      project_url: 'http://url.com'
     }
   end
 
@@ -19,20 +19,20 @@ describe ChatMessage::PushMessage, models: true do
   context 'push' do
     before do
       args[:commits] = [
-        { message: 'message1', url: 'url1', id: 'abcdefghijkl', author: { name: 'author1' } },
-        { message: 'message2', url: 'url2', id: '123456789012', author: { name: 'author2' } },
+        { message: 'message1', url: 'http://url1.com', id: 'abcdefghijkl', author: { name: 'author1' } },
+        { message: 'message2', url: 'http://url2.com', id: '123456789012', author: { name: 'author2' } },
       ]
     end
 
     it 'returns a message regarding pushes' do
       expect(subject.pretext).to eq(
-        'test.user pushed to branch <url/commits/master|master> of '\
-        '<url|project_name> (<url/compare/before...after|Compare changes>)'
+        'test.user pushed to branch <http://url.com/commits/master|master> of '\
+        '<http://url.com|project_name> (<http://url.com/compare/before...after|Compare changes>)'
       )
       expect(subject.attachments).to eq([
         {
-          text: "<url1|abcdefgh>: message1 - author1\n"\
-                "<url2|12345678>: message2 - author2",
+          text: "<http://url1.com|abcdefgh>: message1 - author1\n"\
+                "<http://url2.com|12345678>: message2 - author2",
           color: color,
         }
       ])
@@ -47,14 +47,14 @@ describe ChatMessage::PushMessage, models: true do
         project_name: 'project_name',
         ref: 'refs/tags/new_tag',
         user_name: 'test.user',
-        project_url: 'url'
+        project_url: 'http://url.com'
       }
     end
 
     it 'returns a message regarding pushes' do
       expect(subject.pretext).to eq('test.user pushed new tag ' \
-       '<url/commits/new_tag|new_tag> to ' \
-       '<url|project_name>')
+                                    '<http://url.com/commits/new_tag|new_tag> to ' \
+                                    '<http://url.com|project_name>')
       expect(subject.attachments).to be_empty
     end
   end
@@ -66,8 +66,8 @@ describe ChatMessage::PushMessage, models: true do
 
     it 'returns a message regarding a new branch' do
       expect(subject.pretext).to eq(
-        'test.user pushed new branch <url/commits/master|master> to '\
-        '<url|project_name>'
+        'test.user pushed new branch <http://url.com/commits/master|master> to '\
+        '<http://url.com|project_name>'
       )
       expect(subject.attachments).to be_empty
     end
@@ -80,7 +80,7 @@ describe ChatMessage::PushMessage, models: true do
 
     it 'returns a message regarding a removed branch' do
       expect(subject.pretext).to eq(
-        'test.user removed branch master from <url|project_name>'
+        'test.user removed branch master from <http://url.com|project_name>'
       )
       expect(subject.attachments).to be_empty
     end
diff --git a/spec/models/project_services/chat_message/wiki_page_message_spec.rb b/spec/models/project_services/chat_message/wiki_page_message_spec.rb
index 94c04dc0865..a2ad61e38e7 100644
--- a/spec/models/project_services/chat_message/wiki_page_message_spec.rb
+++ b/spec/models/project_services/chat_message/wiki_page_message_spec.rb
@@ -10,10 +10,10 @@ describe ChatMessage::WikiPageMessage, models: true do
         username: 'test.user'
       },
       project_name: 'project_name',
-      project_url: 'somewhere.com',
+      project_url: 'http://somewhere.com',
       object_attributes: {
         title: 'Wiki page title',
-        url: 'url',
+        url: 'http://url.com',
         content: 'Wiki page description'
       }
     }
@@ -25,7 +25,7 @@ describe ChatMessage::WikiPageMessage, models: true do
 
       it 'returns a message that a new wiki page was created' do
         expect(subject.pretext).to eq(
-          'test.user created <url|wiki page> in <somewhere.com|project_name>: '\
+          'test.user created <http://url.com|wiki page> in <http://somewhere.com|project_name>: '\
           '*Wiki page title*')
       end
     end
@@ -35,7 +35,7 @@ describe ChatMessage::WikiPageMessage, models: true do
 
       it 'returns a message that a wiki page was updated' do
         expect(subject.pretext).to eq(
-          'test.user edited <url|wiki page> in <somewhere.com|project_name>: '\
+          'test.user edited <http://url.com|wiki page> in <http://somewhere.com|project_name>: '\
           '*Wiki page title*')
       end
     end