Merge branch 'master' into deploy_keys

Conflicts: app/models/project.rb

Merge branch 'master' into deploy_keys
Conflicts: app/models/project.rb
miks
2 parents 723104c4 78d88262
Showing 35 changed files with 556 additions and 90 deletions Show diff stats
.travis.yml
Gemfile
Gemfile.lock
README.md
app/assets/images/favicon.png
app/assets/stylesheets/notes.css.scss
app/assets/stylesheets/style.scss
app/helpers/commits_helper.rb
app/models/project.rb
app/models/repository.rb
app/models/web_hook.rb
app/views/commits/show.html.haml
app/views/layouts/_head_panel.html.erb
app/views/layouts/admin.html.haml
app/views/layouts/devise.html.haml
app/views/layouts/profile.html.haml
app/views/layouts/project.html.haml
app/views/notes/_form.html.haml
app/workers/post_receive.rb
config/routes.rb
+before_install: sudo apt-get install libicu-dev -y
 branches:
   only:
     - 'master'
@@ -22,7 +22,9 @@ gem &quot;acts_as_list&quot;
 gem "rdiscount"
 gem "acts-as-taggable-on", "~> 2.1.0"
 gem "drapper"
-gem "rchardet19", "~> 1.3.5"
+gem "resque"
+gem "httparty"
+gem "charlock_holmes"
 group :assets do
   gem "sass-rails",   "~> 3.1.0"
@@ -47,6 +49,7 @@ group :development, :test do
   gem "awesome_print"
   gem "database_cleaner"
   gem "launchy"
+  gem "webmock"
 end
 group :test do
@@ -77,6 +77,7 @@ GEM
       xpath (~> 0.1.4)
     carrierwave (0.5.8)
       activesupport (~> 3.0)
+    charlock_holmes (0.6.8)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     coffee-rails (3.1.1)
@@ -87,6 +88,7 @@ GEM
       execjs
     coffee-script-source (1.1.3)
     columnize (0.3.4)
+    crack (0.3.1)
     daemons (1.1.4)
     database_cleaner (0.7.0)
     devise (1.5.0)
@@ -111,6 +113,9 @@ GEM
       railties (~> 3.0)
     hashery (1.4.0)
     hike (1.2.1)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     i18n (0.6.0)
     jquery-rails (1.0.17)
       railties (~> 3.0)
@@ -132,6 +137,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.0.3)
+    multi_xml (0.4.1)
     nokogiri (1.5.0)
     orm_adapter (0.0.5)
     polyglot (0.3.3)
@@ -143,6 +149,8 @@ GEM
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
+    rack-protection (1.1.4)
+      rack
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
@@ -165,10 +173,17 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rchardet19 (1.3.5)
     rdiscount (1.6.8)
     rdoc (3.11)
       json (~> 1.4)
+    redis (2.2.2)
+    redis-namespace (1.0.3)
+      redis (< 3.0.0)
+    resque (1.19.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0.2)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -220,6 +235,10 @@ GEM
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
     six (0.2.0)
     sprockets (2.0.3)
       hike (~> 1.2)
@@ -244,8 +263,13 @@ GEM
     uglifier (1.1.0)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
+    vegas (0.1.8)
+      rack (>= 1.0.0)
     warden (1.1.0)
       rack (>= 1.0)
+    webmock (1.7.8)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -261,6 +285,7 @@ DEPENDENCIES
   awesome_print
   capybara
   carrierwave
+  charlock_holmes
   coffee-rails (~> 3.1.0)
   database_cleaner
   devise (= 1.5.0)
@@ -270,6 +295,7 @@ DEPENDENCIES
   gitolite!
   grit!
   haml-rails
+  httparty
   jquery-rails
   kaminari
   launchy
@@ -277,8 +303,8 @@ DEPENDENCIES
   pygments.rb (= 0.2.3)
   rails (= 3.1.1)
   rails-footnotes (~> 3.7.5)
-  rchardet19 (~> 1.3.5)
   rdiscount
+  resque
   rspec-rails
   ruby-debug19
   sass-rails (~> 3.1.0)
@@ -292,3 +318,4 @@ DEPENDENCIES
   thin
   turn
   uglifier
+  webmock
@@ -5,9 +5,9 @@ GitLab is a free Project/Repository management application
 ## Application details
-rails 3.1
-works only with gitolite
-sqlite as default a database
+* rails 3.1
+* works only with gitolite
+* sqlite as default a database
 ## Requirements
@@ -42,3 +42,11 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f
 .note .note-title { margin-left:55px; }
+
+p.notify_controls input{
+  margin: 5px;
+}
+
+p.notify_controls span{
+  font-weight: 700;
+}
@@ -359,6 +359,9 @@ header nav{border-radius: 4px; box-shadow: 0 1px 2px black; width: 294px; margin
   margin-top: 2px;
   height:30px
 }
+header nav.shorter_nav{
+  width: 207px;
+}
 header nav a{padding: 8px 12px 8px 34px; display: inline-block; color: #D6DADF; border-right: 1px solid #31363E; position: relative; box-shadow: 1px 0 0 rgba(255,255,255,.1); margin: 0}
 header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;}
 header nav a:last-child {border: 0; box-shadow: none}
@@ -382,7 +385,7 @@ header nav a.dashboard {
   border-bottom-left-radius: 4px;
 }
