Rubocop: space after comma,consistently

Laust Rud Jacobsen
1 parent af87b10a
Showing 20 changed files with 32 additions and 37 deletions Show diff stats
.rubocop_todo.yml
app/controllers/apps_controller.rb
app/controllers/users_controller.rb
app/decorators/issue_tracker_type_decorator.rb
app/helpers/application_helper.rb
app/helpers/form_helper.rb
app/mailers/mailer.rb
app/models/deploy.rb
app/models/issue_tracker.rb
app/models/notice.rb
app/models/problem.rb
db/seeds.rb
spec/controllers/notices_controller_spec.rb
spec/decorators/app_decorator_spec.rb
spec/models/app_spec.rb
spec/models/error_report_spec.rb
spec/models/notice_observer_spec.rb
spec/requests/notices_controller_spec.rb
spec/views/apps/edit.html.haml_spec.rb
spec/views/apps/new.html.haml_spec.rb
@@ -311,11 +311,6 @@ Style/SingleSpaceBeforeFirstArg:
     - 'spec/fabricators/notice_fabricator.rb'
     - 'spec/fabricators/user_fabricator.rb'
-# Offense count: 43
-# Cop supports --auto-correct.
-Style/SpaceAfterComma:
-  Enabled: false
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -116,7 +116,7 @@ protected
       # Sanitize negative values, split on comma,
       # strip, parse as integer, remove all '0's.
       # If empty, set as default and show an error message.
-      email_at_notices = val.gsub(/-\d+/,"").split(",").map{|v| v.strip.to_i }.reject{|v| v == 0}
+      email_at_notices = val.gsub(/-\d+/, "").split(",").map{|v| v.strip.to_i }.reject{|v| v == 0}
       if email_at_notices.any?
         params[:app][:email_at_notices] = email_at_notices
       else
@@ -131,7 +131,7 @@ protected
       # Sanitize negative values, split on comma,
       # strip, parse as integer, remove all '0's.
       # If empty, set as default and show an error message.
-      notify_at_notices = val.gsub(/-\d+/,"").split(",").map{|v| v.strip.to_i }
+      notify_at_notices = val.gsub(/-\d+/, "").split(",").map{|v| v.strip.to_i }
       if notify_at_notices.any?
         params[:app][:notification_service_attributes][:notify_at_notices] = notify_at_notices
       else
@@ -63,7 +63,7 @@ protected
   end
   def user_permit_params
-    @user_permit_params ||= [:name,:username, :email, :github_login, :per_page, :time_zone]
+    @user_permit_params ||= [:name, :username, :email, :github_login, :per_page, :time_zone]
     @user_permit_params << :admin if current_user.admin? && current_user.id != params[:id]
     @user_permit_params |= [:password, :password_confirmation] if user_password_params.values.all?{|pa| !pa.blank? }
     @user_permit_params
@@ -6,7 +6,7 @@ class IssueTrackerTypeDecorator &lt; Draper::Decorator
   def icons
     return unless object.icons
-    object.icons.reduce({}) do |c, (k,v)|
+    object.icons.reduce({}) do |c, (k, v)|
       c[k] = "data:#{v[0]};base64,#{Base64.encode64(v[1])}"; c
     end
   end
@@ -5,7 +5,7 @@ module ApplicationHelper
   def generate_problem_ical(notices)
     RiCal.Calendar do |cal|
-      notices.each_with_index do |notice,idx|
+      notices.each_with_index do |notice, idx|
         cal.event do |event|
           event.summary     = "#{idx+1} #{notice.message}"
           event.description = notice.url if notice.url
