Send author to post hook. Display push activity to dashboard

Dmitriy Zaporozhets
1 parent 796784c7
Showing 15 changed files with 107 additions and 11 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/stylesheets/common.scss
app/controllers/dashboard_controller.rb
app/controllers/issues_controller.rb
app/models/event.rb
app/models/key.rb
app/models/project.rb
app/models/users_project.rb
app/views/dashboard/_events_feed.html.haml
app/views/dashboard/index.html.haml
app/workers/post_receive.rb
lib/post-receive-hook
lib/tasks/update_hooks.rake
resque_dev.sh
@@ -30,6 +30,7 @@ gem &quot;charlock_holmes&quot;
 gem "foreman"
 gem "omniauth-ldap"
 gem 'bootstrap-sass', "1.4.4"
+gem "colored"
 group :assets do
   gem "sass-rails",   "3.2.3"
@@ -88,6 +88,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
+    colored (1.2)
     crack (0.3.1)
     daemons (1.1.8)
     database_cleaner (0.7.1)
@@ -296,6 +297,7 @@ DEPENDENCIES
   carrierwave
   charlock_holmes
   coffee-rails (= 3.2.1)
+  colored
   database_cleaner
   devise
   drapper
@@ -626,3 +626,9 @@ p.time {
     }
   }
 }
+
+.event_feed { 
+  ul { 
+    margin-left:50px;
+  }
+}
@@ -11,6 +11,8 @@ class DashboardController &lt; ApplicationController
     @user   = current_user
     @issues = current_user.assigned_issues.opened.order("created_at DESC").limit(10)
     @issues = @issues.includes(:author, :project)
+
+    @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(20)
   end
   # Get authored or assigned open merge requests
@@ -69,7 +69,10 @@ class IssuesController &lt; ApplicationController
     @issue.author = current_user
     @issue.save
-    respond_with(@issue)
+    respond_to do |format|
+      format.html { redirect_to project_issue_path(@project, @issue) }
+      format.js
+    end
   end
   def update
@@ -11,6 +11,8 @@ class Event &lt; ActiveRecord::Base
   serialize :data
+  scope :recent, order("created_at DESC")
+
   def self.determine_action(record)
     if [Issue, MergeRequest].include? record.class
       Event::Created
@@ -18,6 +20,38 @@ class Event &lt; ActiveRecord::Base
       Event::Commented
     end
   end
+
+  def push?
+    action == self.class::Pushed
+  end
+
+  def new_branch?
+    data[:before] =~ /^00000/
+  end
+
+  def commit_from
+    data[:before]
+  end
+
+  def commit_to
+    data[:after]
+  end
+
+  def branch_name
+    @branch_name ||= data[:ref].gsub("refs/heads/", "")
+  end
+
+  def pusher
+    User.find_by_id(data[:user_id])
+  end
+  
+  def commits
+    @commits ||= data[:commits].map do |commit|
+      project.commit(commit[:id])
+    end
+  end
+
+  delegate :id, :name, :email, :to => :pusher, :prefix => true, :allow_nil => true
 end
 # == Schema Information
 #
@@ -14,6 +14,7 @@ class Key &lt; ActiveRecord::Base
   before_save :set_identifier
   after_save :update_repository
   after_destroy :repository_delete_key
+  delegate :id, :name, :email, :to => :user, :prefix => true
   def set_identifier
     if is_deploy_key
@@ -90,8 +90,8 @@ class Project &lt; ActiveRecord::Base
     [GIT_HOST['host'], code].join("/")
   end
-  def observe_push(oldrev, newrev, ref)
-    data = web_hook_data(oldrev, newrev, ref)
+  def observe_push(oldrev, newrev, ref, author_key_id)
+    data = web_hook_data(oldrev, newrev, ref, author_key_id)
     Event.create(
       :project => self,
@@ -100,22 +100,25 @@ class Project &lt; ActiveRecord::Base
     )
   end
-  def execute_web_hooks(oldrev, newrev, ref)
+  def execute_web_hooks(oldrev, newrev, ref, author_key_id)
     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)
+    data = web_hook_data(oldrev, newrev, ref, author_key_id)
     web_hooks.each { |web_hook| web_hook.execute(data) }
   end
