Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq

Dmitriy Zaporozhets
2 parents 14649525 60ee383e
Showing 33 changed files with 425 additions and 133 deletions Show diff stats
Gemfile
app/controllers/admin/hooks_controller.rb
app/controllers/admin/mailer_controller.rb
app/controllers/hooks_controller.rb
app/models/project.rb
app/models/project_hook.rb
app/models/system_hook.rb
app/models/user.rb
app/models/users_project.rb
app/models/web_hook.rb
app/observers/system_hook_observer.rb
app/roles/git_push.rb
app/views/admin/hooks/_data_ex.html.erb
app/views/admin/hooks/index.html.haml
app/views/admin/mailer/preview.html.haml
app/views/help/system_hooks.html.haml
app/views/layouts/admin.html.haml
app/workers/system_hook_worker.rb
config/application.rb
config/routes.rb
@@ -71,7 +71,6 @@ group :development, :test do
   gem "awesome_print"
   gem "database_cleaner"
   gem "launchy"
-  gem "webmock"
 end
 group :test do
@@ -82,4 +81,5 @@ group :test do
   gem "shoulda-matchers"
   gem 'email_spec'
   gem 'resque_spec'
+  gem "webmock"
 end
@@ -0,0 +1,44 @@
+class Admin::HooksController < ApplicationController
+  layout "admin"
+  before_filter :authenticate_user!
+  before_filter :authenticate_admin!
+  
+  def index
+    @hooks = SystemHook.all
+    @hook = SystemHook.new
+  end
+
+  def create
+    @hook = SystemHook.new(params[:hook])
+
+    if @hook.save
+      redirect_to admin_hooks_path, notice: 'Hook was successfully created.'
+    else
+      @hooks = SystemHook.all
+      render :index 
+    end
+  end
+
+  def destroy
+    @hook = SystemHook.find(params[:id])
+    @hook.destroy
+
+    redirect_to admin_hooks_path
+  end
+
+
+  def test
+    @hook = SystemHook.find(params[:hook_id])
+    data = {
+      event_name: "project_create",
+      name: "Ruby",
+      path: "ruby",
+      project_id: 1,
+      owner_name: "Someone",
+      owner_email: "example@gitlabhq.com"
+    }
+    @hook.execute(data)
+
+    redirect_to :back
+  end
+end
@@ -1,45 +0,0 @@
-class Admin::MailerController < ApplicationController
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :authenticate_admin!
-
-  def preview
-
-  end
-
-  def preview_note
-    @note = Note.first
-    @user = @note.author
-    @project = @note.project
-    case params[:type]
-    when "Commit" then
-      @commit = @project.commit
-      render :file => 'notify/note_commit_email', :layout => 'notify'
-    when "Issue" then
-      @issue = Issue.first
-      render :file => 'notify/note_issue_email', :layout => 'notify'
-    else
-      render :file => 'notify/note_wall_email', :layout => 'notify'
-    end
-  rescue
-    render :text => "Preview not available"
-  end
-
-  def preview_user_new
-    @user = User.first
-    @password = "DHasJKDHAS!"
-
-    render :file => 'notify/new_user_email', :layout => 'notify'
-  rescue
-    render :text => "Preview not available"
-  end
-
-  def preview_issue_new
-    @issue = Issue.first
-    @user = @issue.assignee
-    @project = @issue.project
-    render :file => 'notify/new_issue_email', :layout => 'notify'
-  rescue
-    render :text => "Preview not available"
-  end
-end
@@ -11,24 +11,24 @@ class HooksController &lt; ApplicationController
   respond_to :html
   def index
-    @hooks = @project.web_hooks.all
-    @hook = WebHook.new
+    @hooks = @project.hooks.all
+    @hook = ProjectHook.new
   end
   def create
-    @hook = @project.web_hooks.new(params[:hook])
+    @hook = @project.hooks.new(params[:hook])
     @hook.save
     if @hook.valid?
       redirect_to project_hooks_path(@project)
     else
-      @hooks = @project.web_hooks.all
+      @hooks = @project.hooks.all
       render :index
     end
   end
   def test
-    @hook = @project.web_hooks.find(params[:id])
+    @hook = @project.hooks.find(params[:id])
     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)
     @hook.execute(data)
@@ -37,7 +37,7 @@ class HooksController &lt; ApplicationController
   end
   def destroy
-    @hook = @project.web_hooks.find(params[:id])
+    @hook = @project.hooks.find(params[:id])
     @hook.destroy
     redirect_to project_hooks_path(@project)
@@ -19,7 +19,7 @@ class Project &lt; ActiveRecord::Base
   has_many :notes,          :dependent => :destroy
   has_many :snippets,       :dependent => :destroy
   has_many :deploy_keys,    :dependent => :destroy, :foreign_key => "project_id", :class_name => "Key"