@@ -21,7 +21,7 @@ module ApplicationHelper
   def generate_ical(deploys)
     RiCal.Calendar { |cal|
-      deploys.each_with_index do |deploy,idx|
+      deploys.each_with_index do |deploy, idx|
         cal.event do |event|
           event.summary     = "#{idx+1} #{deploy.repository}"
           event.description = deploy.revision.to_s
@@ -11,6 +11,6 @@ module FormHelper
   end
   def label_for_attr(builder, field)
-    (builder.object_name + field).gsub(/[\[\]]/,'_').squeeze('_')
+    (builder.object_name + field).gsub(/[\[\]]/, '_').squeeze('_')
   end
 end
@@ -59,6 +59,6 @@ class Mailer &lt; ActionMailer::Base
   end
   private def errbit_headers(header)
-    header.each { |key,value| headers["X-Errbit-#{key}"] = value.to_s }
+    header.each { |key, value| headers["X-Errbit-#{key}"] = value.to_s }
   end
 end
@@ -23,7 +23,7 @@ class Deploy
   end
   def short_revision
-    revision.to_s[0,7]
+    revision.to_s[0, 7]
   end
 protected
@@ -27,7 +27,7 @@ class IssueTracker
   # Allow the tracker to validate its own params
   def validate_tracker
-    (tracker.errors || {}).each do |k,v|
+    (tracker.errors || {}).each do |k, v|
       errors.add k, v
     end
   end
@@ -132,15 +132,15 @@ protected
   def sanitize
     [:server_environment, :request, :notifier].each do |h|
-      send("#{h}=",sanitize_hash(send(h)))
+      send("#{h}=", sanitize_hash(send(h)))
     end
   end
   def sanitize_hash(hash)
     hash.recurse do |recurse_hash|
-      recurse_hash.inject({}) do |h,(k,v)|
+      recurse_hash.inject({}) do |h, (k, v)|
         if k.is_a?(String)
-          h[k.gsub(/\./,'&#46;').gsub(/^\$/,'&#36;')] = v
+          h[k.gsub(/\./, '&#46;').gsub(/^\$/, '&#36;')] = v
         else
           h[k] = v
         end
@@ -118,7 +118,7 @@ class Problem
         'notices_count' => notices_count.to_i > 1 ? notices_count - 1 : 0
       )
-      CACHED_NOTICE_ATTRIBUTES.each do |k,v|
+      CACHED_NOTICE_ATTRIBUTES.each do |k, v|
         digest = Digest::MD5.hexdigest(notice.send(v))
         field = "#{k}.#{digest}"
@@ -132,7 +132,7 @@ class Problem
   end
   def recache
-    CACHED_NOTICE_ATTRIBUTES.each do |k,v|
+    CACHED_NOTICE_ATTRIBUTES.each do |k, v|
       # clear all cached attributes
       send("#{k}=", {})
@@ -6,7 +6,7 @@ puts &quot;-------------------------------&quot;
 # Create an initial Admin User
 admin_username = "errbit"
 admin_email = "errbit@#{Errbit::Config.host}"
-admin_pass  = SecureRandom.urlsafe_base64(12)[0,12]
+admin_pass  = SecureRandom.urlsafe_base64(12)[0, 12]
 puts "Creating an initial admin user:"
 puts "-- username: #{admin_username}" if Errbit::Config.user_has_username
@@ -2,7 +2,7 @@ describe NoticesController, type: &#39;controller&#39; do
   it_requires_authentication :for => { :locate => :get }
   let(:notice) { Fabricate(:notice) }
-  let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read }
+  let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read }
   let(:app) { Fabricate(:app) }
   let(:error_report) { double(:valid? => true, :generate_notice! => true, :notice => notice, :should_keep? => true) }
 describe AppDecorator do
   describe "#email_at_notices" do
     it 'return the list separate by comma' do
-      expect(AppDecorator.new(double(:email_at_notices => [2,3])).email_at_notices).to eql '2, 3'
+      expect(AppDecorator.new(double(:email_at_notices => [2, 3])).email_at_notices).to eql '2, 3'
     end
   end
@@ -188,7 +188,7 @@ describe App, type: &#39;model&#39; do
       expect(Err.where(conditions).first).to be_nil
       expect {
         app.find_or_create_err!(conditions)
-      }.to change(Problem,:count).by(1)
+      }.to change(Problem, :count).by(1)
     end
     context "without error_class" do
@@ -201,7 +201,7 @@ describe App, type: &#39;model&#39; do
         expect(Err.where(conditions).first).to be_nil
         expect {
           app.find_or_create_err!(conditions)
-        }.to change(Problem,:count).by(1)
+        }.to change(Problem, :count).by(1)
       end
     end
   end
@@ -18,7 +18,7 @@ end
 describe ErrorReport do
   let(:xml){
-    Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
+    Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read
   }
   let(:error_report) { ErrorReport.new(xml) }
