Merge pull request #76 from datasift/feature/rubocop-fixes-octal-numbers

rubocop fixes
MeltwaterArchive · Jun 14, 2017 · 237f253 · 237f253
2 parents 4726431 + 88f75d2
commit 237f253
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/chef/.rubocop.yml b/chef/.rubocop.yml
@@ -1,4 +1,23 @@
 ---
+Metrics/LineLength:
+  Max: 140
+
+# This is disabled until the version of Rubocop in use supports ExcludedMethods,
+# though still may not be very useful on Chef code.
+Metrics/BlockLength:
+  Enabled: false
+
+# Ruby 3.x will introduce frozen strings as the default, and uses a magic
+# comment to enabled this behaviour on Ruby 2.x.
+# https://bugs.ruby-lang.org/issues/8976
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# This is broken in rubocop 0.46.0.
+# https://github.com/bbatsov/rubocop/issues/3709
+Style/GuardClause:
+  Enabled: false
+
 Style/Encoding:
   Enabled: false
 

diff --git a/chef/cookbooks/datasift-stats/recipes/grafana.rb b/chef/cookbooks/datasift-stats/recipes/grafana.rb
@@ -17,7 +17,7 @@
   source 'grafana.ini.erb'
   owner 'grafana'
   group 'grafana'
-  mode 0644
+  mode '0644'
 end
 
 env = { 'HOME' => '/usr/share/grafana' }

diff --git a/chef/cookbooks/datasift-stats/recipes/statsd.rb b/chef/cookbooks/datasift-stats/recipes/statsd.rb
@@ -18,14 +18,14 @@
 directory node['statsd']['config_dir'] do
   owner node['statsd']['user']
   group node['statsd']['group']
-  mode 0755
+  mode '0755'
 end
 
 template "#{node['statsd']['config_dir']}/config.js" do
   source 'config.js.erb'
   owner node['statsd']['user']
   group node['statsd']['group']
-  mode 0644
+  mode '0644'
 
   config_hash = {
     graphitePort: node['statsd']['graphite_port'],

diff --git a/chef/cookbooks/webapp/recipes/default.rb b/chef/cookbooks/webapp/recipes/default.rb
@@ -13,7 +13,7 @@
 template '/etc/nginx/nginx_datasift.conf' do
   user 'root'
   group 'root'
-  mode 0644
+  mode '0644'
   source 'nginx.conf.erb'
 end
 

diff --git a/chef/test/integration/default/serverspec/default_spec.rb b/chef/test/integration/default/serverspec/default_spec.rb
@@ -82,8 +82,7 @@
 
   describe file('/opt/kafka/config/server.properties') do
     its(:content) do
-      should match( \
-        /kafka.metrics.reporters=com.airbnb.kafka.KafkaStatsdMetricsReporter/)
+      should match(/kafka.metrics.reporters=com.airbnb.kafka.KafkaStatsdMetricsReporter/)
     end
     its(:content) do
       should match(/external.kafka.statsd.reporter.enabled=true/)