GitLabCi Service imtegration

Dmitriy Zaporozhets
1 parent 85007434
Showing 16 changed files with 158 additions and 7 deletions Show diff stats
app/assets/images/service-disabled-gitlab-ci.png
app/assets/images/service-gitlab-ci.png
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/controllers/services_controller.rb
app/models/gitlab_ci_service.rb
app/models/project.rb
app/models/service.rb
app/roles/push_observer.rb
app/views/projects/_project_head.html.haml
app/views/services/_gitlab_ci.html.haml
app/views/services/edit.html.haml
app/views/services/index.html.haml
config/routes.rb
db/migrate/20121120103700_add_active_to_service.rb
db/migrate/20121120113838_add_project_url_to_service.rb
db/schema.rb
@@ -73,6 +73,7 @@ img.avatar.s16 { width:16px; height:16px; margin-right:6px; }
 img.avatar.s24 { width:24px; height:24px; margin-right:8px; }
 img.avatar.s32 { width:32px; height:32px; margin-right:10px; }
 img.lil_av { padding-left: 4px; padding-right:3px; }
+img.small { width: 80px; }
  
 /** HELPERS **/
 .nothing_here_message { text-align:center; padding:20px; color:#777; }
@@ -87,3 +88,5 @@ input[type=&#39;search&#39;].search-text-input {
   @include border-radius(4px);
   border:1px solid #ccc;
 }
+
+fieldset legend { font-size: 17px; }
@@ -0,0 +1,37 @@
+class ServicesController < ProjectResourceController
+  # Authorize
+  before_filter :authorize_admin_project!
+
+  respond_to :html
+
+  def index
+    @gitlab_ci_service = @project.gitlab_ci_service
+  end
+
+  def edit
+    @service = @project.gitlab_ci_service
+
+    # Create if missing
+    @service = @project.create_gitlab_ci_service unless @service
+  end
+
+  def update
+    @service = @project.gitlab_ci_service
+
+    if @service.update_attributes(params[:service])
+      redirect_to :back
+    else
+      render 'edit'
+    end
+  end
+
+  def test
+    commits = project.commits(project.default_branch, nil, 3)
+    data = project.post_receive_data(commits.last.id, commits.first.id, "refs/heads/#{project.default_branch}", current_user)
+
+    @service = project.gitlab_ci_service
+    @service.execute(data)
+
+    redirect_to :back
+  end
+end
@@ -0,0 +1,29 @@
+# == 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
+#
+
+class GitlabCiService < Service
+  attr_accessible :project_url
+
+  validates :project_url, presence: true
+  validates :token, presence: true
+
+  delegate :execute, to: :service_hook, prefix: nil
+
+  after_save :compose_service_hook
+
+  def compose_service_hook
+    hook = service_hook || build_service_hook
+    hook.url = [project_url, "/build", "?token=#{token}"].join("")
+    hook.save
+  end
+end
@@ -48,6 +48,7 @@ class Project &lt; ActiveRecord::Base
   has_many :protected_branches, dependent: :destroy
   has_one :last_event, class_name: 'Event', order: 'events.created_at DESC', foreign_key: 'project_id'
   has_many :services, dependent: :destroy
+  has_one :gitlab_ci_service, dependent: :destroy
  
   delegate :name, to: :owner, allow_nil: true, prefix: true
  
@@ -12,7 +12,7 @@
 #
  
 class Service < ActiveRecord::Base
-  attr_accessible :title, :token, :type
+  attr_accessible :title, :token, :type, :active
  
   belongs_to :project
   has_one :service_hook
@@ -56,8 +56,8 @@ module PushObserver
   def execute_services(data)
     services.each do |service|
  
-      # Call service hook for service if it has one
-      service.service_hook.execute if service.service_hook
+      # Call service hook only if it is active
+      service.execute if service.active
     end
   end
  
@@ -21,6 +21,10 @@
       = link_to project_hooks_path(@project) do
         %span
         Hooks
+    = nav_link(controller: :services, html_options: {class: 'right'}) do
+      = link_to project_services_path(@project) do
+        %span
+        Services
     = nav_link(path: 'projects#edit', html_options: {class: 'right'}) do
       = link_to edit_project_path(@project), class: "stat-tab tab " do
         %i.icon-edit
@@ -0,0 +1,42 @@
+%h3.page_title
+  Services &rarr; GitLab CI Integration
+
+  .right
+    .thumbnail
+      - if @service.active
+        = image_tag 'service-gitlab-ci.png', class: 'small'
+      - else
+        = image_tag 'service-disabled-gitlab-ci.png', class: 'small'
+
+%hr
+
+
+= form_for(@service, :as => :service, :url => project_service_path(@project, @service), :method => :put) do |f|
+  - if @service.errors.any?
+    .alert-message.block-message.error
+      %ul
+        - @service.errors.full_messages.each do |msg|
+          %li= msg
+
+
+  .control-group
+    = f.label :active, "Active", class: "control-label"
+    .controls
+      = f.check_box :active
+
+  .control-group
+    = f.label :active, "Project URL", class: "control-label"
+    .controls
+      = f.text_field :project_url, class: "input-xlarge", placeholder: "http://ci.gitlabhq.com/projects/3"
+
+  .control-group
+    = f.label :token, class: "control-label" do
+      CI Project token
+    .controls
+      = f.text_field :token, class: "input-xlarge", placeholder: "GitLab CI project specific token"
+
+
+  .form-actions
+    = f.submit 'Save', class: 'btn save-btn'
+    &nbsp;
+    = link_to 'Test settings', test_project_service_path(@project), class: 'btn btn-small'
@@ -0,0 +1,2 @@
+= render "projects/project_head"
+= render 'gitlab_ci'
@@ -0,0 +1,15 @@
+= render "projects/project_head"
+%h3.page_title Services
+%hr
+
+.row
+  .span6
+    .padded
+      %p.slead Continuous integration server from GitLab
+      .thumbnail.left
+        = link_to edit_project_service_path(@project, :gitlab_ci) do
+          - if @gitlab_ci_service.try :active
+            = image_tag 'service-gitlab-ci.png'
+          - else
+            = image_tag 'service-disabled-gitlab-ci.png'
+
@@ -133,6 +133,12 @@ Gitlab::Application.routes.draw do
       end
     end
  
+    resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
+      member do
+        get :test
+      end
+    end
+
     resources :deploy_keys
     resources :protected_branches, only: [:index, :create, :destroy]
  
@@ -0,0 +1,5 @@
+class AddActiveToService < ActiveRecord::Migration
+  def change
+    add_column :services, :active, :boolean, default: false, null: false
+  end
+end
@@ -0,0 +1,5 @@
+class AddProjectUrlToService < ActiveRecord::Migration
+  def change
+    add_column :services, :project_url, :string, null: true
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20121120051432) do
+ActiveRecord::Schema.define(:version => 20121120113838) do
  
   create_table "events", :force => true do |t|
     t.string   "target_type"