@@ -53,7 +53,7 @@ describe ErrorReport do
     context "with a minimal notice" do
       let(:xml){
-        Rails.root.join('spec','fixtures','minimal_test_notice.xml').read
+        Rails.root.join('spec', 'fixtures', 'minimal_test_notice.xml').read
       }
       it 'save a notice' do
@@ -236,7 +236,7 @@ describe ErrorReport do
     context "with xml without request section" do
       let(:xml){
-        Rails.root.join('spec','fixtures','hoptoad_test_notice_without_request_section.xml').read
+        Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice_without_request_section.xml').read
       }
       it "save a notice" do
         expect {
@@ -249,7 +249,7 @@ describe ErrorReport do
     context "with xml with only a single line of backtrace" do
       let(:xml){
-        Rails.root.join('spec','fixtures','hoptoad_test_notice_with_one_line_of_backtrace.xml').read
+        Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice_with_one_line_of_backtrace.xml').read
       }
       it "save a notice" do
         expect {
@@ -78,7 +78,7 @@ describe &quot;Callback on Notice&quot;, type: &#39;model&#39; do
       Fabricate(
         :app_with_watcher,
         notify_on_errs: true,
-        email_at_notices: [1,100]
+        email_at_notices: [1, 100]
       )
     end
     let(:notice_attrs) { notice_attrs_for.call(app.api_key) }
@@ -161,7 +161,7 @@ describe &quot;Callback on Notice&quot;, type: &#39;model&#39; do
   describe "should send a notification at desired intervals" do
     let(:notification_service) do
-      Fabricate(:campfire_notification_service, notify_at_notices: [1,2])
+      Fabricate(:campfire_notification_service, notify_at_notices: [1, 2])
     end
     let(:app) { Fabricate(:app, notification_service: notification_service) }
     let(:notice_attrs) { notice_attrs_for.call(app.api_key) }
@@ -3,7 +3,7 @@ describe &quot;Notices management&quot;, type: &#39;request&#39; do
   describe "create a new notice" do
     context "with valide notice" do
-      let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read }
+      let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read }
       it 'save a new notice' do
         expect {
           post '/notifier_api/v2/notices', :data => xml
@@ -15,7 +15,7 @@ describe &quot;Notices management&quot;, type: &#39;request&#39; do
     end
     context "with notice with empty backtrace" do
-      let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice_without_line_of_backtrace.xml').read }
+      let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice_without_line_of_backtrace.xml').read }
       it 'save a new notice' do
         expect {
           post '/notifier_api/v2/notices', :data => xml
@@ -28,7 +28,7 @@ describe &quot;Notices management&quot;, type: &#39;request&#39; do
     context "with notice with bad api_key" do
       let(:errbit_app) { Fabricate(:app) }
-      let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read }
+      let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read }
       it 'not save a new notice and return 422' do
         expect {
           post '/notifier_api/v2/notices', :data => xml
@@ -39,7 +39,7 @@ describe &quot;Notices management&quot;, type: &#39;request&#39; do
     end
     context "with GET request" do
-      let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read }
+      let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read }
       it 'save a new notice' do
         expect {
           get '/notifier_api/v2/notices', :data => xml
@@ -27,7 +27,7 @@ describe &quot;apps/edit.html.haml&quot;, type: &#39;view&#39; do
   context "with unvalid app" do
     let(:app) {
       app = stub_model(App)
-      app.errors.add(:base,'You must specify your')
+      app.errors.add(:base, 'You must specify your')
       app
     }
@@ -23,7 +23,7 @@ describe &quot;apps/new.html.haml&quot;, type: &#39;view&#39; do
   context "with unvalid app" do
     let(:app) {
       app = stub_model(App)
-      app.errors.add(:base,'You must specify your')
+      app.errors.add(:base, 'You must specify your')
       app
     }
	@@ -116,7 +116,7 @@ protected		@@ -116,7 +116,7 @@ protected
116	# Sanitize negative values, split on comma,	116	# Sanitize negative values, split on comma,
117	# strip, parse as integer, remove all '0's.	117	# strip, parse as integer, remove all '0's.
118	# If empty, set as default and show an error message.	118	# If empty, set as default and show an error message.
119	- email_at_notices = val.gsub(/-\d+/,"").split(",").map{\|v\| v.strip.to_i }.reject{\|v\| v == 0}	119	+ email_at_notices = val.gsub(/-\d+/, "").split(",").map{\|v\| v.strip.to_i }.reject{\|v\| v == 0}
120	if email_at_notices.any?	120	if email_at_notices.any?
121	params[:app][:email_at_notices] = email_at_notices	121	params[:app][:email_at_notices] = email_at_notices
122	else	122	else
	@@ -131,7 +131,7 @@ protected		@@ -131,7 +131,7 @@ protected
131	# Sanitize negative values, split on comma,	131	# Sanitize negative values, split on comma,
132	# strip, parse as integer, remove all '0's.	132	# strip, parse as integer, remove all '0's.
133	# If empty, set as default and show an error message.	133	# If empty, set as default and show an error message.
134	- notify_at_notices = val.gsub(/-\d+/,"").split(",").map{\|v\| v.strip.to_i }	134	+ notify_at_notices = val.gsub(/-\d+/, "").split(",").map{\|v\| v.strip.to_i }
135	if notify_at_notices.any?	135	if notify_at_notices.any?
136	params[:app][:notification_service_attributes][:notify_at_notices] = notify_at_notices	136	params[:app][:notification_service_attributes][:notify_at_notices] = notify_at_notices
137	else	137	else
	@@ -63,7 +63,7 @@ protected		@@ -63,7 +63,7 @@ protected
63	end	63	end
64		64
65	def user_permit_params	65	def user_permit_params
66	- @user_permit_params \|\|= [:name,:username, :email, :github_login, :per_page, :time_zone]	66	+ @user_permit_params \|\|= [:name, :username, :email, :github_login, :per_page, :time_zone]
67	@user_permit_params << :admin if current_user.admin? && current_user.id != params[:id]	67	@user_permit_params << :admin if current_user.admin? && current_user.id != params[:id]
68	@user_permit_params \|= [:password, :password_confirmation] if user_password_params.values.all?{\|pa\| !pa.blank? }	68	@user_permit_params \|= [:password, :password_confirmation] if user_password_params.values.all?{\|pa\| !pa.blank? }
69	@user_permit_params	69	@user_permit_params
	@@ -6,7 +6,7 @@ class IssueTrackerTypeDecorator < Draper::Decorator		@@ -6,7 +6,7 @@ class IssueTrackerTypeDecorator < Draper::Decorator
6	def icons	6	def icons
7	return unless object.icons	7	return unless object.icons
8		8
9	- object.icons.reduce({}) do \|c, (k,v)\|	9	+ object.icons.reduce({}) do \|c, (k, v)\|
10	c[k] = "data:#{v[0]};base64,#{Base64.encode64(v[1])}"; c	10	c[k] = "data:#{v[0]};base64,#{Base64.encode64(v[1])}"; c
11	end	11	end
12	end	12	end
	@@ -5,7 +5,7 @@ module ApplicationHelper		@@ -5,7 +5,7 @@ module ApplicationHelper
5		5
6	def generate_problem_ical(notices)	6	def generate_problem_ical(notices)
7	RiCal.Calendar do \|cal\|	7	RiCal.Calendar do \|cal\|
8	- notices.each_with_index do \|notice,idx\|	8	+ notices.each_with_index do \|notice, idx\|
9	cal.event do \|event\|	9	cal.event do \|event\|
10	event.summary = "#{idx+1} #{notice.message}"	10	event.summary = "#{idx+1} #{notice.message}"
11	event.description = notice.url if notice.url	11	event.description = notice.url if notice.url
	@@ -21,7 +21,7 @@ module ApplicationHelper		@@ -21,7 +21,7 @@ module ApplicationHelper
21		21
22	def generate_ical(deploys)	22	def generate_ical(deploys)
23	RiCal.Calendar { \|cal\|	23	RiCal.Calendar { \|cal\|
24	- deploys.each_with_index do \|deploy,idx\|	24	+ deploys.each_with_index do \|deploy, idx\|
25	cal.event do \|event\|	25	cal.event do \|event\|
26	event.summary = "#{idx+1} #{deploy.repository}"	26	event.summary = "#{idx+1} #{deploy.repository}"
27	event.description = deploy.revision.to_s	27	event.description = deploy.revision.to_s
	@@ -11,6 +11,6 @@ module FormHelper		@@ -11,6 +11,6 @@ module FormHelper
11	end	11	end
12		12
13	def label_for_attr(builder, field)	13	def label_for_attr(builder, field)
14	- (builder.object_name + field).gsub(/[\[\]]/,'_').squeeze('_')	14	+ (builder.object_name + field).gsub(/[\[\]]/, '_').squeeze('_')
15	end	15	end
16	end	16	end
	@@ -59,6 +59,6 @@ class Mailer < ActionMailer::Base		@@ -59,6 +59,6 @@ class Mailer < ActionMailer::Base
59	end	59	end
60		60
61	private def errbit_headers(header)	61	private def errbit_headers(header)
62	- header.each { \|key,value\| headers["X-Errbit-#{key}"] = value.to_s }	62	+ header.each { \|key, value\| headers["X-Errbit-#{key}"] = value.to_s }
63	end	63	end
64	end	64	end
	@@ -23,7 +23,7 @@ class Deploy		@@ -23,7 +23,7 @@ class Deploy
23	end	23	end
24		24
25	def short_revision	25	def short_revision
26	- revision.to_s[0,7]	26	+ revision.to_s[0, 7]
27	end	27	end
28		28
29	protected	29	protected
	@@ -27,7 +27,7 @@ class IssueTracker		@@ -27,7 +27,7 @@ class IssueTracker
27		27
28	# Allow the tracker to validate its own params	28	# Allow the tracker to validate its own params
29	def validate_tracker	29	def validate_tracker
30	- (tracker.errors \|\| {}).each do \|k,v\|	30	+ (tracker.errors \|\| {}).each do \|k, v\|
31	errors.add k, v	31	errors.add k, v
32	end	32	end
33	end	33	end
	@@ -132,15 +132,15 @@ protected		@@ -132,15 +132,15 @@ protected
132		132
133	def sanitize	133	def sanitize
134	[:server_environment, :request, :notifier].each do \|h\|	134	[:server_environment, :request, :notifier].each do \|h\|
135	- send("#{h}=",sanitize_hash(send(h)))	135	+ send("#{h}=", sanitize_hash(send(h)))
136	end	136	end
137	end	137	end
138		138
139	def sanitize_hash(hash)	139	def sanitize_hash(hash)
140	hash.recurse do \|recurse_hash\|	140	hash.recurse do \|recurse_hash\|
141	- recurse_hash.inject({}) do \|h,(k,v)\|	141	+ recurse_hash.inject({}) do \|h, (k, v)\|
142	if k.is_a?(String)	142	if k.is_a?(String)
143	- h[k.gsub(/\./,'.').gsub(/^\$/,'$')] = v	143	+ h[k.gsub(/\./, '.').gsub(/^\$/, '$')] = v
144	else	144	else
145	h[k] = v	145	h[k] = v
146	end	146	end
	@@ -118,7 +118,7 @@ class Problem		@@ -118,7 +118,7 @@ class Problem
118	'notices_count' => notices_count.to_i > 1 ? notices_count - 1 : 0	118	'notices_count' => notices_count.to_i > 1 ? notices_count - 1 : 0
119	)	119	)
120		120
121	- CACHED_NOTICE_ATTRIBUTES.each do \|k,v\|	121	+ CACHED_NOTICE_ATTRIBUTES.each do \|k, v\|
122	digest = Digest::MD5.hexdigest(notice.send(v))	122	digest = Digest::MD5.hexdigest(notice.send(v))
123	field = "#{k}.#{digest}"	123	field = "#{k}.#{digest}"
124		124
	@@ -132,7 +132,7 @@ class Problem		@@ -132,7 +132,7 @@ class Problem
132	end	132	end
133		133
134	def recache	134	def recache
135	- CACHED_NOTICE_ATTRIBUTES.each do \|k,v\|	135	+ CACHED_NOTICE_ATTRIBUTES.each do \|k, v\|
136	# clear all cached attributes	136	# clear all cached attributes
137	send("#{k}=", {})	137	send("#{k}=", {})
138		138