-  has_many :web_hooks,      :dependent => :destroy
+  has_many :hooks,          :dependent => :destroy, :class_name => "ProjectHook"
   has_many :wikis,          :dependent => :destroy
   has_many :protected_branches, :dependent => :destroy
@@ -120,7 +120,7 @@ class Project &lt; ActiveRecord::Base
       errors.add(:path, " like 'gitolite-admin' is not allowed")
     end
   end
-  
+
   def self.access_options
     UsersProject.access_roles
   end
@@ -0,0 +1,3 @@
+class ProjectHook < WebHook
+  belongs_to :project
+end
@@ -0,0 +1,13 @@
+class SystemHook < WebHook
+  
+  def async_execute(data)
+    Resque.enqueue(SystemHookWorker, id, data)
+  end
+
+  def self.all_hooks_fire(data)
+    SystemHook.all.each do |sh|
+      sh.async_execute data
+    end
+  end
+  
+end
 class User < ActiveRecord::Base
+
   include Account
   devise :database_authenticatable, :token_authenticatable, :lockable,
@@ -68,7 +68,7 @@ class UsersProject &lt; ActiveRecord::Base
   end
   def repo_access_human
-    ""
+    self.class.access_roles.invert[self.project_access]
   end
 end
 # == Schema Information
@@ -4,8 +4,6 @@ class WebHook &lt; ActiveRecord::Base
   # HTTParty timeout
   default_timeout 10
