Merge branch 'master' of https://github.com/unkopro/errbit into unkopro-master

Conflicts: app/controllers/deploys_controller.rb app/models/app.rb

Merge branch 'master' of https://github.com/unkopro/errbit into unkopro-master
Conflicts: app/controllers/deploys_controller.rb app/models/app.rb
Nick Recobra
2 parents b89db9f1 8771d6c2
Showing 11 changed files with 45 additions and 6 deletions Show diff stats
app/controllers/deploys_controller.rb
app/models/app.rb
app/models/deploy.rb
app/models/err.rb
app/models/notice.rb
app/views/apps/_fields.html.haml
app/views/apps/show.html.haml
app/views/deploys/_table.html.haml
spec/controllers/deploys_controller_spec.rb
spec/models/deploy_spec.rb
spec/models/err_spec.rb
 class DeploysController < ApplicationController
+
+  protect_from_forgery :except => :create
  
   skip_before_filter :verify_authenticity_token, :only => :create
   skip_before_filter :authenticate_user!, :only => :create
@@ -11,6 +13,7 @@ class DeploysController &lt; ApplicationController
         :environment  => params[:deploy][:rails_env],
         :repository   => params[:deploy][:scm_repository],
         :revision     => params[:deploy][:scm_revision],
+        :message      => params[:deploy][:message]
       }
     end
  
@@ -5,6 +5,9 @@ class App
   field :name, :type => String
   field :api_key
   field :resolve_errs_on_deploy, :type => Boolean, :default => false
+  field :notify_on_errs, :type => Boolean, :default => true
+  field :notify_on_deploys, :type => Boolean, :default => true
+
   # Some legacy apps may have sting as key instead of BSON::ObjectID
   identity :type => String
   # There seems to be a Mongoid bug making it impossible to use String identity with references_many feature:
@@ -6,6 +6,7 @@ class Deploy
   field :repository
   field :environment
   field :revision
+  field :message
  
   index :created_at, Mongo::DESCENDING
  
@@ -27,7 +28,7 @@ class Deploy
   protected
  
     def should_notify?
-      app.watchers.any?
+      app.notify_on_deploys? && app.watchers.any?
     end
  
     def should_resolve_app_errs?
@@ -12,6 +12,7 @@ class Err
   field :issue_link, :type => String
  
   index :last_notice_at
+  index :app_id
  
   referenced_in :app
   embeds_many :notices
@@ -73,7 +73,7 @@ class Notice
   protected
  
     def should_notify?
-      Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
+      err.app.notify_on_errs? && Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
     end
  
 end
 \ No newline at end of file
@@ -5,9 +5,17 @@
   = f.text_field :name
  
 %div.checkbox
+  = f.check_box :notify_on_errs
+  = f.label :notify_on_errs, 'Notify on errors'
+
+%div.checkbox
   = f.check_box :resolve_errs_on_deploy
   = f.label :resolve_errs_on_deploy, 'Resolve errs on deploy'
-  
+
+%div.checkbox
+  = f.check_box :notify_on_deploys
+  = f.label :notify_on_deploys, 'Notify on deploys'
+
 %fieldset.nested-wrapper
   %legend Watchers
   = f.fields_for :watchers do |w|
@@ -34,6 +34,7 @@
       %tr
         %th When
         %th Who
+        %th Message
         %th Repository
         %th Revision
  
@@ -42,6 +43,7 @@
         %tr
           %td.when #{deploy.created_at.to_s(:micro)}
           %td.who #{deploy.username}
+          %td.message #{deploy.message}
           %td.repository #{deploy.repository}
           %td.revision #{deploy.revision}
   = link_to "All Deploys (#{@app.deploys.count})", app_deploys_path(@app), :class => 'button'
@@ -4,6 +4,7 @@
       %th App
       %th When
       %th Who
+      %th Message
       %th Repository
       %th Revision
   %tbody
@@ -14,5 +15,6 @@
           %span.environment= deploy.environment
         %td.latest #{time_ago_in_words(deploy.created_at)} ago
         %td.who #{deploy.username}