-  def web_hook_data(oldrev, newrev, ref)
+  def web_hook_data(oldrev, newrev, ref, author_key_id)
+    key = Key.find_by_identifier(author_key_id)
     data = {
       before: oldrev,
       after: newrev,
       ref: ref,
+      user_id: key.user_id,
+      user_name: key.user_name,
       repository: {
         name: name,
         url: web_url,
@@ -16,7 +16,7 @@ class UsersProject &lt; ActiveRecord::Base
   validates_presence_of :user_id
   validates_presence_of :project_id
-  delegate :name, :email, :to => :user, :prefix => true
+  delegate :id, :name, :email, :to => :user, :prefix => true
   def self.bulk_import(project, user_ids, project_access, repo_access)
     UsersProject.transaction do
@@ -0,0 +1,19 @@
+- @events.each do |event|
+  .wll.event_feed
+    - if event.push?
+      - if event.new_branch?
+        User pushed new branch 
+      - else 
+        = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
+        #{event.pusher_name} pushed to 
+        = link_to project_commits_path(event.project, :ref => event.branch_name) do
+          %strong= event.branch_name
+        %span.cgray
+          = time_ago_in_words(event.created_at)
+          ago.
+        - if event.commits.count > 1
+          = link_to compare_project_commits_path(event.project, :from => event.commits.last, :to => event.commits.first) do 
+            Compare #{event.commits.last.id[0..8]}...#{event.commits.first.id[0..8]}
+        - @project = event.project  
+        %ul.unstyled
+          = render event.commits
@@ -54,3 +54,12 @@
     %hr
     .row
       .dashboard_block= render "dashboard/issues_feed"
+
+- unless @events.blank?
+  %div.dashboard_category
+    %h3
+      Activities
+
+    %hr
+    .row
+      .dashboard_block= render "dashboard/events_feed"
 class PostReceive
   @queue = :post_receive
-  def self.perform(reponame, oldrev, newrev, ref)
+  def self.perform(reponame, oldrev, newrev, ref, author_key_id)
     project = Project.find_by_path(reponame)
     return false if project.nil?
-    project.observe_push(oldrev, newrev, ref)
-    project.execute_web_hooks(oldrev, newrev, ref)
+    project.observe_push(oldrev, newrev, ref, author_key_id)
+    project.execute_web_hooks(oldrev, newrev, ref, author_key_id)
   end
 end
@@ -8,5 +8,5 @@ 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
+  env -i redis-cli rpush "resque:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$reponame\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1
 done
@@ -0,0 +1,15 @@
+desc "Rewrite hooks for repos"
+task :update_hooks => :environment  do
+  puts "Starting Projects"
+  Project.find_each(:batch_size => 100) do |project|
+    begin 
+      if project.commit
+        project.repository.write_hooks 
+        print ".".green
+      end
+    rescue Exception => e
+      print e.message.red
+    end
+  end
+  puts "\nDone with projects"
+end
@@ -0,0 +1 @@
+bundle exec rake environment resque:work QUEUE=* VVERBOSE=1
	@@ -30,6 +30,7 @@ gem "charlock_holmes"		@@ -30,6 +30,7 @@ gem "charlock_holmes"
30	gem "foreman"	30	gem "foreman"
31	gem "omniauth-ldap"	31	gem "omniauth-ldap"
32	gem 'bootstrap-sass', "1.4.4"	32	gem 'bootstrap-sass', "1.4.4"
		33	+gem "colored"
33		34
34	group :assets do	35	group :assets do
35	gem "sass-rails", "3.2.3"	36	gem "sass-rails", "3.2.3"
	@@ -88,6 +88,7 @@ GEM		@@ -88,6 +88,7 @@ GEM
88	coffee-script-source	88	coffee-script-source
89	execjs	89	execjs
90	coffee-script-source (1.2.0)	90	coffee-script-source (1.2.0)
		91	+ colored (1.2)
91	crack (0.3.1)	92	crack (0.3.1)
92	daemons (1.1.8)	93	daemons (1.1.8)
93	database_cleaner (0.7.1)	94	database_cleaner (0.7.1)
	@@ -296,6 +297,7 @@ DEPENDENCIES		@@ -296,6 +297,7 @@ DEPENDENCIES
296	carrierwave	297	carrierwave
297	charlock_holmes	298	charlock_holmes
298	coffee-rails (= 3.2.1)	299	coffee-rails (= 3.2.1)
		300	+ colored
299	database_cleaner	301	database_cleaner
300	devise	302	devise
301	drapper	303	drapper
	@@ -626,3 +626,9 @@ p.time {		@@ -626,3 +626,9 @@ p.time {
626	}	626	}
627	}	627	}
628	}	628	}
		629	+
		630	+.event_feed {
		631	+ ul {
		632	+ margin-left:50px;
		633	+ }
		634	+}
	@@ -11,6 +11,8 @@ class Event < ActiveRecord::Base		@@ -11,6 +11,8 @@ class Event < ActiveRecord::Base
11		11
12	serialize :data	12	serialize :data
13		13
		14	+ scope :recent, order("created_at DESC")
		15	+
14	def self.determine_action(record)	16	def self.determine_action(record)
15	if [Issue, MergeRequest].include? record.class	17	if [Issue, MergeRequest].include? record.class
16	Event::Created	18	Event::Created
	@@ -18,6 +20,38 @@ class Event < ActiveRecord::Base		@@ -18,6 +20,38 @@ class Event < ActiveRecord::Base
