Merge pull request #5216 from bladealslayer/feature/flowdock_integration

Added Flowdock integration support via a service.

Merge pull request #5216 from bladealslayer/feature/flowdock_integration
Added Flowdock integration support via a service.
Dmitriy Zaporozhets
2 parents dc00562f e8b6974a
Showing 7 changed files with 129 additions and 1 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/flowdock_service.rb
app/models/project.rb
features/project/service.feature
features/steps/project/project_services.rb
spec/models/flowdock_service_spec.rb
@@ -111,6 +111,9 @@ gem &#39;tinder&#39;, &#39;~&gt; 1.9.2&#39;
 # HipChat integration
 gem "hipchat", "~> 0.9.0"
  
+# Flowdock integration
+gem "gitlab-flowdock-git-hook", "~> 0.4.2"
+
 # d3
 gem "d3_rails", "~> 3.1.4"
  
@@ -156,6 +156,9 @@ GEM
       pygments.rb (>= 0.2.13)
     github-markdown (0.5.3)
     github-markup (0.7.5)
+    gitlab-flowdock-git-hook (0.4.2.2)
+      gitlab-grit (>= 2.4.1)
+      multi_json
     gitlab-gollum-lib (1.0.1)
       github-markdown (~> 0.5.3)
       github-markup (>= 0.7.5, < 1.0.0)
@@ -571,6 +574,7 @@ DEPENDENCIES
   gemoji (~> 1.2.1)
   github-linguist
   github-markup (~> 0.7.4)
+  gitlab-flowdock-git-hook (~> 0.4.2)
   gitlab-gollum-lib (~> 1.0.1)
   gitlab-grack (~> 1.0.1)
   gitlab-pygments.rb (~> 0.3.2)
@@ -0,0 +1,52 @@
+# == Schema Information
+#
+# Table name: services
+#
+#  id          :integer          not null, primary key
+#  type        :string(255)
+#  title       :string(255)
+#  token       :string(255)
+#  project_id  :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  active      :boolean          default(FALSE), not null
+#  project_url :string(255)
+#
+
+require "flowdock-git-hook"
+
+class FlowdockService < Service
+  validates :token, presence: true, if: :activated?
+
+  def title
+    'Flowdock'
+  end
+
+  def description
+    'Flowdock is a collaboration web app for technical teams.'
+  end
+
+  def to_param
+    'flowdock'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'token',     placeholder: '' }
+    ]
+  end
+
+  def execute(push_data)
+    repo_path = File.join(Gitlab.config.gitlab_shell.repos_path, "#{project.path_with_namespace}.git")
+    Flowdock::Git.post(
+      push_data[:ref],
+      push_data[:before],
+      push_data[:after],
+      token: token,
+      repo: repo_path,
+      repo_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}",
+      commit_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/%s",
+      diff_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/compare/%s...%s",
+      )
+  end
+end
@@ -46,6 +46,7 @@ class Project &lt; ActiveRecord::Base
   has_one :campfire_service, dependent: :destroy
   has_one :pivotaltracker_service, dependent: :destroy
   has_one :hipchat_service, dependent: :destroy
+  has_one :flowdock_service, dependent: :destroy
   has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
   has_one :forked_from_project, through: :forked_project_link
  
@@ -219,7 +220,7 @@ class Project &lt; ActiveRecord::Base
   end
  
   def available_services_names
-    %w(gitlab_ci campfire hipchat pivotaltracker)
+    %w(gitlab_ci campfire hipchat pivotaltracker flowdock)
   end
  
   def gitlab_ci?
@@ -24,3 +24,9 @@ Feature: Project Services
     And I click pivotaltracker service link
     And I fill pivotaltracker settings
     Then I should see pivotaltracker service settings saved
+
+  Scenario: Activate Flowdock service
+    When I visit project "Shop" services page
+    And I click Flowdock service link
+    And I fill Flowdock settings
+    Then I should see Flowdock service settings saved
@@ -58,4 +58,18 @@ class ProjectServices &lt; Spinach::FeatureSteps
   Then 'I should see pivotaltracker service settings saved' do
     find_field('Token').value.should == 'verySecret'
   end