+        %td.message #{deploy.message}
         %td.repository #{deploy.repository}
         %td.revision #{deploy.revision}
@@ -9,7 +9,8 @@ describe DeploysController do
         'local_username' => 'john.doe',
         'scm_repository' => 'git@github.com/jdpace/errbit.git',
         'rails_env'      => 'production',
-        'scm_revision'   => '19d77837eef37902cf5df7e4445c85f392a8d0d5'
+        'scm_revision'   => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
+        'message'        => 'johns first deploy'
       }
       @app = Factory(:app_with_watcher, :api_key => 'APIKEY')
     end
@@ -26,7 +27,9 @@ describe DeploysController do
           :username     => 'john.doe',
           :environment  => 'production',
           :repository   => 'git@github.com/jdpace/errbit.git',
-          :revision     => '19d77837eef37902cf5df7e4445c85f392a8d0d5'
+          :revision     => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
+          :message      => 'johns first deploy'
+
         }).and_return(Factory(:deploy))
       post :create, :deploy => @params, :api_key => 'APIKEY'
     end
@@ -42,6 +42,13 @@ describe Deploy do
         @staging_errs.all?{|err| err.reload.resolved?}.should == false
       end
     end
+
+    context 'when the app has deploy notifications set to false' do
+      it 'should not send an email notification' do
+        Mailer.should_not_receive(:deploy_notification)
+        Factory(:deploy, :app => Factory(:app_with_watcher, :notify_on_deploys => false))
+      end
+    end
   end
  
 end
@@ -120,5 +120,14 @@ describe Err do
       end
     end
   end
-  
+
+  context 'being created' do
+    context 'when the app has err notifications set to false' do
+      it 'should not send an email notification' do
+        app = Factory(:app_with_watcher, :notify_on_errs => false)
+        Mailer.should_not_receive(:err_notification)
+        Factory(:err, :app => app)
+      end
+    end
+  end
 end
 \ No newline at end of file
1	1	class DeploysController < ApplicationController
	2	+
	3	+ protect_from_forgery :except => :create
2	4
3	5	skip_before_filter :verify_authenticity_token, :only => :create
4	6	skip_before_filter :authenticate_user!, :only => :create
...	...	@@ -11,6 +13,7 @@ class DeploysController < ApplicationController
11	13	:environment => params[:deploy][:rails_env],
12	14	:repository => params[:deploy][:scm_repository],
13	15	:revision => params[:deploy][:scm_revision],
	16	+ :message => params[:deploy][:message]
14	17	}
15	18	end
16	19
...	...
...	...	@@ -5,6 +5,9 @@ class App
5	5	field :name, :type => String
6	6	field :api_key
7	7	field :resolve_errs_on_deploy, :type => Boolean, :default => false
	8	+ field :notify_on_errs, :type => Boolean, :default => true
	9	+ field :notify_on_deploys, :type => Boolean, :default => true
	10	+
8	11	# Some legacy apps may have sting as key instead of BSON::ObjectID
9	12	identity :type => String
10	13	# There seems to be a Mongoid bug making it impossible to use String identity with references_many feature:
...	...
...	...	@@ -6,6 +6,7 @@ class Deploy
6	6	field :repository
7	7	field :environment
8	8	field :revision
	9	+ field :message
9	10
10	11	index :created_at, Mongo::DESCENDING
11	12
...	...	@@ -27,7 +28,7 @@ class Deploy
27	28	protected
28	29
29	30	def should_notify?
30		- app.watchers.any?
	31	+ app.notify_on_deploys? && app.watchers.any?
31	32	end
32	33
33	34	def should_resolve_app_errs?
...	...
...	...	@@ -12,6 +12,7 @@ class Err
12	12	field :issue_link, :type => String
13	13
14	14	index :last_notice_at
	15	+ index :app_id