-header nav a.admin{
+header nav a.last_elem{
   -webkit-border-top-right-radius: 4px;
   -webkit-border-bottom-right-radius: 4px;
   -moz-border-radius-topright: 4px;
@@ -23,4 +23,23 @@ module CommitsHelper
     link_to "More", project_commits_path(@project, :offset =>  offset.to_i + limit.to_i, :limit => limit),
       :remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
   end
+
+  def commit_msg_with_link_to_issues(project, message)
+    return '' unless message
+    out = ''
+    message.split(/(#[0-9]+)/m).each do |m|
+      if m =~ /(#([0-9]+))/m
+        begin
+          issue = project.issues.find($2)
+          out += link_to($1, project_issue_path(project, $2))
+        rescue
+          out += $1
+        end
+      else
+        out += m
+      end
+    end
+    preserve out
+  end
+
 end
@@ -15,6 +15,7 @@ class Project &lt; ActiveRecord::Base
   has_many :notes, :dependent => :destroy
   has_many :snippets, :dependent => :destroy
   has_many :deploy_keys, :dependent => :destroy
+  has_many :web_hooks, :dependent => :destroy
   acts_as_taggable
@@ -83,12 +84,58 @@ class Project &lt; ActiveRecord::Base
     :heads,
     :commits_since,
     :fresh_commits,
+    :commits_between,
     :to => :repository, :prefix => nil
   def to_param
     code
   end
+  def web_url
+    [GIT_HOST['host'], code].join("/")
+  end
+
+  def execute_web_hooks(oldrev, newrev, ref)
+    ref_parts = ref.split('/')
+
+    # Return if this is not a push to a branch (e.g. new commits)
+    return if ref_parts[1] !~ /heads/ || oldrev == "00000000000000000000000000000000"
+
+    data = web_hook_data(oldrev, newrev, ref)
+    web_hooks.each { |web_hook| web_hook.execute(data) }
+  end
+
+  def web_hook_data(oldrev, newrev, ref)
+    data = {
+      before: oldrev,
+      after: newrev,
+      ref: ref,
+      repository: {
+        name: name,
+        url: web_url,
+        description: description,
+        homepage: web_url,
+        private: private?
+      },
+      commits: []
+    }
+
+    commits_between(oldrev, newrev).each do |commit|
+      data[:commits] << {
+        id: commit.id,
+        message: commit.safe_message,
+        timestamp: commit.date.xmlschema,
+        url: "http://#{GIT_HOST['host']}/#{code}/commits/#{commit.id}",
+        author: {
+          name: commit.author_name,
+          email: commit.author_email
+        }
+      }
+    end
+
+    data
+  end
+
   def team_member_by_name_or_email(email = nil, name = nil)
     user = users.where("email like ? or name like ?", email, name).first
     users_projects.find_by_user_id(user.id) if user
@@ -31,6 +31,22 @@ class Repository
     project.id
   end
+  def write_hooks
+    %w(post-receive).each do |hook|
+      write_hook(hook, File.read(File.join(Rails.root, 'lib', "#{hook}-hook")))
+    end
+  end
+
+  def write_hook(name, content)
+    hook_file = File.join(project.path_to_repo, 'hooks', name)
+
+    File.open(hook_file, 'w') do |f|
+      f.write(content)
+    end
+
+    File.chmod(0775, hook_file)
+  end
+
   def repo
     @repo ||= Grit::Repo.new(project.path_to_repo)
   end
@@ -47,6 +63,8 @@ class Repository
     Gitlabhq::GitHost.system.new.configure do |c|
       c.update_project(path, project)
     end
+
+    write_hooks if File.exists?(project.path_to_repo)
   end
   def destroy_repository
@@ -115,4 +133,8 @@ class Repository
       repo.commits(ref)
     end.map{ |c| Commit.new(c) } 
   end
+
+  def commits_between(from, to)
+    repo.commits_between(from, to).map { |c| Commit.new(c) }
+  end
 end
@@ -0,0 +1,20 @@
+class WebHook < ActiveRecord::Base
+  include HTTParty
+
+  # HTTParty timeout
+  default_timeout 10
+
+  belongs_to :project
+
+  validates :url,
+            presence: true,
+            format: {
+              with: URI::regexp(%w(http https)),
+              message: "should be a valid url" }
+
+  def execute(data)
+    WebHook.post(url, body: data.to_json)
+  rescue
+    # There was a problem calling this web hook, let's forget about it.
+  end
+end
@@ -18,8 +18,7 @@
 %hr
 %pre.commit_message
-  = preserve @commit.safe_message
-
+  = commit_msg_with_link_to_issues(@project, @commit.safe_message)
 .clear
 %br
@@ -21,16 +21,18 @@
     <%= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"  %>
   </div>
   <!-- .login-top -->
-  <nav>
-    <%= link_to dashboard_path, :class => current_page?(root_path) ? "current dashboard" : "dashboard" do %>
+  <nav class="<%= 'shorter_nav' unless current_user.is_admin? %>">
+    <%= link_to dashboard_path, :class => "#{'current' if current_page?(root_path)} dashboard" do %>
       <span></span>Dashboard
     <% end %>
-    <%= link_to projects_path, :class => current_page?(projects_path) ? "current project" : "project" do %>
+    <%= link_to projects_path, :class =>"#{'current' if current_page?(projects_path)} project #{'last_elem' unless current_user.is_admin?}" do %>
       <span></span>Projects
     <% end %>
-    <%= link_to((current_user.is_admin? ? admin_root_path : "#"), :class => (admin_namespace? ? "current admin" : "admin")) do %>
-      <span></span>Admin
-    <% end  %>
+    <% if current_user.is_admin? %>
+      <%= link_to((current_user.is_admin? ? admin_root_path : "#"), :class => "#{'current' if admin_namespace?} admin last_elem") do %>
+        <span></span>Admin
+      <% end  %>
+    <% end %>
   </nav>
 </header>
@@ -3,6 +3,7 @@
   %head
     %title
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = favicon_link_tag 'favicon.ico'
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
@@ -3,6 +3,7 @@
   %head
     %title
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = favicon_link_tag 'favicon.ico'
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
@@ -3,6 +3,7 @@
   %head
     %title
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = favicon_link_tag 'favicon.ico'
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
@@ -3,6 +3,7 @@
   %head
     %title
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = favicon_link_tag 'favicon.ico'
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     - if current_page?(tree_project_ref_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))
@@ -22,13 +22,15 @@
       %br
       %br
       = f.file_field :attachment
+      
+      %p.notify_controls
+        %span Notify:
+        = check_box_tag :notify, 1, @note.noteable_type != "Commit"
+        = label_tag :notify, "Project team"
-      = check_box_tag :notify, 1, @note.noteable_type != "Commit"
-      = label_tag :notify, "Notify project team about your note"
-
-      -if @note.noteable_type == "Commit"
-        = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
-        = label_tag :notify_author, "Notify commit author about your note"
+        -if @note.noteable_type == "Commit"
+          = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
+          = label_tag :notify_author, "Commit author"
     .clear
     %br
@@ -0,0 +1,8 @@
+class PostReceive
+  def self.perform(reponame, oldrev, newrev, ref)
+    project = Project.find_by_path(reponame)
+    return false if project.nil?
+
+    project.execute_web_hooks(oldrev, newrev, ref)
+  end
+end
 Gitlab::Application.routes.draw do
+  # Optionally, enable Resque here
+  # require 'resque/server'
+  # mount Resque::Server.new, at: '/info/resque'
   get 'tags'=> 'tags#index'
   get 'tags/:tag' => 'projects#index'
@@ -0,0 +1,9 @@
+class CreateWebHooks < ActiveRecord::Migration
+  def change
+    create_table :web_hooks do |t|
+      t.string :url
+      t.integer :project_id
+      t.timestamps
+    end
+  end
+end
@@ -13,18 +13,6 @@
 ActiveRecord::Schema.define(:version => 20111220190817) do
-  create_table "features", :force => true do |t|
-    t.string   "name"
-    t.string   "branch_name"
-    t.integer  "assignee_id"
-    t.integer  "author_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "version"
-    t.integer  "status",      :default => 0, :null => false
-  end
-
   create_table "issues", :force => true do |t|
     t.string   "title"
     t.integer  "assignee_id"
@@ -145,4 +133,11 @@ ActiveRecord::Schema.define(:version =&gt; 20111220190817) do
     t.integer  "project_access", :default => 0, :null => false
   end
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end
@@ -43,14 +43,14 @@ module Gitlabhq
     def destroy_project(project)
       FileUtils.rm_rf(project.path_to_repo)
-      
+
       ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
       conf = ga_repo.config
       conf.rm_repo(project.path)
       ga_repo.save
     end
-     #update or create
+    #update or create
     def update_keys(user, key)
       File.open(File.join(@local_dir, 'gitolite/keydir',"#{user}.pub"), 'w') {|f| f.write(key.gsub(/\n/,'')) }
     end
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was placed here by Gitlab. It makes sure that your pushed commits
+# will be processed properly.
+
+while read oldrev newrev ref
+do
+  # For every branch or tag that was pushed, create a Resque job in redis.
+  pwd=`pwd`
+  reponame=`basename "$pwd" | cut -d. -f1`
+  env -i redis-cli rpush "resque:queue:post-receive" "{\"class\":\"PostReceive\",\"args\":[\"$reponame\",\"$oldrev\",\"$newrev\",\"$ref\"]}" > /dev/null 2>&1
+done
@@ -0,0 +1 @@
+require 'resque/tasks'
@@ -17,15 +17,13 @@ module Utils
   end
   module CharEncode
-    def encode(string)
-      return '' unless string
-      cd = CharDet.detect(string)
-      if cd.confidence > 0.6
-        string.force_encoding(cd.encoding)
+    def encode(content)
+      content ||= ''
+      detection = CharlockHolmes::EncodingDetector.detect(content)
+      if hash = detection
+        content = CharlockHolmes::Converter.convert(content, hash[:encoding], 'UTF-8') if hash[:encoding]
       end
-      string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
-    rescue
-      "Invalid Encoding"
+      content
     end
   end
@@ -55,3 +55,7 @@ Factory.add(:key, Key) do |obj|
   obj.title = "Example key"
   obj.key = File.read(File.join(Rails.root, "db", "pkey.example"))
 end
+
+Factory.add(:web_hook, WebHook) do |obj|
+  obj.url = Faker::Internet.url
+end
@@ -0,0 +1,67 @@
+require "spec_helper"
+include Haml::Helpers
+
+describe CommitsHelper do
+
+  before do
+    @project = Factory :project
+    @other_project = Factory :project, :path => "OtherPath", :code => "OtherCode"
+    @fake_user = Factory :user
+    @valid_issue = Factory :issue, :assignee => @fake_user, :author => @fake_user, :project => @project
+    @invalid_issue = Factory :issue, :assignee => @fake_user, :author => @fake_user, :project => @other_project
+  end
+
+  it "should provides return message untouched if no issue number present" do
+    message = "Dummy message without issue number"
+
+    commit_msg_with_link_to_issues(@project, message).should eql message
+  end
+
+  it "should returns message handled by preserve" do
+    message = "My brand new
+    Commit on multiple
+    lines !"
+
+    #\n are converted to &#x000A as specified in preserve_rspec
+    expected = "My brand new&#x000A;    Commit on multiple&#x000A;    lines !"
+
+    commit_msg_with_link_to_issues(@project, message).should eql expected
+  end
+
+  it "should returns empty string if message undefined" do
+    commit_msg_with_link_to_issues(@project, nil).should eql ''
+  end
+
+  it "should returns link_to issue for one valid issue in message" do
+    issue_id = @valid_issue.id
+    message = "One commit message ##{issue_id}"
+    expected = "One commit message <a href=\"/#{@project.code}/issues/#{issue_id}\">##{issue_id}</a>"
+
+    commit_msg_with_link_to_issues(@project, message).should eql expected
+  end
+
+  it "should returns message untouched for one invalid issue in message" do
+    issue_id = @invalid_issue.id
+    message = "One commit message ##{issue_id}"
+
+    commit_msg_with_link_to_issues(@project, message).should eql message
+  end
+
+  it "should handle multiple issue references in commit message" do
+    issue_id = @valid_issue.id
+    invalid_issue_id = @invalid_issue.id
+
+    message = "One big commit message with a valid issue ##{issue_id} and an invalid one ##{invalid_issue_id}.
+    We reference valid ##{issue_id} multiple times (##{issue_id}) as the invalid ##{invalid_issue_id} is also
+    referenced another time (##{invalid_issue_id})"
+
+    expected = "One big commit message with a valid issue <a href=\"/#{@project.code}/issues/#{issue_id}\">##{issue_id}</a>"+
+        " and an invalid one ##{invalid_issue_id}.&#x000A;    "+
+        "We reference valid <a href=\"/#{@project.code}/issues/#{issue_id}\">##{issue_id}</a> multiple times "+
+        "(<a href=\"/#{@project.code}/issues/#{issue_id}\">##{issue_id}</a>) "+
+        "as the invalid ##{invalid_issue_id} is also&#x000A;    referenced another time (##{invalid_issue_id})"
+
+    commit_msg_with_link_to_issues(@project, message).should eql expected
+  end
+
+end
 \ No newline at end of file
@@ -7,6 +7,7 @@ describe Project do
     it { should have_many(:issues) }
     it { should have_many(:notes) }
     it { should have_many(:snippets) }
+    it { should have_many(:web_hooks).dependent(:destroy) }
   end
   describe "Validation" do
@@ -33,6 +34,7 @@ describe Project do
     it { should respond_to(:repo) }
     it { should respond_to(:tags) }
     it { should respond_to(:commit) }
+    it { should respond_to(:commits_between) }
   end
   it "should not allow 'gitolite-admin' as repo name" do
@@ -50,6 +52,11 @@ describe Project do
     project.path_to_repo.should == File.join(Rails.root, "tmp", "tests", "somewhere")
   end
+  it "returns the full web URL for this repo" do
+    project = Project.new(:code => "somewhere")
+    project.web_url.should == "#{GIT_HOST['host']}/somewhere"
+  end
+
   describe :valid_repo? do
     it "should be valid repo" do
       project = Factory :project
@@ -62,6 +69,106 @@ describe Project do
     end
   end
+  describe "web hooks" do
+    let(:project) { Factory :project }
+
+    context "with no web hooks" do
+      it "raises no errors" do
+        lambda {
+          project.execute_web_hooks('oldrev', 'newrev', 'ref')
+        }.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]
+      end
+
+      it "executes multiple web hook" do
+        @webhook.should_receive(:execute).once
+        @webhook_2.should_receive(:execute).once
+
+        project.execute_web_hooks('oldrev', 'newrev', 'refs/heads/master')
+      end
+    end
+
+    context "does not execute web hooks" do
+      before do
+        @webhook = Factory(:web_hook)
+        project.web_hooks << [@webhook]
+      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')
+      end
+
+      it "when pushing tags" do
+        @webhook.should_not_receive(:execute)
+        project.execute_web_hooks('oldrev', 'newrev', 'refs/tags/v1.0.0')
+      end
+    end
+
+    context "when pushing new branches" do
+
+    end
+
+    context "when gathering commit data" do
+      before do
+        @oldrev, @newrev, @ref = project.fresh_commits(2).last.sha, project.fresh_commits(2).first.sha, 'refs/heads/master'
+        @commit = project.fresh_commits(2).first
+
+        # Fill nil/empty attributes
+        project.description = "This is a description"
+
+        @data = project.web_hook_data(@oldrev, @newrev, @ref)
+      end
+
+      subject { @data }
+
+      it { should include(before: @oldrev) }
+      it { should include(after: @newrev) }
+      it { should include(ref: @ref) }
+
+      context "with repository data" do
+        subject { @data[:repository] }
+
+        it { should include(name: project.name) }
+        it { should include(url: project.web_url) }
+        it { should include(description: project.description) }
+        it { should include(homepage: project.web_url) }
+        it { should include(private: project.private?) }
+      end
+
+      context "with commits" do
+        subject { @data[:commits] }
+
+        it { should be_an(Array) }
+        it { should have(1).element }
+
+        context "the commit" do
+          subject { @data[:commits].first }
+
+          it { should include(id: @commit.id) }
+          it { should include(message: @commit.safe_message) }
+          it { should include(timestamp: @commit.date.xmlschema) }
+          it { should include(url: "http://localhost/#{project.code}/commits/#{@commit.id}") }
+
+          context "with a author" do
+            subject { @data[:commits].first[:author] }
+
+            it { should include(name: @commit.author_name) }
+            it { should include(email: @commit.author_email) }
+          end
+        end
+      end
+
+    end
+  end
+
   describe "updates" do
     let(:project) { Factory :project }
@@ -107,6 +214,21 @@ describe Project do
     it { project.fresh_commits.last.id.should == "0dac878dbfe0b9c6104a87d65fe999149a8d862c" }
   end
+  describe "commits_between" do
+    let(:project) { Factory :project }
+
+    subject do
+      commits = project.commits_between("a6d1d4aca0c85816ddfd27d93773f43a31395033",
+                                        "2fb376f61875b58bceee0492e270e9c805294b1a")
+      commits.map { |c| c.id }
+    end
+
+    it { should have(2).elements }
+    it { should include("2fb376f61875b58bceee0492e270e9c805294b1a") }
+    it { should include("4571e226fbcd7be1af16e9fa1e13b7ac003bebdf") }
+    it { should_not include("a6d1d4aca0c85816ddfd27d93773f43a31395033") }
+  end
+
   describe "Git methods" do
     let(:project) { Factory :project }
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe WebHook do
+  describe "Associations" do
+    it { should belong_to :project }
+  end
+
+  describe "Validations" do
+    it { should validate_presence_of(:url) }
+
+    context "url format" do
+      it { should allow_value("http://example.com").for(:url) }
+      it { should allow_value("https://excample.com").for(:url) }
+      it { should allow_value("http://test.com/api").for(:url) }
+      it { should allow_value("http://test.com/api?key=abc").for(:url) }
+      it { should allow_value("http://test.com/api?key=abc&type=def").for(:url) }
+
+      it { should_not allow_value("example.com").for(:url) }
+      it { should_not allow_value("ftp://example.com").for(:url) }
+      it { should_not allow_value("herp-and-derp").for(:url) }
+    end
+  end
+
+  describe "execute" do
+    before(:each) do
+      @webhook = Factory :web_hook
+      @project = Factory :project
+      @project.web_hooks << [@webhook]
+      @data = { before: 'oldrev', after: 'newrev', ref: 'ref'}
+
+      WebMock.stub_request(:post, @webhook.url)
+    end
+
+    it "POSTs to the web hook URL" do
+      @webhook.execute(@data)
+      WebMock.should have_requested(:post, @webhook.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
+    end
+
+    it "catches exceptions" do
+      WebHook.should_receive(:post).and_raise("Some HTTP Post error")
+
+      lambda {
+        @webhook.execute(@data)
+      }.should_not raise_error
+    end
+  end
+end
 require 'spec_helper'
 describe "Dashboard" do
-  before { login_as :user }
+  before do 
+    @project = Factory :project
+    @user = User.create(:email => "test917@mail.com",
+                        :name => "John Smith",
+                        :password => "123456",
+                        :password_confirmation => "123456")
+    @project.add_access(@user, :read, :write)
+    login_with(@user)
+  end
   describe "GET /dashboard" do
     before do
-      @project = Factory :project
-      @project.add_access(@user, :read, :write)
       visit dashboard_path
     end
@@ -20,12 +26,14 @@ describe &quot;Dashboard&quot; do
       end
     end
-    it "should have news feed" do
-      within "#news-feed"  do
-        page.should have_content("commit")
-        page.should have_content(@project.commit.author.name)
-        page.should have_content(@project.commit.safe_message)
-      end
-    end
+    # Temporary disabled cause of travis
+    # TODO: fix or rewrite
+    #it "should have news feed" do
+      #within "#news-feed"  do
+        #page.should have_content("commit")
+        #page.should have_content(@project.commit.author.name)
+        #page.should have_content(@project.commit.safe_message)
+      #end
+    #end
   end
 end
-require 'spec_helper'
-require 'benchmark'
-
-describe "Projects" do
-  before { login_as :user }
-
-  describe "GET /projects/tree" do
-    describe "head" do
-      before do
-        @project = Factory :project
-        @project.add_access(@user, :read)
-
-      end
-
-      it "should be fast" do
-        time = Benchmark.realtime do
-          visit tree_project_ref_path(@project, @project.root_ref)
-        end
-        (time < 1.0).should be_true
-      end
-    end
-
-    describe ValidCommit::ID do
-      before do
-        @project = Factory :project
-        @project.add_access(@user, :read)
-      end
-
-      it "should be fast" do
-        time = Benchmark.realtime do
-          visit tree_project_ref_path(@project, ValidCommit::ID)
-        end
-        (time < 1.0).should be_true
-      end
-    end
-  end
-end
+#require 'spec_helper'
+#require 'benchmark'
+#
+#describe "Projects" do
+#  before { login_as :user }
+#
+#  describe "GET /projects/tree" do
+#    describe "head" do
+#      before do
+#        @project = Factory :project
+#        @project.add_access(@user, :read)
+#      end
+#
+#      it "should be fast" do
+#        time = Benchmark.realtime do
+#          visit tree_project_ref_path(@project, @project.root_ref)
+#        end
+#        (time < 1.0).should be_true
+#      end
+#    end
+#
+#    describe ValidCommit::ID do
+#      before do
+#        @project = Factory :project
+#        @project.add_access(@user, :read)
+#      end
+#
+#      it "should be fast" do
+#        time = Benchmark.realtime do
+#          visit tree_project_ref_path(@project, ValidCommit::ID)
+#        end
+#        (time < 1.0).should be_true
+#      end
+#    end
+#  end
+#end
@@ -8,6 +8,7 @@ require &#39;rspec/rails&#39;
 require 'capybara/rails'
 require 'capybara/rspec'
 require 'capybara/dsl'
+require 'webmock/rspec'
 require 'factories'
 require 'monkeypatch'
@@ -48,6 +49,8 @@ RSpec.configure do |config|
     end
     DatabaseCleaner.start
+
+    WebMock.disable_net_connect!(allow_localhost: true)
   end
   config.after do
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe PostReceive do
+
+  context "as a resque worker" do
+    it "reponds to #perform" do
+      PostReceive.should respond_to(:perform)
+    end
+  end
+
+  context "web hooks" do
+    let(:project) { Factory :project }
+
+    it "it retrieves the correct project" do
+      Project.should_receive(:find_by_path).with(project.path)
+      PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master')
+    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')
+
+      PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master')
+    end
+  end
+end
		1	+before_install: sudo apt-get install libicu-dev -y
1	branches:	2	branches:
2	only:	3	only:
3	- 'master'	4	- 'master'
	@@ -77,6 +77,7 @@ GEM		@@ -77,6 +77,7 @@ GEM
77	xpath (~> 0.1.4)	77	xpath (~> 0.1.4)
78	carrierwave (0.5.8)	78	carrierwave (0.5.8)
79	activesupport (~> 3.0)	79	activesupport (~> 3.0)
		80	+ charlock_holmes (0.6.8)
80	childprocess (0.2.2)	81	childprocess (0.2.2)
81	ffi (~> 1.0.6)	82	ffi (~> 1.0.6)
82	coffee-rails (3.1.1)	83	coffee-rails (3.1.1)
	@@ -87,6 +88,7 @@ GEM		@@ -87,6 +88,7 @@ GEM
87	execjs	88	execjs
88	coffee-script-source (1.1.3)	89	coffee-script-source (1.1.3)
89	columnize (0.3.4)	90	columnize (0.3.4)
		91	+ crack (0.3.1)
90	daemons (1.1.4)	92	daemons (1.1.4)
91	database_cleaner (0.7.0)	93	database_cleaner (0.7.0)
92	devise (1.5.0)	94	devise (1.5.0)
	@@ -111,6 +113,9 @@ GEM		@@ -111,6 +113,9 @@ GEM
111	railties (~> 3.0)	113	railties (~> 3.0)
112	hashery (1.4.0)	114	hashery (1.4.0)
113	hike (1.2.1)	115	hike (1.2.1)
		116	+ httparty (0.8.1)
		117	+ multi_json
		118	+ multi_xml
114	i18n (0.6.0)	119	i18n (0.6.0)
115	jquery-rails (1.0.17)	120	jquery-rails (1.0.17)
116	railties (~> 3.0)	121	railties (~> 3.0)
	@@ -132,6 +137,7 @@ GEM		@@ -132,6 +137,7 @@ GEM
132	treetop (~> 1.4.8)	137	treetop (~> 1.4.8)
133	mime-types (1.17.2)	138	mime-types (1.17.2)
134	multi_json (1.0.3)	139	multi_json (1.0.3)
		140	+ multi_xml (0.4.1)
135	nokogiri (1.5.0)	141	nokogiri (1.5.0)
136	orm_adapter (0.0.5)	142	orm_adapter (0.0.5)
137	polyglot (0.3.3)	143	polyglot (0.3.3)
	@@ -143,6 +149,8 @@ GEM		@@ -143,6 +149,8 @@ GEM
143	rack (>= 0.4)	149	rack (>= 0.4)
144	rack-mount (0.8.3)	150	rack-mount (0.8.3)
145	rack (>= 1.0.0)	151	rack (>= 1.0.0)
		152	+ rack-protection (1.1.4)
		153	+ rack
146	rack-ssl (1.3.2)	154	rack-ssl (1.3.2)
147	rack	155	rack
148	rack-test (0.6.1)	156	rack-test (0.6.1)
	@@ -165,10 +173,17 @@ GEM		@@ -165,10 +173,17 @@ GEM
165	rdoc (~> 3.4)	173	rdoc (~> 3.4)
166	thor (~> 0.14.6)	174	thor (~> 0.14.6)
167	rake (0.9.2.2)	175	rake (0.9.2.2)
168	- rchardet19 (1.3.5)
169	rdiscount (1.6.8)	176	rdiscount (1.6.8)
170	rdoc (3.11)	177	rdoc (3.11)
171	json (~> 1.4)	178	json (~> 1.4)
		179	+ redis (2.2.2)
		180	+ redis-namespace (1.0.3)
		181	+ redis (< 3.0.0)
		182	+ resque (1.19.0)
		183	+ multi_json (~> 1.0)
		184	+ redis-namespace (~> 1.0.2)
		185	+ sinatra (>= 0.9.2)
		186	+ vegas (~> 0.1.2)
172	rspec (2.7.0)	187	rspec (2.7.0)
173	rspec-core (~> 2.7.0)	188	rspec-core (~> 2.7.0)
174	rspec-expectations (~> 2.7.0)	189	rspec-expectations (~> 2.7.0)
	@@ -220,6 +235,10 @@ GEM		@@ -220,6 +235,10 @@ GEM
220	multi_json (~> 1.0.3)	235	multi_json (~> 1.0.3)
221	simplecov-html (~> 0.5.3)	236	simplecov-html (~> 0.5.3)
222	simplecov-html (0.5.3)	237	simplecov-html (0.5.3)
		238	+ sinatra (1.3.1)
		239	+ rack (~> 1.3, >= 1.3.4)
		240	+ rack-protection (~> 1.1, >= 1.1.2)
		241	+ tilt (~> 1.3, >= 1.3.3)
223	six (0.2.0)	242	six (0.2.0)
224	sprockets (2.0.3)	243	sprockets (2.0.3)
225	hike (~> 1.2)	244	hike (~> 1.2)
	@@ -244,8 +263,13 @@ GEM		@@ -244,8 +263,13 @@ GEM
244	uglifier (1.1.0)	263	uglifier (1.1.0)
245	execjs (>= 0.3.0)	264	execjs (>= 0.3.0)
246	multi_json (>= 1.0.2)	265	multi_json (>= 1.0.2)
		266	+ vegas (0.1.8)
		267	+ rack (>= 1.0.0)
247	warden (1.1.0)	268	warden (1.1.0)
248	rack (>= 1.0)	269	rack (>= 1.0)
		270	+ webmock (1.7.8)
		271	+ addressable (~> 2.2, > 2.2.5)
		272	+ crack (>= 0.1.7)
249	xpath (0.1.4)	273	xpath (0.1.4)
250	nokogiri (~> 1.3)	274	nokogiri (~> 1.3)
251		275
	@@ -261,6 +285,7 @@ DEPENDENCIES		@@ -261,6 +285,7 @@ DEPENDENCIES
261	awesome_print	285	awesome_print
262	capybara	286	capybara
263	carrierwave	287	carrierwave
		288	+ charlock_holmes
264	coffee-rails (~> 3.1.0)	289	coffee-rails (~> 3.1.0)
265	database_cleaner	290	database_cleaner
266	devise (= 1.5.0)	291	devise (= 1.5.0)
	@@ -270,6 +295,7 @@ DEPENDENCIES		@@ -270,6 +295,7 @@ DEPENDENCIES
270	gitolite!	295	gitolite!
271	grit!	296	grit!
272	haml-rails	297	haml-rails
		298	+ httparty
273	jquery-rails	299	jquery-rails
274	kaminari	300	kaminari
275	launchy	301	launchy
	@@ -277,8 +303,8 @@ DEPENDENCIES		@@ -277,8 +303,8 @@ DEPENDENCIES
277	pygments.rb (= 0.2.3)	303	pygments.rb (= 0.2.3)
278	rails (= 3.1.1)	304	rails (= 3.1.1)
279	rails-footnotes (~> 3.7.5)	305	rails-footnotes (~> 3.7.5)
280	- rchardet19 (~> 1.3.5)
281	rdiscount	306	rdiscount
		307	+ resque
282	rspec-rails	308	rspec-rails
283	ruby-debug19	309	ruby-debug19
284	sass-rails (~> 3.1.0)	310	sass-rails (~> 3.1.0)
	@@ -292,3 +318,4 @@ DEPENDENCIES		@@ -292,3 +318,4 @@ DEPENDENCIES
292	thin	318	thin
293	turn	319	turn
294	uglifier	320	uglifier
		321	+ webmock
	@@ -42,3 +42,11 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f		@@ -42,3 +42,11 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f
42		42
43		43
44	.note .note-title { margin-left:55px; }	44	.note .note-title { margin-left:55px; }
		45	+
		46	+p.notify_controls input{
		47	+ margin: 5px;
		48	+}
		49	+
		50	+p.notify_controls span{
		51	+ font-weight: 700;
		52	+}
	@@ -23,4 +23,23 @@ module CommitsHelper		@@ -23,4 +23,23 @@ module CommitsHelper
23	link_to "More", project_commits_path(@project, :offset => offset.to_i + limit.to_i, :limit => limit),	23	link_to "More", project_commits_path(@project, :offset => offset.to_i + limit.to_i, :limit => limit),
24	:remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"	24	:remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
25	end	25	end
		26	+
		27	+ def commit_msg_with_link_to_issues(project, message)
		28	+ return '' unless message
		29	+ out = ''
		30	+ message.split(/(#[0-9]+)/m).each do \|m\|
		31	+ if m =~ /(#([0-9]+))/m
		32	+ begin
		33	+ issue = project.issues.find($2)
		34	+ out += link_to($1, project_issue_path(project, $2))
		35	+ rescue
		36	+ out += $1
		37	+ end
		38	+ else
		39	+ out += m
		40	+ end
		41	+ end
		42	+ preserve out
		43	+ end
		44	+
26	end	45	end
	@@ -15,6 +15,7 @@ class Project < ActiveRecord::Base		@@ -15,6 +15,7 @@ class Project < ActiveRecord::Base
15	has_many :notes, :dependent => :destroy	15	has_many :notes, :dependent => :destroy
16	has_many :snippets, :dependent => :destroy	16	has_many :snippets, :dependent => :destroy
17	has_many :deploy_keys, :dependent => :destroy	17	has_many :deploy_keys, :dependent => :destroy
		18	+ has_many :web_hooks, :dependent => :destroy
18		19
19	acts_as_taggable	20	acts_as_taggable
20		21
	@@ -83,12 +84,58 @@ class Project < ActiveRecord::Base		@@ -83,12 +84,58 @@ class Project < ActiveRecord::Base
83	:heads,	84	:heads,
84	:commits_since,	85	:commits_since,
85	:fresh_commits,	86	:fresh_commits,
		87	+ :commits_between,
86	:to => :repository, :prefix => nil	88	:to => :repository, :prefix => nil
87		89
88	def to_param	90	def to_param
89	code	91	code
90	end	92	end
91		93
		94	+ def web_url
		95	+ [GIT_HOST['host'], code].join("/")
		96	+ end
		97	+
		98	+ def execute_web_hooks(oldrev, newrev, ref)
		99	+ ref_parts = ref.split('/')
		100	+
		101	+ # Return if this is not a push to a branch (e.g. new commits)
		102	+ return if ref_parts[1] !~ /heads/ \|\| oldrev == "00000000000000000000000000000000"
		103	+
		104	+ data = web_hook_data(oldrev, newrev, ref)
		105	+ web_hooks.each { \|web_hook\| web_hook.execute(data) }
		106	+ end
		107	+
		108	+ def web_hook_data(oldrev, newrev, ref)
		109	+ data = {
		110	+ before: oldrev,
		111	+ after: newrev,
		112	+ ref: ref,
		113	+ repository: {
		114	+ name: name,
		115	+ url: web_url,
		116	+ description: description,
		117	+ homepage: web_url,
		118	+ private: private?
		119	+ },
		120	+ commits: []
		121	+ }
		122	+
		123	+ commits_between(oldrev, newrev).each do \|commit\|
		124	+ data[:commits] << {
		125	+ id: commit.id,
		126	+ message: commit.safe_message,
		127	+ timestamp: commit.date.xmlschema,
		128	+ url: "http://#{GIT_HOST['host']}/#{code}/commits/#{commit.id}",
		129	+ author: {
		130	+ name: commit.author_name,
		131	+ email: commit.author_email
		132	+ }
		133	+ }
		134	+ end
		135	+
		136	+ data
		137	+ end
		138	+
92	def team_member_by_name_or_email(email = nil, name = nil)	139	def team_member_by_name_or_email(email = nil, name = nil)
93	user = users.where("email like ? or name like ?", email, name).first	140	user = users.where("email like ? or name like ?", email, name).first
94	users_projects.find_by_user_id(user.id) if user	141	users_projects.find_by_user_id(user.id) if user
	@@ -31,6 +31,22 @@ class Repository		@@ -31,6 +31,22 @@ class Repository
31	project.id	31	project.id
32	end	32	end
33		33
		34	+ def write_hooks
		35	+ %w(post-receive).each do \|hook\|
		36	+ write_hook(hook, File.read(File.join(Rails.root, 'lib', "#{hook}-hook")))
		37	+ end
		38	+ end
		39	+
		40	+ def write_hook(name, content)
		41	+ hook_file = File.join(project.path_to_repo, 'hooks', name)
		42	+
		43	+ File.open(hook_file, 'w') do \|f\|
		44	+ f.write(content)
		45	+ end
		46	+
		47	+ File.chmod(0775, hook_file)
		48	+ end
		49	+
34	def repo	50	def repo
35	@repo \|\|= Grit::Repo.new(project.path_to_repo)	51	@repo \|\|= Grit::Repo.new(project.path_to_repo)
36	end	52	end
	@@ -47,6 +63,8 @@ class Repository		@@ -47,6 +63,8 @@ class Repository
47	Gitlabhq::GitHost.system.new.configure do \|c\|	63	Gitlabhq::GitHost.system.new.configure do \|c\|
48	c.update_project(path, project)	64	c.update_project(path, project)
49	end	65	end
		66	+
		67	+ write_hooks if File.exists?(project.path_to_repo)
50	end	68	end
51		69
52	def destroy_repository	70	def destroy_repository
	@@ -115,4 +133,8 @@ class Repository		@@ -115,4 +133,8 @@ class Repository
115	repo.commits(ref)	133	repo.commits(ref)
116	end.map{ \|c\| Commit.new(c) }	134	end.map{ \|c\| Commit.new(c) }
117	end	135	end
		136	+
		137	+ def commits_between(from, to)
		138	+ repo.commits_between(from, to).map { \|c\| Commit.new(c) }
		139	+ end
118	end	140	end
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+class WebHook < ActiveRecord::Base
	2	+ include HTTParty
	3	+
	4	+ # HTTParty timeout
	5	+ default_timeout 10
	6	+
	7	+ belongs_to :project
	8	+
	9	+ validates :url,
	10	+ presence: true,
	11	+ format: {
	12	+ with: URI::regexp(%w(http https)),
	13	+ message: "should be a valid url" }
	14	+
	15	+ def execute(data)
	16	+ WebHook.post(url, body: data.to_json)
	17	+ rescue
	18	+ # There was a problem calling this web hook, let's forget about it.
	19	+ end
	20	+end
	@@ -18,8 +18,7 @@		@@ -18,8 +18,7 @@
18		18
19	%hr	19	%hr
20	%pre.commit_message	20	%pre.commit_message
21	- = preserve @commit.safe_message
22	-	21	+ = commit_msg_with_link_to_issues(@project, @commit.safe_message)
23	.clear	22	.clear
24	%br	23	%br
25		24
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+class PostReceive
	2	+ def self.perform(reponame, oldrev, newrev, ref)
	3	+ project = Project.find_by_path(reponame)
	4	+ return false if project.nil?
	5	+
	6	+ project.execute_web_hooks(oldrev, newrev, ref)
	7	+ end
	8	+end
1	Gitlab::Application.routes.draw do	1	Gitlab::Application.routes.draw do
2		2
		3	+ # Optionally, enable Resque here
		4	+ # require 'resque/server'
		5	+ # mount Resque::Server.new, at: '/info/resque'
3		6
4	get 'tags'=> 'tags#index'	7	get 'tags'=> 'tags#index'
5	get 'tags/:tag' => 'projects#index'	8	get 'tags/:tag' => 'projects#index'