Skip to content

Commit

Permalink
Enable frozen string literals
Browse files Browse the repository at this point in the history
  • Loading branch information
hartmantis committed Jul 20, 2016
1 parent 907575a commit 8629ee3
Show file tree
Hide file tree
Showing 89 changed files with 128 additions and 39 deletions.
3 changes: 2 additions & 1 deletion Berksfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true

source 'https://supermarket.chef.io'

Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true

source 'https://rubygems.org'

Expand Down
3 changes: 2 additions & 1 deletion Guardfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true

guard :rspec, all_on_start: true, notification: false do
watch(%r{^spec/.+_spec\.rb$})
Expand Down
3 changes: 2 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true

require 'rubygems'
require 'bundler/setup'
Expand Down
3 changes: 2 additions & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Attributes:: default
Expand Down
3 changes: 2 additions & 1 deletion libraries/helpers.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: helpers
Expand Down
3 changes: 2 additions & 1 deletion libraries/matchers.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: matchers
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_app.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_app
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_app_debian.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_app_debian
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_app_mac_os_x.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_app_mac_os_x
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_app_rhel.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_app_rhel
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_app_windows.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_app_windows
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_gem.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_gem
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_shell_init.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_shell_init
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_shell_init_debian.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_shell_init_debian
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_shell_init_mac_os_x.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_shell_init_mac_os_x
Expand Down
3 changes: 2 additions & 1 deletion libraries/resource_chef_dk_shell_init_rhel.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Library:: resource_chef_dk_shell_init_rhel
Expand Down
3 changes: 2 additions & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true

name 'chef-dk'
maintainer 'Jonathan Hartman'
Expand Down
3 changes: 2 additions & 1 deletion recipes/default.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true
#
# Cookbook Name:: chef-dk
# Recipe:: default
Expand Down
3 changes: 2 additions & 1 deletion spec/libraries/helpers_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true

require_relative '../spec_helper'
require_relative '../../libraries/helpers'
Expand Down
3 changes: 2 additions & 1 deletion spec/recipes/default_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Encoding: UTF-8
# encoding: utf-8
# frozen_string_literal: true

require_relative '../spec_helper'

Expand Down
1 change: 1 addition & 0 deletions spec/resources.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative 'spec_helper'

shared_context 'resources' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../resources'
require_relative '../../libraries/helpers'

Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/centos/6_8_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::centos::6_8' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/centos/7_2_1511_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::centos::7_2_1511' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/debian/8_4_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::debian::8_4' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/fedora/23_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::fedora::23' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/mac_os_x/10_10_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::mac_os_x::10_10' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/redhat/7_1_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::redhat::7_1' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/ubuntu/14_04_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::ubuntu::14_04' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/ubuntu/16_04_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::ubuntu::16_04' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk/windows/10_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../../chef_dk'

describe 'resources::chef_dk::windows::10' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../resources'
require_relative '../../libraries/helpers'

Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/centos/6_8_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../rhel'

describe 'resources::chef_dk_app::centos::6_8' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/centos/7_2_1511_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../rhel'

describe 'resources::chef_dk_app::centos::7_2_1511' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/debian.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_app'

shared_context 'resources::chef_dk_app::debian' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/debian/8_4_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../debian'

describe 'resources::chef_dk_app::debian::8_4' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/fedora/23_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../rhel'

describe 'resources::chef_dk_app::fedora::23' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/mac_os_x.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_app'

shared_context 'resources::chef_dk_app::mac_os_x' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/mac_os_x/10_10_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../mac_os_x'

describe 'resources::chef_dk_app::mac_os_x::10_10' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/redhat/7_1_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../rhel'

describe 'resources::chef_dk_app::redhat::7_1' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/rhel.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_app'

shared_context 'resources::chef_dk_app::rhel' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/ubuntu/14_04_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../debian'

describe 'resources::chef_dk_app::ubuntu::14_04' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/ubuntu/16_04_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../debian'

describe 'resources::chef_dk_app::ubuntu::16_04' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/windows.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_app'

shared_context 'resources::chef_dk_app::windows' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_app/windows/10_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../windows'

describe 'resources::chef_dk_app::windows::10' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../resources'

shared_context 'resources::chef_dk_gem' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/centos/6_8_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../linux'

describe 'resources::chef_dk_gem::centos::6_8' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/centos/7_2_1511_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../linux'

describe 'resources::chef_dk_gem::centos::7_2_1511' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/debian/8_4_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../linux'

describe 'resources::chef_dk_gem::debian::8_4' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/fedora/23_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../linux'

describe 'resources::chef_dk_gem::fedora::23' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/linux.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_gem'

shared_context 'resources::chef_dk_gem::linux' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/mac_os_x/10_10_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../linux'

describe 'resources::chef_dk_gem::mac_os_x::10_10' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/redhat/7_1_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../linux'

describe 'resources::chef_dk_gem::redhat::7_1' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/ubuntu/14_04_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../linux'

describe 'resources::chef_dk_gem::ubuntu::14_04' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/ubuntu/16_04_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../linux'

describe 'resources::chef_dk_gem::ubuntu::16_04' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/windows.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_gem'

shared_context 'resources::chef_dk_gem::windows' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_gem/windows/10_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../windows'

describe 'resources::chef_dk_gem::windows::10' do
Expand Down
3 changes: 2 additions & 1 deletion spec/resources/chef_dk_shell_init.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../resources'

shared_context 'resources::chef_dk_shell_init' do
Expand All @@ -17,7 +18,7 @@
# Here is a
# bashrc
EOH
content << "\neval \"$(chef shell-init bash)\"" if enabled?
content = "#{content}\neval \"$(chef shell-init bash)\"" if enabled?
allow(File).to receive(:exist?).and_call_original
allow(File).to receive(:exist?).with(
name == 'root' ? root_bashrc : user_bashrc
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/centos/6_8_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../rhel'

describe 'resources::chef_dk_shell_init::centos::6_8' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/centos/7_2_1511_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../rhel'

describe 'resources::chef_dk_shell_init::centos::7_2_1511' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/debian.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_shell_init'

shared_context 'resources::chef_dk_shell_init::debian' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/debian/8_4_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../debian'

describe 'resources::chef_dk_shell_init::debian::8_4' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/fedora/23_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../rhel'

describe 'resources::chef_dk_shell_init::fedora::23' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/mac_os_x.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_shell_init'

shared_context 'resources::chef_dk_shell_init::mac_os_x' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/mac_os_x/10_10_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../mac_os_x'

describe 'resources::chef_dk_shell_init::mac_os_x::10_10' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/redhat/7_1_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../rhel'

describe 'resources::chef_dk_shell_init::redhat::7_1' do
Expand Down
1 change: 1 addition & 0 deletions spec/resources/chef_dk_shell_init/rhel.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# frozen_string_literal: true
require_relative '../chef_dk_shell_init'

shared_context 'resources::chef_dk_shell_init::rhel' do
Expand Down

0 comments on commit 8629ee3

Please sign in to comment.