+
+  And 'I click Flowdock service link' do
+    click_link 'Flowdock'
+  end
+
+  And 'I fill Flowdock settings' do
+    check 'Active'
+    fill_in 'Token', with: 'verySecret'
+    click_button 'Save'
+  end
+
+  Then 'I should see Flowdock service settings saved' do
+    find_field('Token').value.should == 'verySecret'
+  end
 end
@@ -0,0 +1,48 @@
+# == Schema Information
+#
+# Table name: services
+#
+#  id          :integer          not null, primary key
+#  type        :string(255)
+#  title       :string(255)
+#  token       :string(255)
+#  project_id  :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  active      :boolean          default(FALSE), not null
+#  project_url :string(255)
+#
+
+require 'spec_helper'
+
+describe FlowdockService do
+  describe "Associations" do
+    it { should belong_to :project }
+    it { should have_one :service_hook }
+  end
+
+  describe "Execute" do
+    let(:user)    { create(:user) }
+    let(:project) { create(:project_with_code) }
+
+    before do
+      @flowdock_service = FlowdockService.new
+      @flowdock_service.stub(
+        project_id: project.id,
+        project: project,
+        service_hook: true,
+        token: 'verySecret'
+      )
+      @sample_data = GitPushService.new.sample_data(project, user)
+      @api_url = 'https://api.flowdock.com/v1/git/verySecret'
+      WebMock.stub_request(:post, @api_url)
+    end
+
+    it "should call FlowDock API" do
+      @flowdock_service.execute(@sample_data)
+      WebMock.should have_requested(:post, @api_url).with(
+        body: /#{@sample_data[:before]}.*#{@sample_data[:after]}.*#{project.path}/
+      ).once
+    end
+  end
+end
...	...	@@ -111,6 +111,9 @@ gem 'tinder', '~> 1.9.2'
111	111	# HipChat integration
112	112	gem "hipchat", "~> 0.9.0"
113	113
	114	+# Flowdock integration
	115	+gem "gitlab-flowdock-git-hook", "~> 0.4.2"
	116	+
114	117	# d3
115	118	gem "d3_rails", "~> 3.1.4"
116	119
...	...
...	...	@@ -156,6 +156,9 @@ GEM
156	156	pygments.rb (>= 0.2.13)
157	157	github-markdown (0.5.3)
158	158	github-markup (0.7.5)
	159	+ gitlab-flowdock-git-hook (0.4.2.2)
	160	+ gitlab-grit (>= 2.4.1)
	161	+ multi_json
159	162	gitlab-gollum-lib (1.0.1)
160	163	github-markdown (~> 0.5.3)
161	164	github-markup (>= 0.7.5, < 1.0.0)
...	...	@@ -571,6 +574,7 @@ DEPENDENCIES
571	574	gemoji (~> 1.2.1)
572	575	github-linguist
573	576	github-markup (~> 0.7.4)
	577	+ gitlab-flowdock-git-hook (~> 0.4.2)
574	578	gitlab-gollum-lib (~> 1.0.1)
575	579	gitlab-grack (~> 1.0.1)
576	580	gitlab-pygments.rb (~> 0.3.2)
...	...
...	...	@@ -0,0 +1,52 @@
	1	+# == Schema Information
	2	+#
	3	+# Table name: services
	4	+#
	5	+# id :integer not null, primary key
	6	+# type :string(255)
	7	+# title :string(255)
	8	+# token :string(255)
	9	+# project_id :integer not null
	10	+# created_at :datetime not null
	11	+# updated_at :datetime not null
	12	+# active :boolean default(FALSE), not null
	13	+# project_url :string(255)
	14	+#
	15	+
	16	+require "flowdock-git-hook"
	17	+
	18	+class FlowdockService < Service
	19	+ validates :token, presence: true, if: :activated?
	20	+
	21	+ def title
	22	+ 'Flowdock'
	23	+ end
	24	+
	25	+ def description
	26	+ 'Flowdock is a collaboration web app for technical teams.'
	27	+ end
	28	+
	29	+ def to_param
	30	+ 'flowdock'
	31	+ end
	32	+
	33	+ def fields
	34	+ [
	35	+ { type: 'text', name: 'token', placeholder: '' }
	36	+ ]
	37	+ end
	38	+
	39	+ def execute(push_data)
	40	+ repo_path = File.join(Gitlab.config.gitlab_shell.repos_path, "#{project.path_with_namespace}.git")
	41	+ Flowdock::Git.post(
	42	+ push_data[:ref],
	43	+ push_data[:before],
	44	+ push_data[:after],
	45	+ token: token,
	46	+ repo: repo_path,
	47	+ repo_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}",
	48	+ commit_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/%s",
	49	+ diff_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/compare/%s...%s",
	50	+ )
	51	+ end
	52	+end