-  belongs_to :project
-
   validates :url,
             presence: true,
             format: {
@@ -14,9 +12,8 @@ class WebHook &lt; ActiveRecord::Base
   def execute(data)
     WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
-  rescue
-    # There was a problem calling this web hook, let's forget about it.
   end
+  
 end
 # == Schema Information
 #
@@ -0,0 +1,67 @@
+class SystemHookObserver < ActiveRecord::Observer
+  observe :user, :project, :users_project
+  
+  def after_create(model)
+    if model.kind_of? Project
+      SystemHook.all_hooks_fire({
+        event_name: "project_create",
+        name: model.name,
+        path: model.path,
+        project_id: model.id,
+        owner_name: model.owner.name,
+        owner_email: model.owner.email,
+        created_at: model.created_at
+      })
+    elsif model.kind_of? User 
+      SystemHook.all_hooks_fire({
+        event_name: "user_create",
+        name: model.name,
+        email: model.email,
+        created_at: model.created_at
+      })
+
+    elsif model.kind_of? UsersProject
+      SystemHook.all_hooks_fire({
+        event_name: "user_add_to_team",
+        project_name: model.project.name,
+        project_path: model.project.path,
+        project_id: model.project_id,
+        user_name: model.user.name,
+        user_email: model.user.email,
+        project_access: model.repo_access_human,
+        created_at: model.created_at
+      })
+
+    end
+  end
+
+  def after_destroy(model)
+    if model.kind_of? Project
+      SystemHook.all_hooks_fire({
+        event_name: "project_destroy",
+        name: model.name,
+        path: model.path,
+        project_id: model.id,
+        owner_name: model.owner.name,
+        owner_email: model.owner.email,
+      })
+    elsif model.kind_of? User
+      SystemHook.all_hooks_fire({
+        event_name: "user_destroy",
+        name: model.name,
+        email: model.email
+      })
+
+    elsif model.kind_of? UsersProject
+      SystemHook.all_hooks_fire({
+        event_name: "user_remove_from_team",
+        project_name: model.project.name,
+        project_path: model.project.path,
+        project_id: model.project_id,
+        user_name: model.user.name,
+        user_email: model.user.email,
+        project_access: model.repo_access_human
+      })
+    end
+  end
+end
@@ -27,7 +27,7 @@ module GitPush
     true
   end
-  def execute_web_hooks(oldrev, newrev, ref, user)
+  def execute_hooks(oldrev, newrev, ref, user)
     ref_parts = ref.split('/')
     # Return if this is not a push to a branch (e.g. new commits)
@@ -35,7 +35,7 @@ module GitPush
     data = post_receive_data(oldrev, newrev, ref, user)
-    web_hooks.each { |web_hook| web_hook.execute(data) }
+    hooks.each { |hook| hook.execute(data) }
   end
   def post_receive_data(oldrev, newrev, ref, user)
@@ -97,7 +97,7 @@ module GitPush
     self.update_merge_requests(oldrev, newrev, ref, user)
     # Execute web hooks
-    self.execute_web_hooks(oldrev, newrev, ref, user)
+    self.execute_hooks(oldrev, newrev, ref, user)
     # Create satellite
     self.satellite.create unless self.satellite.exists?
@@ -0,0 +1,45 @@
+<% data_ex_str = <<eos
+{
+        :before => "95790bf891e76fee5e1747ab589903a6a1f80f22",
+         :after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+           :ref => "refs/heads/master",
+       :user_id => 4,
+     :user_name => "John Smith",
+    :repository => {
+               :name => "Diaspora",
+                :url => "localhost/diaspora",
+        :description => "",
+           :homepage => "localhost/diaspora",
+            :private => true
+    },
+       :commits => [
+        [0] {
+                   :id => "450d0de7532f8b663b9c5cce183b...",
+              :message => "Update Catalan translation to e38cb41.",
+            :timestamp => "2011-12-12T14:27:31+02:00",
+                  :url => "http://localhost/diaspora/commits/450d0de7532f...",
+               :author => {
+                 :name => "Jordi Mallach",
+                :email => "jordi@softcatala.org"
+            }
+        },
+
+        ....
+
+        [3] {
+                   :id => "da1560886d4f094c3e6c9ef40349...",
+              :message => "fixed readme",
+            :timestamp => "2012-01-03T23:36:29+02:00",
+                  :url => "http://localhost/diaspora/commits/da1560886d...",
+               :author => {
+                 :name => "gitlab dev user",
+                :email => "gitlabdev@dv6700.(none)"
+            }
+        }
+    ],
+   total_commits_count => 3
+}
+eos
+%>
+<% js_lexer = Pygments::Lexer[:js] %>
+<%= raw js_lexer.highlight(data_ex_str) %>
@@ -0,0 +1,39 @@
+.alert.alert-info
+  %span
+    Post receive hooks for binding events.
+    %br
+    Read more about system hooks
+    %strong #{link_to "here", help_system_hooks_path, :class => "vlink"}
+
+= form_for @hook, :as => :hook, :url => admin_hooks_path do |f|
+  -if @hook.errors.any?
+    .alert-message.block-message.error
+      - @hook.errors.full_messages.each do |msg|
+        %p= msg
+  .clearfix
+    = f.label :url, "URL:"
+    .input
+      = f.text_field :url, :class => "text_field xxlarge"
+      &nbsp;
+      = f.submit "Add System Hook", :class => "btn primary"
+%hr
+
+-if @hooks.any?
+  %h3
+    Hooks
+    %small (#{@hooks.count})
+  %br
+  %table.admin-table
+    %tr
+      %th URL
+      %th Method
+      %th
+    - @hooks.each do |hook|
+      %tr
+        %td
+          = link_to admin_hook_path(hook) do
+            %strong= hook.url
+          = link_to 'Test Hook', admin_hook_test_path(hook), :class => "btn small right"
+        %td POST
+        %td
+          = link_to 'Remove', admin_hook_path(hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small right"
@@ -1,28 +0,0 @@
-%p This is page with preview for all system emails that are sent to user
-%p Email previews built based on existing Project/Commit/Issue base - so some preview maybe unavailable unless object appear in system
-
-#accordion
-  %h3
-    %a New user
-  %div
-    %iframe{ :src=> admin_mailer_preview_user_new_path, :width=>"100%", :height=>"350"}
-  %h3
-    %a New issue
-  %div
-    %iframe{ :src=> admin_mailer_preview_issue_new_path, :width=>"100%", :height=>"350"}
-  %h3
-    %a Commit note
-  %div
-    %iframe{ :src=> admin_mailer_preview_note_path(:type => "Commit"), :width=>"100%", :height=>"350"}
-  %h3
-    %a Issue note
-  %div
-    %iframe{ :src=> admin_mailer_preview_note_path(:type => "Issue"), :width=>"100%", :height=>"350"}
-  %h3
-    %a Wall note
-  %div
-    %iframe{ :src=> admin_mailer_preview_note_path(:type => "Wall"), :width=>"100%", :height=>"350"}
-
-:javascript
-  $(function() {
-      $("#accordion").accordion(); });
@@ -0,0 +1,13 @@
+%h3 System hooks
+.back_link
+  = link_to :back do 
+    &larr; back
+%hr
+
+%p.slead 
+  Your Gitlab instance can perform HTTP POST request on next event: create_project, delete_project, create_user, delete_user, change_team_member.
+  %br
+  System Hooks can be used for logging or change information in LDAP server.
+  %br
+%h5 Hooks request example:
+= render "admin/hooks/data_ex"
@@ -15,7 +15,7 @@
         %li{:class => tab_class(:admin_logs)}
           = link_to "Logs", admin_logs_path
         %li{:class => tab_class(:admin_emails)}
-          = link_to "Emails", admin_emails_path
+          = link_to "Hooks", admin_hooks_path
         %li{:class => tab_class(:admin_resque)}
           = link_to "Resque", admin_resque_path
@@ -0,0 +1,7 @@
+class SystemHookWorker
+  @queue = :system_hook
+
+  def self.perform(hook_id, data)
+    SystemHook.find(hook_id).execute data
+  end
+end
@@ -23,7 +23,7 @@ module Gitlab
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
     # Activate observers that should always be running.
-    config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer, :issue_observer, :user_observer
+    config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer, :issue_observer, :user_observer, :system_hook_observer
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
@@ -28,6 +28,7 @@ Gitlab::Application.routes.draw do
   get 'help/workflow' => 'help#workflow'
   get 'help/api' => 'help#api'
   get 'help/web_hooks' => 'help#web_hooks'
+  get 'help/system_hooks' => 'help#system_hooks'
   #
   # Admin Area
@@ -47,11 +48,13 @@ Gitlab::Application.routes.draw do
       end
     end
     resources :team_members, :only => [:edit, :update, :destroy]
-    get 'emails', :to => 'mailer#preview'
     get 'mailer/preview_note'
     get 'mailer/preview_user_new'
     get 'mailer/preview_issue_new'
+    resources :hooks, :only => [:index, :create, :destroy] do
+      get :test
+    end
     resource :logs
     resource :resque, :controller => 'resque'
     root :to => "dashboard#index"
@@ -0,0 +1,5 @@
+class AddTypeToWebHook < ActiveRecord::Migration
+  def change
+    add_column :web_hooks, :type, :string, :default => "ProjectHook"
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120706065612) do
+ActiveRecord::Schema.define(:version => 20120712080407) do
   create_table "events", :force => true do |t|
     t.string   "target_type"
@@ -187,8 +187,9 @@ ActiveRecord::Schema.define(:version =&gt; 20120706065612) do
   create_table "web_hooks", :force => true do |t|
     t.string   "url"
     t.integer  "project_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.string   "type",       :default => "ProjectHook"
   end
   create_table "wikis", :force => true do |t|
 mkdir -p tmp/pids
-bundle exec rake environment resque:work QUEUE=post_receive,mailer RAILS_ENV=production PIDFILE=tmp/pids/resque_worker.pid BACKGROUND=yes
+bundle exec rake environment resque:work QUEUE=post_receive,mailer,system_hook RAILS_ENV=production PIDFILE=tmp/pids/resque_worker.pid BACKGROUND=yes
-bundle exec rake environment resque:work QUEUE=* VVERBOSE=1
+bundle exec rake environment resque:work QUEUE=post_receive,mailer,system_hook VVERBOSE=1
@@ -7,6 +7,12 @@ Factory.add(:project, Project) do |obj|
   obj.code = 'LGT'
 end
+Factory.add(:project_without_owner, Project) do |obj|
+  obj.name = Faker::Internet.user_name
+  obj.path = 'gitlabhq'
+  obj.code = 'LGT'
+end
+
 Factory.add(:public_project, Project) do |obj|
   obj.name = Faker::Internet.user_name
   obj.path = 'gitlabhq'
@@ -60,7 +66,11 @@ Factory.add(:key, Key) do |obj|
   obj.key = File.read(File.join(Rails.root, "db", "pkey.example"))
 end
-Factory.add(:web_hook, WebHook) do |obj|
+Factory.add(:project_hook, ProjectHook) do |obj|
+  obj.url = Faker::Internet.uri("http")
+end
+
+Factory.add(:system_hook, SystemHook) do |obj|
   obj.url = Faker::Internet.uri("http")
 end
@@ -21,44 +21,44 @@ describe Project, &quot;Hooks&quot; do
     end
   end
-  describe "Web hooks" do
+  describe "Project hooks" do
     context "with no web hooks" do
       it "raises no errors" do
         lambda {
-          project.execute_web_hooks('oldrev', 'newrev', 'ref', @user)
+          project.execute_hooks('oldrev', 'newrev', 'ref', @user)
         }.should_not raise_error
       end
     end
     context "with web hooks" do
       before do
-        @webhook = Factory(:web_hook)
-        @webhook_2 = Factory(:web_hook)
-        project.web_hooks << [@webhook, @webhook_2]
+        @project_hook = Factory(:project_hook)
+        @project_hook_2 = Factory(:project_hook)
+        project.hooks << [@project_hook, @project_hook_2]
       end
       it "executes multiple web hook" do
-        @webhook.should_receive(:execute).once
-        @webhook_2.should_receive(:execute).once
+        @project_hook.should_receive(:execute).once
+        @project_hook_2.should_receive(:execute).once
-        project.execute_web_hooks('oldrev', 'newrev', 'refs/heads/master', @user)
+        project.execute_hooks('oldrev', 'newrev', 'refs/heads/master', @user)
       end
     end
     context "does not execute web hooks" do
       before do
-        @webhook = Factory(:web_hook)
-        project.web_hooks << [@webhook]
+        @project_hook = Factory(:project_hook)
+        project.hooks << [@project_hook]
       end
       it "when pushing a branch for the first time" do
-        @webhook.should_not_receive(:execute)
-        project.execute_web_hooks('00000000000000000000000000000000', 'newrev', 'refs/heads/master', @user)
+        @project_hook.should_not_receive(:execute)
+        project.execute_hooks('00000000000000000000000000000000', 'newrev', 'refs/heads/master', @user)
       end
       it "when pushing tags" do
-        @webhook.should_not_receive(:execute)
-        project.execute_web_hooks('oldrev', 'newrev', 'refs/tags/v1.0.0', @user)
+        @project_hook.should_not_receive(:execute)
+        project.execute_hooks('oldrev', 'newrev', 'refs/tags/v1.0.0', @user)
       end
     end
@@ -11,7 +11,7 @@ describe Project do
     it { should have_many(:issues).dependent(:destroy) }
     it { should have_many(:notes).dependent(:destroy) }
     it { should have_many(:snippets).dependent(:destroy) }
-    it { should have_many(:web_hooks).dependent(:destroy) }
+    it { should have_many(:hooks).dependent(:destroy) }
     it { should have_many(:deploy_keys).dependent(:destroy) }
   end
@@ -0,0 +1,63 @@
+require "spec_helper"
+
+describe SystemHook do
+  describe "execute" do
+    before(:each) { ActiveRecord::Base.observers.enable(:all) }
+
+    before(:each) do
+      @system_hook = Factory :system_hook
+      WebMock.stub_request(:post, @system_hook.url)
+    end
+
+    it "project_create hook" do
+      user = Factory :user
+      with_resque do
+        project = Factory :project_without_owner, :owner => user
+      end
+      WebMock.should have_requested(:post, @system_hook.url).with(body: /project_create/).once
+    end
+    
+    it "project_destroy hook" do
+      project = Factory :project
+      with_resque do
+        project.destroy
+      end
+      WebMock.should have_requested(:post, @system_hook.url).with(body: /project_destroy/).once
+    end
+
+    it "user_create hook" do
+      with_resque do
+        Factory :user
+      end
+      WebMock.should have_requested(:post, @system_hook.url).with(body: /user_create/).once
+    end
+    
+    it "user_destroy hook" do
+      user = Factory :user
+      with_resque do
+        user.destroy
+      end
+      WebMock.should have_requested(:post, @system_hook.url).with(body: /user_destroy/).once
+    end
+    
+    it "project_create hook" do
+      user = Factory :user
+      project = Factory :project
+      with_resque do
+        project.users << user
+      end
+      WebMock.should have_requested(:post, @system_hook.url).with(body: /user_add_to_team/).once
+    end
+    
+    it "project_destroy hook" do
+      user = Factory :user
+      project = Factory :project
+      project.users << user
+      with_resque do
+        project.users_projects.clear
+      end
+      WebMock.should have_requested(:post, @system_hook.url).with(body: /user_remove_from_team/).once
+    end
+  end
+
+end
 require 'spec_helper'
-describe WebHook do
+describe ProjectHook do
   describe "Associations" do
     it { should belong_to :project }
   end
@@ -23,32 +23,32 @@ describe WebHook do
   describe "execute" do
     before(:each) do
-      @webhook = Factory :web_hook
+      @project_hook = Factory :project_hook
       @project = Factory :project
-      @project.web_hooks << [@webhook]
+      @project.hooks << [@project_hook]
       @data = { before: 'oldrev', after: 'newrev', ref: 'ref'}
-      WebMock.stub_request(:post, @webhook.url)
+      WebMock.stub_request(:post, @project_hook.url)
     end
     it "POSTs to the web hook URL" do
-      @webhook.execute(@data)
-      WebMock.should have_requested(:post, @webhook.url).once
+      @project_hook.execute(@data)
+      WebMock.should have_requested(:post, @project_hook.url).once
     end
     it "POSTs the data as JSON" do
       json = @data.to_json
-      @webhook.execute(@data)
-      WebMock.should have_requested(:post, @webhook.url).with(body: json).once
+      @project_hook.execute(@data)
+      WebMock.should have_requested(:post, @project_hook.url).with(body: json).once
     end
     it "catches exceptions" do
       WebHook.should_receive(:post).and_raise("Some HTTP Post error")
       lambda {
-        @webhook.execute(@data)
-      }.should_not raise_error
+        @project_hook.execute(@data)
+      }.should raise_error
     end
   end
 end
@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe "Admin::Hooks" do
+  before do
+    @project = Factory :project,
+      :name => "LeGiT",
+      :code => "LGT"
+    login_as :admin
+
+    @system_hook = Factory :system_hook
+
+  end
+
+  describe "GET /admin/hooks" do
+    it "should be ok" do
+      visit admin_root_path
+      within ".main_menu" do
+        click_on "Hooks"
+      end
+      current_path.should == admin_hooks_path
+    end
+
+    it "should have hooks list" do
+      visit admin_hooks_path
+      page.should have_content(@system_hook.url)
+    end
+  end
+
+  describe "New Hook" do
+    before do
+      @url = Faker::Internet.uri("http")
+      visit admin_hooks_path
+      fill_in "hook_url", :with => @url
+      expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)
+    end
+
+    it "should open new hook popup" do
+      page.current_path.should == admin_hooks_path
+      page.should have_content(@url)
+    end
+  end
+
+  describe "Test" do
+    before do
+      WebMock.stub_request(:post, @system_hook.url)
+      visit admin_hooks_path
+      click_link "Test Hook"
+    end
+
+    it { page.current_path.should == admin_hooks_path }
+  end
+
+end
@@ -13,9 +13,9 @@ describe &quot;Admin::Projects&quot; do
     it { admin_users_path.should be_denied_for :visitor }
   end