18	Event::Commented	20	Event::Commented
19	end	21	end
20	end	22	end
		23	+
		24	+ def push?
		25	+ action == self.class::Pushed
		26	+ end
		27	+
		28	+ def new_branch?
		29	+ data[:before] =~ /^00000/
		30	+ end
		31	+
		32	+ def commit_from
		33	+ data[:before]
		34	+ end
		35	+
		36	+ def commit_to
		37	+ data[:after]
		38	+ end
		39	+
		40	+ def branch_name
		41	+ @branch_name \|\|= data[:ref].gsub("refs/heads/", "")
		42	+ end
		43	+
		44	+ def pusher
		45	+ User.find_by_id(data[:user_id])
		46	+ end
		47	+
		48	+ def commits
		49	+ @commits \|\|= data[:commits].map do \|commit\|
		50	+ project.commit(commit[:id])
		51	+ end
		52	+ end
		53	+
		54	+ delegate :id, :name, :email, :to => :pusher, :prefix => true, :allow_nil => true
21	end	55	end
22	# == Schema Information	56	# == Schema Information
23	#	57	#
	@@ -14,6 +14,7 @@ class Key < ActiveRecord::Base		@@ -14,6 +14,7 @@ class Key < ActiveRecord::Base
14	before_save :set_identifier	14	before_save :set_identifier
15	after_save :update_repository	15	after_save :update_repository
16	after_destroy :repository_delete_key	16	after_destroy :repository_delete_key
		17	+ delegate :id, :name, :email, :to => :user, :prefix => true
17		18
18	def set_identifier	19	def set_identifier
19	if is_deploy_key	20	if is_deploy_key
	@@ -16,7 +16,7 @@ class UsersProject < ActiveRecord::Base		@@ -16,7 +16,7 @@ class UsersProject < ActiveRecord::Base
16	validates_presence_of :user_id	16	validates_presence_of :user_id
17	validates_presence_of :project_id	17	validates_presence_of :project_id
18		18
19	- delegate :name, :email, :to => :user, :prefix => true	19	+ delegate :id, :name, :email, :to => :user, :prefix => true
20		20
21	def self.bulk_import(project, user_ids, project_access, repo_access)	21	def self.bulk_import(project, user_ids, project_access, repo_access)
22	UsersProject.transaction do	22	UsersProject.transaction do
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+- @events.each do \|event\|
	2	+ .wll.event_feed
	3	+ - if event.push?
	4	+ - if event.new_branch?
	5	+ User pushed new branch
	6	+ - else
	7	+ = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
	8	+ #{event.pusher_name} pushed to
	9	+ = link_to project_commits_path(event.project, :ref => event.branch_name) do
	10	+ %strong= event.branch_name
	11	+ %span.cgray
	12	+ = time_ago_in_words(event.created_at)
	13	+ ago.
	14	+ - if event.commits.count > 1
	15	+ = link_to compare_project_commits_path(event.project, :from => event.commits.last, :to => event.commits.first) do
	16	+ Compare #{event.commits.last.id[0..8]}...#{event.commits.first.id[0..8]}
	17	+ - @project = event.project
	18	+ %ul.unstyled
	19	+ = render event.commits
	@@ -54,3 +54,12 @@		@@ -54,3 +54,12 @@
54	%hr	54	%hr
55	.row	55	.row
56	.dashboard_block= render "dashboard/issues_feed"	56	.dashboard_block= render "dashboard/issues_feed"
		57	+
		58	+- unless @events.blank?
		59	+ %div.dashboard_category
		60	+ %h3
		61	+ Activities
		62	+
		63	+ %hr
		64	+ .row
		65	+ .dashboard_block= render "dashboard/events_feed"
	@@ -8,5 +8,5 @@ do		@@ -8,5 +8,5 @@ do
8	# For every branch or tag that was pushed, create a Resque job in redis.	8	# For every branch or tag that was pushed, create a Resque job in redis.
9	pwd=`pwd`	9	pwd=`pwd`
10	reponame=`basename "$pwd" \| cut -d. -f1`	10	reponame=`basename "$pwd" \| cut -d. -f1`
11	- env -i redis-cli rpush "resque:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$reponame\",\"$oldrev\",\"$newrev\",\"$ref\"]}" > /dev/null 2>&1	11	+ env -i redis-cli rpush "resque:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$reponame\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1
12	done	12	done
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+desc "Rewrite hooks for repos"
	2	+task :update_hooks => :environment do
	3	+ puts "Starting Projects"
	4	+ Project.find_each(:batch_size => 100) do \|project\|
	5	+ begin
	6	+ if project.commit
	7	+ project.repository.write_hooks
	8	+ print ".".green
	9	+ end
	10	+ rescue Exception => e
	11	+ print e.message.red
	12	+ end
	13	+ end
	14	+ puts "\nDone with projects"
	15	+end