...	...
...	...	@@ -46,6 +46,7 @@ class Project < ActiveRecord::Base
46	46	has_one :campfire_service, dependent: :destroy
47	47	has_one :pivotaltracker_service, dependent: :destroy
48	48	has_one :hipchat_service, dependent: :destroy
	49	+ has_one :flowdock_service, dependent: :destroy
49	50	has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
50	51	has_one :forked_from_project, through: :forked_project_link
51	52
...	...	@@ -219,7 +220,7 @@ class Project < ActiveRecord::Base
219	220	end
220	221
221	222	def available_services_names
222		- %w(gitlab_ci campfire hipchat pivotaltracker)
	223	+ %w(gitlab_ci campfire hipchat pivotaltracker flowdock)
223	224	end
224	225
225	226	def gitlab_ci?
...	...
...	...	@@ -24,3 +24,9 @@ Feature: Project Services
24	24	And I click pivotaltracker service link
25	25	And I fill pivotaltracker settings
26	26	Then I should see pivotaltracker service settings saved
	27	+
	28	+ Scenario: Activate Flowdock service
	29	+ When I visit project "Shop" services page
	30	+ And I click Flowdock service link
	31	+ And I fill Flowdock settings
	32	+ Then I should see Flowdock service settings saved
...	...
...	...	@@ -58,4 +58,18 @@ class ProjectServices < Spinach::FeatureSteps
58	58	Then 'I should see pivotaltracker service settings saved' do
59	59	find_field('Token').value.should == 'verySecret'
60	60	end
	61	+
	62	+ And 'I click Flowdock service link' do
	63	+ click_link 'Flowdock'
	64	+ end
	65	+
	66	+ And 'I fill Flowdock settings' do
	67	+ check 'Active'
	68	+ fill_in 'Token', with: 'verySecret'
	69	+ click_button 'Save'
	70	+ end
	71	+
	72	+ Then 'I should see Flowdock service settings saved' do
	73	+ find_field('Token').value.should == 'verySecret'
	74	+ end
61	75	end
...	...
...	...	@@ -0,0 +1,48 @@
	1	+# == Schema Information
	2	+#
	3	+# Table name: services
	4	+#
	5	+# id :integer not null, primary key
	6	+# type :string(255)
	7	+# title :string(255)
	8	+# token :string(255)
	9	+# project_id :integer not null
	10	+# created_at :datetime not null
	11	+# updated_at :datetime not null
	12	+# active :boolean default(FALSE), not null
	13	+# project_url :string(255)
	14	+#
	15	+
	16	+require 'spec_helper'
	17	+
	18	+describe FlowdockService do
	19	+ describe "Associations" do
	20	+ it { should belong_to :project }
	21	+ it { should have_one :service_hook }
	22	+ end
	23	+
	24	+ describe "Execute" do
	25	+ let(:user) { create(:user) }
	26	+ let(:project) { create(:project_with_code) }
	27	+
	28	+ before do
	29	+ @flowdock_service = FlowdockService.new
	30	+ @flowdock_service.stub(
	31	+ project_id: project.id,
	32	+ project: project,
	33	+ service_hook: true,
	34	+ token: 'verySecret'
	35	+ )
	36	+ @sample_data = GitPushService.new.sample_data(project, user)
	37	+ @api_url = 'https://api.flowdock.com/v1/git/verySecret'
	38	+ WebMock.stub_request(:post, @api_url)
	39	+ end
	40	+
	41	+ it "should call FlowDock API" do
	42	+ @flowdock_service.execute(@sample_data)
	43	+ WebMock.should have_requested(:post, @api_url).with(
	44	+ body: /#{@sample_data[:before]}.#{@sample_data[:after]}.#{project.path}/
	45	+ ).once
	46	+ end
	47	+ end
	48	+end
...	...