-  describe "GET /admin/emails" do
-    it { admin_emails_path.should be_allowed_for :admin }
-    it { admin_emails_path.should be_denied_for :user }
-    it { admin_emails_path.should be_denied_for :visitor }
+  describe "GET /admin/hooks" do
+    it { admin_hooks_path.should be_allowed_for :admin }
+    it { admin_hooks_path.should be_denied_for :user }
+    it { admin_hooks_path.should be_denied_for :visitor }
   end
 end
@@ -9,7 +9,7 @@ describe &quot;Hooks&quot; do
   describe "GET index" do
     it "should be available" do
-      @hook = Factory :web_hook, :project => @project
+      @hook = Factory :project_hook, :project => @project
       visit project_hooks_path(@project)
       page.should have_content "Hooks"
       page.should have_content @hook.url
@@ -21,7 +21,7 @@ describe &quot;Hooks&quot; do
       @url = Faker::Internet.uri("http")
       visit project_hooks_path(@project)
       fill_in "hook_url", :with => @url
-      expect { click_button "Add Web Hook" }.to change(WebHook, :count).by(1)
+      expect { click_button "Add Web Hook" }.to change(ProjectHook, :count).by(1)
     end
     it "should open new team member popup" do
@@ -32,7 +32,8 @@ describe &quot;Hooks&quot; do
   describe "Test" do
     before do