@@ -131,9 +131,11 @@ ActiveRecord::Schema.define(:version =&gt; 20121120051432) do
     t.string   "type"
     t.string   "title"
     t.string   "token"
-    t.integer  "project_id", :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.integer  "project_id",                     :null => false
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.boolean  "active",      :default => false, :null => false
+    t.string   "project_url"
   end
  
   create_table "snippets", :force => true do |t|
...	...	@@ -73,6 +73,7 @@ img.avatar.s16 { width:16px; height:16px; margin-right:6px; }
73	73	img.avatar.s24 { width:24px; height:24px; margin-right:8px; }
74	74	img.avatar.s32 { width:32px; height:32px; margin-right:10px; }
75	75	img.lil_av { padding-left: 4px; padding-right:3px; }
	76	+img.small { width: 80px; }
76	77
77	78	/ HELPERS /
78	79	.nothing_here_message { text-align:center; padding:20px; color:#777; }
...	...	@@ -87,3 +88,5 @@ input[type='search'].search-text-input {
87	88	@include border-radius(4px);
88	89	border:1px solid #ccc;
89	90	}
	91	+
	92	+fieldset legend { font-size: 17px; }
...	...
...	...	@@ -0,0 +1,37 @@
	1	+class ServicesController < ProjectResourceController
	2	+ # Authorize
	3	+ before_filter :authorize_admin_project!
	4	+
	5	+ respond_to :html
	6	+
	7	+ def index
	8	+ @gitlab_ci_service = @project.gitlab_ci_service
	9	+ end
	10	+
	11	+ def edit
	12	+ @service = @project.gitlab_ci_service
	13	+
	14	+ # Create if missing
	15	+ @service = @project.create_gitlab_ci_service unless @service
	16	+ end
	17	+
	18	+ def update
	19	+ @service = @project.gitlab_ci_service
	20	+
	21	+ if @service.update_attributes(params[:service])
	22	+ redirect_to :back
	23	+ else
	24	+ render 'edit'
	25	+ end
	26	+ end
	27	+
	28	+ def test
	29	+ commits = project.commits(project.default_branch, nil, 3)
	30	+ data = project.post_receive_data(commits.last.id, commits.first.id, "refs/heads/#{project.default_branch}", current_user)
	31	+
	32	+ @service = project.gitlab_ci_service
	33	+ @service.execute(data)
	34	+
	35	+ redirect_to :back
	36	+ end
	37	+end
...	...
...	...	@@ -0,0 +1,29 @@
	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	+#
	13	+
	14	+class GitlabCiService < Service
	15	+ attr_accessible :project_url
	16	+
	17	+ validates :project_url, presence: true
	18	+ validates :token, presence: true
	19	+
	20	+ delegate :execute, to: :service_hook, prefix: nil
	21	+
	22	+ after_save :compose_service_hook
	23	+
	24	+ def compose_service_hook
	25	+ hook = service_hook \|\| build_service_hook
	26	+ hook.url = [project_url, "/build", "?token=#{token}"].join("")
	27	+ hook.save
	28	+ end
	29	+end
...	...
...	...	@@ -48,6 +48,7 @@ class Project < ActiveRecord::Base
48	48	has_many :protected_branches, dependent: :destroy
49	49	has_one :last_event, class_name: 'Event', order: 'events.created_at DESC', foreign_key: 'project_id'
50	50	has_many :services, dependent: :destroy
	51	+ has_one :gitlab_ci_service, dependent: :destroy
51	52
52	53	delegate :name, to: :owner, allow_nil: true, prefix: true
53	54
...	...
...	...	@@ -12,7 +12,7 @@
12	12	#
13	13
14	14	class Service < ActiveRecord::Base
15		- attr_accessible :title, :token, :type
	15	+ attr_accessible :title, :token, :type, :active
16	16
17	17	belongs_to :project
18	18	has_one :service_hook
...	...
...	...	@@ -56,8 +56,8 @@ module PushObserver
56	56	def execute_services(data)
57	57	services.each do \|service\|
58	58
59		- # Call service hook for service if it has one
60		- service.service_hook.execute if service.service_hook
	59	+ # Call service hook only if it is active
	60	+ service.execute if service.active
61	61	end
62	62	end
63	63
...	...
...	...	@@ -21,6 +21,10 @@
21	21	= link_to project_hooks_path(@project) do
22	22	%span
23	23	Hooks
	24	+ = nav_link(controller: :services, html_options: {class: 'right'}) do
	25	+ = link_to project_services_path(@project) do
	26	+ %span
	27	+ Services
24	28	= nav_link(path: 'projects#edit', html_options: {class: 'right'}) do
25	29	= link_to edit_project_path(@project), class: "stat-tab tab " do
26	30	%i.icon-edit
...	...
...	...	@@ -0,0 +1,42 @@
	1	+%h3.page_title
	2	+ Services → GitLab CI Integration
	3	+
	4	+ .right
	5	+ .thumbnail
	6	+ - if @service.active
	7	+ = image_tag 'service-gitlab-ci.png', class: 'small'
	8	+ - else
	9	+ = image_tag 'service-disabled-gitlab-ci.png', class: 'small'
	10	+
	11	+%hr
	12	+
	13	+
	14	+= form_for(@service, :as => :service, :url => project_service_path(@project, @service), :method => :put) do \|f\|
	15	+ - if @service.errors.any?
	16	+ .alert-message.block-message.error
	17	+ %ul
	18	+ - @service.errors.full_messages.each do \|msg\|
	19	+ %li= msg
	20	+
	21	+
	22	+ .control-group
	23	+ = f.label :active, "Active", class: "control-label"
	24	+ .controls
	25	+ = f.check_box :active
	26	+
	27	+ .control-group
	28	+ = f.label :active, "Project URL", class: "control-label"
	29	+ .controls
	30	+ = f.text_field :project_url, class: "input-xlarge", placeholder: "http://ci.gitlabhq.com/projects/3"
	31	+
	32	+ .control-group
	33	+ = f.label :token, class: "control-label" do
	34	+ CI Project token
	35	+ .controls
	36	+ = f.text_field :token, class: "input-xlarge", placeholder: "GitLab CI project specific token"
	37	+
	38	+
	39	+ .form-actions
	40	+ = f.submit 'Save', class: 'btn save-btn'
	41	+
	42	+ = link_to 'Test settings', test_project_service_path(@project), class: 'btn btn-small'
...	...
...	...	@@ -0,0 +1,2 @@
	1	+= render "projects/project_head"
	2	+= render 'gitlab_ci'
...	...
...	...	@@ -0,0 +1,15 @@
	1	+= render "projects/project_head"
	2	+%h3.page_title Services
	3	+%hr
	4	+
	5	+.row
	6	+ .span6
	7	+ .padded
	8	+ %p.slead Continuous integration server from GitLab
	9	+ .thumbnail.left
	10	+ = link_to edit_project_service_path(@project, :gitlab_ci) do
	11	+ - if @gitlab_ci_service.try :active
	12	+ = image_tag 'service-gitlab-ci.png'
	13	+ - else
	14	+ = image_tag 'service-disabled-gitlab-ci.png'
	15	+
...	...