Merge pull request #165 from linc01n/fix-rubocop-octal

Fix rubocop offenses
bflad · Jul 1, 2016 · 92e946f · 92e946f
2 parents 8e59bf1 + c93ad79
commit 92e946f
Show file tree

Hide file tree

Showing 38 changed files with 40 additions and 2 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -19,3 +19,5 @@ LineLength:
   Enabled: false
 MethodLength:
   Max: 30
+Style/NumericLiteralPrefix:
+  Enabled: false
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ bundler_args: --without integration
 cache: bundler
 sudo: false
 rvm:
-  - 2.3.0
+  - 2.3.1
 before_script:
   - bundle exec berks install
 script:

diff --git a/Berksfile b/Berksfile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://supermarket.chef.io'
 
 metadata

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 gem 'rake'
@@ -9,7 +10,7 @@ end
 group :test do
   gem 'chefspec', '~> 4.0'
   gem 'foodcritic', '~> 4.0'
-  gem 'rubocop', '~> 0.23'
+  gem 'rubocop', '~> 0.41'
 end
 
 group :integration do

diff --git a/Guardfile b/Guardfile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 

diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,5 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
 
 # Style tests. Rubocop and Foodcritic
 namespace :style do

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 set['build-essential']['compile_time'] = true
 
 default['stash']['version']      = '4.6.2'

diff --git a/libraries/helper.rb b/libraries/helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Cookbook module
 module Stash
   # Helper module

diff --git a/libraries/stash.rb b/libraries/stash.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Stash
   # Stash::Library module
   module Library

diff --git a/metadata.rb b/metadata.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 name 'stash'
 maintainer 'Brian Flad'
 maintainer_email '[email protected]'

diff --git a/providers/deploy.rb b/providers/deploy.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 action :deploy do
   g = git new_resource.destination do
     repository "ssh://git@#{node['stash']['ssh']['hostname']}:#{node['stash']['ssh']['port']}/#{new_resource.project}/#{new_resource.repository}.git"

diff --git a/providers/deploy_key.rb b/providers/deploy_key.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 action :create do
   key_path = "#{node['stash']['install_path']}/#{new_resource.alias}_ssh_key.pem"
   wrapper_path = "#{node['stash']['install_path']}/#{new_resource.alias}_ssh_wrapper.sh"

diff --git a/providers/hook.rb b/providers/hook.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 include Stash::Helper
 
 def whyrun_supported?

diff --git a/providers/repo.rb b/providers/repo.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 include Stash::Helper
 
 def whyrun_supported?

diff --git a/recipes/apache2.rb b/recipes/apache2.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   node.set['apache']['listen_ports'] = node['apache']['listen_ports'] + [node['stash']['apache2']['port']] unless node['apache']['listen_ports'].include?(node['stash']['apache2']['port'])
   node.set['apache']['listen_ports'] = node['apache']['listen_ports'] + [node['stash']['apache2']['ssl']['port']] unless node['apache']['listen_ports'].include?(node['stash']['apache2']['ssl']['port'])

diff --git a/recipes/backup_client.rb b/recipes/backup_client.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 handle_old_stash_attributes!
 
 settings = merge_stash_settings

diff --git a/recipes/backup_client_cron.rb b/recipes/backup_client_cron.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 handle_old_stash_attributes!
 
 Chef::Log.warn <<-EOH

diff --git a/recipes/backup_diy.rb b/recipes/backup_diy.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 handle_old_stash_attributes!
 
 settings = merge_stash_settings

diff --git a/recipes/configuration.rb b/recipes/configuration.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 settings = merge_stash_settings
 stash_version = Chef::Version.new(node['stash']['version'])
 

diff --git a/recipes/database.rb b/recipes/database.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 settings = merge_stash_settings
 
 database_connection = {

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 platform = 'windows' if node['platform_family'] == 'windows'
 platform ||= 'linux'
 settings = merge_stash_settings

diff --git a/recipes/linux_standalone.rb b/recipes/linux_standalone.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 settings = merge_stash_settings
 
 directory File.dirname(node['stash']['home_path']) do

diff --git a/recipes/service_init.rb b/recipes/service_init.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 template "/etc/init.d/#{node['stash']['product']}" do
   if node['stash']['product'] == 'stash'
     source 'stash.init.erb'

diff --git a/recipes/tomcat_configuration.rb b/recipes/tomcat_configuration.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 stash_version = Chef::Version.new(node['stash']['version'])
 server_xml_path = "#{node['stash']['install_path']}/stash/conf/server.xml"
 

diff --git a/resources/deploy.rb b/resources/deploy.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 actions :deploy
 
 attribute :destination, :kind_of => String, :name_attribute => true

diff --git a/resources/deploy_key.rb b/resources/deploy_key.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 actions :create
 
 attribute :alias, :kind_of => String, :name_attribute => true

diff --git a/resources/hook.rb b/resources/hook.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 actions :enable, :configure, :disable
 default_action :configure
 

diff --git a/resources/repo.rb b/resources/repo.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 actions :create, :delete
 default_action :create
 

diff --git a/spec/apache2_spec.rb b/spec/apache2_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::apache2' do

diff --git a/spec/backup_client_cron_spec.rb b/spec/backup_client_cron_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::backup_client_cron' do

diff --git a/spec/backup_client_spec.rb b/spec/backup_client_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::backup_client' do

diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::configuration' do

diff --git a/spec/database_spec.rb b/spec/database_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::database' do

diff --git a/spec/default_spec.rb b/spec/default_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::default' do

diff --git a/spec/linux_standalone_spec.rb b/spec/linux_standalone_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::linux_standalone' do

diff --git a/spec/service_init_spec.rb b/spec/service_init_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::service_init' do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chefspec'
 require 'chefspec/berkshelf'
 

diff --git a/spec/tomcat_configuration_spec.rb b/spec/tomcat_configuration_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'stash::tomcat_configuration' do