-      @hook = Factory :web_hook, :project => @project
+      @hook = Factory :project_hook, :project => @project
+      stub_request(:post, @hook.url)
       visit project_hooks_path(@project)
       click_link "Test Hook"
     end
@@ -22,14 +22,14 @@ describe PostReceive do
       Key.stub(find_by_identifier: nil)
       project.should_not_receive(:observe_push)
-      project.should_not_receive(:execute_web_hooks)
+      project.should_not_receive(:execute_hooks)
       PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false
     end
     it "asks the project to execute web hooks" do
       Project.stub(find_by_path: project)
-      project.should_receive(:execute_web_hooks).with('sha-old', 'sha-new', 'refs/heads/master', project.owner)
+      project.should_receive(:execute_hooks).with('sha-old', 'sha-new', 'refs/heads/master', project.owner)
       PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id)
     end
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+class Admin::HooksController < ApplicationController
	2	+ layout "admin"
	3	+ before_filter :authenticate_user!
	4	+ before_filter :authenticate_admin!
	5	+
	6	+ def index
	7	+ @hooks = SystemHook.all
	8	+ @hook = SystemHook.new
	9	+ end
	10	+
	11	+ def create
	12	+ @hook = SystemHook.new(params[:hook])
	13	+
	14	+ if @hook.save
	15	+ redirect_to admin_hooks_path, notice: 'Hook was successfully created.'
	16	+ else
	17	+ @hooks = SystemHook.all
	18	+ render :index
	19	+ end
	20	+ end
	21	+
	22	+ def destroy
	23	+ @hook = SystemHook.find(params[:id])
	24	+ @hook.destroy
	25	+
	26	+ redirect_to admin_hooks_path
	27	+ end
	28	+
	29	+
	30	+ def test
	31	+ @hook = SystemHook.find(params[:hook_id])
	32	+ data = {
	33	+ event_name: "project_create",
	34	+ name: "Ruby",
	35	+ path: "ruby",
	36	+ project_id: 1,
	37	+ owner_name: "Someone",
	38	+ owner_email: "example@gitlabhq.com"
	39	+ }
	40	+ @hook.execute(data)
	41	+
	42	+ redirect_to :back
	43	+ end
	44	+end
	@@ -1,45 +0,0 @@	@@ -1,45 +0,0 @@