15	16
16	17	referenced_in :app
17	18	embeds_many :notices
...	...
...	...	@@ -73,7 +73,7 @@ class Notice
73	73	protected
74	74
75	75	def should_notify?
76		- Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
	76	+ err.app.notify_on_errs? && Errbit::Config.email_at_notices.include?(err.notices.count) && err.app.watchers.any?
77	77	end
78	78
79	79	end
80	80	\ No newline at end of file
...	...
...	...	@@ -5,9 +5,17 @@
5	5	= f.text_field :name
6	6
7	7	%div.checkbox
	8	+ = f.check_box :notify_on_errs
	9	+ = f.label :notify_on_errs, 'Notify on errors'
	10	+
	11	+%div.checkbox
8	12	= f.check_box :resolve_errs_on_deploy
9	13	= f.label :resolve_errs_on_deploy, 'Resolve errs on deploy'
10		-
	14	+
	15	+%div.checkbox
	16	+ = f.check_box :notify_on_deploys
	17	+ = f.label :notify_on_deploys, 'Notify on deploys'
	18	+
11	19	%fieldset.nested-wrapper
12	20	%legend Watchers
13	21	= f.fields_for :watchers do \|w\|
...	...
...	...	@@ -34,6 +34,7 @@
34	34	%tr
35	35	%th When
36	36	%th Who
	37	+ %th Message
37	38	%th Repository
38	39	%th Revision
39	40
...	...	@@ -42,6 +43,7 @@
42	43	%tr
43	44	%td.when #{deploy.created_at.to_s(:micro)}
44	45	%td.who #{deploy.username}
	46	+ %td.message #{deploy.message}
45	47	%td.repository #{deploy.repository}
46	48	%td.revision #{deploy.revision}
47	49	= link_to "All Deploys (#{@app.deploys.count})", app_deploys_path(@app), :class => 'button'
...	...
...	...	@@ -4,6 +4,7 @@
4	4	%th App
5	5	%th When
6	6	%th Who
	7	+ %th Message
7	8	%th Repository
8	9	%th Revision
9	10	%tbody
...	...	@@ -14,5 +15,6 @@
14	15	%span.environment= deploy.environment
15	16	%td.latest #{time_ago_in_words(deploy.created_at)} ago
16	17	%td.who #{deploy.username}
	18	+ %td.message #{deploy.message}
17	19	%td.repository #{deploy.repository}
18	20	%td.revision #{deploy.revision}
...	...
...	...	@@ -9,7 +9,8 @@ describe DeploysController do
9	9	'local_username' => 'john.doe',
10	10	'scm_repository' => 'git@github.com/jdpace/errbit.git',
11	11	'rails_env' => 'production',
12		- 'scm_revision' => '19d77837eef37902cf5df7e4445c85f392a8d0d5'
	12	+ 'scm_revision' => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
	13	+ 'message' => 'johns first deploy'
13	14	}
14	15	@app = Factory(:app_with_watcher, :api_key => 'APIKEY')
15	16	end
...	...	@@ -26,7 +27,9 @@ describe DeploysController do
26	27	:username => 'john.doe',
27	28	:environment => 'production',
28	29	:repository => 'git@github.com/jdpace/errbit.git',
29		- :revision => '19d77837eef37902cf5df7e4445c85f392a8d0d5'
	30	+ :revision => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
	31	+ :message => 'johns first deploy'
	32	+
30	33	}).and_return(Factory(:deploy))
31	34	post :create, :deploy => @params, :api_key => 'APIKEY'
32	35	end
...	...
...	...	@@ -42,6 +42,13 @@ describe Deploy do
42	42	@staging_errs.all?{\|err\| err.reload.resolved?}.should == false
43	43	end
44	44	end
	45	+
	46	+ context 'when the app has deploy notifications set to false' do
	47	+ it 'should not send an email notification' do
	48	+ Mailer.should_not_receive(:deploy_notification)
	49	+ Factory(:deploy, :app => Factory(:app_with_watcher, :notify_on_deploys => false))
	50	+ end
	51	+ end
45	52	end
46	53
47	54	end
...	...