1	-class Admin::MailerController < ApplicationController
2	- layout "admin"
3	- before_filter :authenticate_user!
4	- before_filter :authenticate_admin!
5	-
6	- def preview
7	-
8	- end
9	-
10	- def preview_note
11	- @note = Note.first
12	- @user = @note.author
13	- @project = @note.project
14	- case params[:type]
15	- when "Commit" then
16	- @commit = @project.commit
17	- render :file => 'notify/note_commit_email', :layout => 'notify'
18	- when "Issue" then
19	- @issue = Issue.first
20	- render :file => 'notify/note_issue_email', :layout => 'notify'
21	- else
22	- render :file => 'notify/note_wall_email', :layout => 'notify'
23	- end
24	- rescue
25	- render :text => "Preview not available"
26	- end
27	-
28	- def preview_user_new
29	- @user = User.first
30	- @password = "DHasJKDHAS!"
31	-
32	- render :file => 'notify/new_user_email', :layout => 'notify'
33	- rescue
34	- render :text => "Preview not available"
35	- end
36	-
37	- def preview_issue_new
38	- @issue = Issue.first
39	- @user = @issue.assignee
40	- @project = @issue.project
41	- render :file => 'notify/new_issue_email', :layout => 'notify'
42	- rescue
43	- render :text => "Preview not available"
44	- end
45	-end
	@@ -19,7 +19,7 @@ class Project < ActiveRecord::Base		@@ -19,7 +19,7 @@ class Project < ActiveRecord::Base
19	has_many :notes, :dependent => :destroy	19	has_many :notes, :dependent => :destroy
20	has_many :snippets, :dependent => :destroy	20	has_many :snippets, :dependent => :destroy
21	has_many :deploy_keys, :dependent => :destroy, :foreign_key => "project_id", :class_name => "Key"	21	has_many :deploy_keys, :dependent => :destroy, :foreign_key => "project_id", :class_name => "Key"
22	- has_many :web_hooks, :dependent => :destroy	22	+ has_many :hooks, :dependent => :destroy, :class_name => "ProjectHook"
23	has_many :wikis, :dependent => :destroy	23	has_many :wikis, :dependent => :destroy
24	has_many :protected_branches, :dependent => :destroy	24	has_many :protected_branches, :dependent => :destroy
25		25
	@@ -120,7 +120,7 @@ class Project < ActiveRecord::Base		@@ -120,7 +120,7 @@ class Project < ActiveRecord::Base
120	errors.add(:path, " like 'gitolite-admin' is not allowed")	120	errors.add(:path, " like 'gitolite-admin' is not allowed")
121	end	121	end
122	end	122	end
123	-	123	+
124	def self.access_options	124	def self.access_options
125	UsersProject.access_roles	125	UsersProject.access_roles
126	end	126	end
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+class ProjectHook < WebHook
	2	+ belongs_to :project
	3	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class SystemHook < WebHook
	2	+
	3	+ def async_execute(data)
	4	+ Resque.enqueue(SystemHookWorker, id, data)
	5	+ end
	6	+
	7	+ def self.all_hooks_fire(data)
	8	+ SystemHook.all.each do \|sh\|
	9	+ sh.async_execute data
	10	+ end
	11	+ end
	12	+
	13	+end
1	class User < ActiveRecord::Base	1	class User < ActiveRecord::Base
		2	+
2	include Account	3	include Account
3		4
4	devise :database_authenticatable, :token_authenticatable, :lockable,	5	devise :database_authenticatable, :token_authenticatable, :lockable,
	@@ -68,7 +68,7 @@ class UsersProject < ActiveRecord::Base		@@ -68,7 +68,7 @@ class UsersProject < ActiveRecord::Base
68	end	68	end
69		69
70	def repo_access_human	70	def repo_access_human
71	- ""	71	+ self.class.access_roles.invert[self.project_access]
72	end	72	end
73	end	73	end
74	# == Schema Information	74	# == Schema Information
@@ -0,0 +1,67 @@		@@ -0,0 +1,67 @@
	1	+class SystemHookObserver < ActiveRecord::Observer
	2	+ observe :user, :project, :users_project
	3	+
	4	+ def after_create(model)
	5	+ if model.kind_of? Project
	6	+ SystemHook.all_hooks_fire({
	7	+ event_name: "project_create",
	8	+ name: model.name,
	9	+ path: model.path,
	10	+ project_id: model.id,
	11	+ owner_name: model.owner.name,
	12	+ owner_email: model.owner.email,
	13	+ created_at: model.created_at
	14	+ })
	15	+ elsif model.kind_of? User
	16	+ SystemHook.all_hooks_fire({
	17	+ event_name: "user_create",
	18	+ name: model.name,
	19	+ email: model.email,
	20	+ created_at: model.created_at
	21	+ })
	22	+
	23	+ elsif model.kind_of? UsersProject
	24	+ SystemHook.all_hooks_fire({
	25	+ event_name: "user_add_to_team",
	26	+ project_name: model.project.name,
	27	+ project_path: model.project.path,
	28	+ project_id: model.project_id,
	29	+ user_name: model.user.name,
	30	+ user_email: model.user.email,
	31	+ project_access: model.repo_access_human,
	32	+ created_at: model.created_at
	33	+ })
	34	+
	35	+ end
	36	+ end
	37	+
	38	+ def after_destroy(model)
	39	+ if model.kind_of? Project
	40	+ SystemHook.all_hooks_fire({
	41	+ event_name: "project_destroy",
	42	+ name: model.name,
	43	+ path: model.path,
	44	+ project_id: model.id,
	45	+ owner_name: model.owner.name,
	46	+ owner_email: model.owner.email,
	47	+ })
	48	+ elsif model.kind_of? User
	49	+ SystemHook.all_hooks_fire({
	50	+ event_name: "user_destroy",
	51	+ name: model.name,
	52	+ email: model.email
	53	+ })
	54	+
	55	+ elsif model.kind_of? UsersProject
	56	+ SystemHook.all_hooks_fire({
	57	+ event_name: "user_remove_from_team",
	58	+ project_name: model.project.name,
	59	+ project_path: model.project.path,
	60	+ project_id: model.project_id,
	61	+ user_name: model.user.name,
	62	+ user_email: model.user.email,
	63	+ project_access: model.repo_access_human
	64	+ })
	65	+ end
	66	+ end
	67	+end
	@@ -27,7 +27,7 @@ module GitPush		@@ -27,7 +27,7 @@ module GitPush
27	true	27	true
28	end	28	end
29		29
30	- def execute_web_hooks(oldrev, newrev, ref, user)	30	+ def execute_hooks(oldrev, newrev, ref, user)
31	ref_parts = ref.split('/')	31	ref_parts = ref.split('/')
32		32
33	# Return if this is not a push to a branch (e.g. new commits)	33	# Return if this is not a push to a branch (e.g. new commits)
	@@ -35,7 +35,7 @@ module GitPush		@@ -35,7 +35,7 @@ module GitPush
35		35
36	data = post_receive_data(oldrev, newrev, ref, user)	36	data = post_receive_data(oldrev, newrev, ref, user)
37		37
38	- web_hooks.each { \|web_hook\| web_hook.execute(data) }	38	+ hooks.each { \|hook\| hook.execute(data) }
39	end	39	end
40		40
41	def post_receive_data(oldrev, newrev, ref, user)	41	def post_receive_data(oldrev, newrev, ref, user)
	@@ -97,7 +97,7 @@ module GitPush		@@ -97,7 +97,7 @@ module GitPush
97	self.update_merge_requests(oldrev, newrev, ref, user)	97	self.update_merge_requests(oldrev, newrev, ref, user)
98		98
99	# Execute web hooks	99	# Execute web hooks
100	- self.execute_web_hooks(oldrev, newrev, ref, user)	100	+ self.execute_hooks(oldrev, newrev, ref, user)
101		101
102	# Create satellite	102	# Create satellite
103	self.satellite.create unless self.satellite.exists?	103	self.satellite.create unless self.satellite.exists?
@@ -0,0 +1,45 @@		@@ -0,0 +1,45 @@
	1	+<% data_ex_str = <<eos
	2	+{
	3	+ :before => "95790bf891e76fee5e1747ab589903a6a1f80f22",
	4	+ :after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
	5	+ :ref => "refs/heads/master",
	6	+ :user_id => 4,
	7	+ :user_name => "John Smith",
	8	+ :repository => {
	9	+ :name => "Diaspora",
	10	+ :url => "localhost/diaspora",
	11	+ :description => "",
	12	+ :homepage => "localhost/diaspora",
	13	+ :private => true
	14	+ },
	15	+ :commits => [
	16	+ [0] {
	17	+ :id => "450d0de7532f8b663b9c5cce183b...",
	18	+ :message => "Update Catalan translation to e38cb41.",
	19	+ :timestamp => "2011-12-12T14:27:31+02:00",
	20	+ :url => "http://localhost/diaspora/commits/450d0de7532f...",
	21	+ :author => {
	22	+ :name => "Jordi Mallach",
	23	+ :email => "jordi@softcatala.org"
	24	+ }
	25	+ },
	26	+
	27	+ ....
	28	+
	29	+ [3] {
	30	+ :id => "da1560886d4f094c3e6c9ef40349...",
	31	+ :message => "fixed readme",
	32	+ :timestamp => "2012-01-03T23:36:29+02:00",
	33	+ :url => "http://localhost/diaspora/commits/da1560886d...",
	34	+ :author => {
	35	+ :name => "gitlab dev user",
	36	+ :email => "gitlabdev@dv6700.(none)"
	37	+ }
	38	+ }
	39	+ ],
	40	+ total_commits_count => 3
	41	+}
	42	+eos
	43	+%>
	44	+<% js_lexer = Pygments::Lexer[:js] %>
	45	+<%= raw js_lexer.highlight(data_ex_str) %>