Cookstyle fixes

Nordstrom · Feb 28, 2020 · 91b2b0c · 91b2b0c
1 parent 0b961ea
commit 91b2b0c
Show file tree

Hide file tree

Showing 50 changed files with 87 additions and 90 deletions.
diff --git a/Guardfile b/Guardfile
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
-# Cookbook Name:: chefdk_bootstrap
+# Cookbook:: chefdk_bootstrap
 # Rakefile
 
-# Copyright 2016 Nordstrom, Inc.
+# Copyright:: 2016 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@ RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 desc 'Run Rubocop and Foodcritic style checks'
-task style: %i[rubocop foodcritic]
+task style: %i(rubocop foodcritic)
 
 desc 'Run all style checks and unit tests'
-task test: %i[style spec]
+task test: %i(style spec)
 
 task default: :test
 

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -1,4 +1,4 @@
-# Copyright 2015, 2018 Nordstrom, Inc.
+# Copyright:: 2015, 2018 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
   install['chefdk_julia'] = false
   install['kitchen_proxy'] = true
   install['gitconfig'] = false
-  # TODO VSCODE
+  # TODO: VSCODE
 end
 
 # No virtual box on vm
@@ -44,14 +44,14 @@
     install['poshgit'] = true
     install['conemu'] = true
   end
-  default['atom']['packages'] = %w[]
+  default['atom']['packages'] = %w()
 when 'mac_os_x'
   default['chefdk_bootstrap']['package'].tap do |install|
     install['iterm2'] = true
     install['bash_profile'] = true
   end
   # Default Atom plugins
-  default['atom']['packages'] = %w[language-powershell linter linter-cookstyle linter-erb linter-foodcritic linter-rubocop merge-conflicts rubocop-auto-correct]
+  default['atom']['packages'] = %w(language-powershell linter linter-cookstyle linter-erb linter-foodcritic linter-rubocop merge-conflicts rubocop-auto-correct)
 end
 
 default['chefdk_bootstrap']['gitconfig'] = {
@@ -62,7 +62,7 @@
   'alias.ci' => { value: 'commit' },
   'alias.st' => { value: 'status' },
   'alias.lol' => { value: "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" },
-  'push.default' => { value: 'simple' }
+  'push.default' => { value: 'simple' },
 }
 
 default['chefdk_bootstrap']['gitconfig']['credential.helper'] = { value: 'osxkeychain' } if platform_family?('mac_os_x')
@@ -78,6 +78,7 @@
 # Skip the proxy for these domains and IPs. This should be a comma-separated string
 default['chefdk_bootstrap']['proxy']['no_proxy'] = ENV['no_proxy'] # 'example.com,localhost,127.0.0.1'
 
-# TODO update virtual box
-default['chefdk_bootstrap']['virtualbox']['source'] = 'https://download.virtualbox.org/virtualbox/6.1.2/VirtualBox-6.1.2-135662-OSX.dmg'
-default['chefdk_bootstrap']['virtualbox']['checksum'] = '20fb52bbd7edec58c9eef69046240a809091727872b8b4b254db272ffd6950b4'
+default['vagrant']['plugins'] = [{ name: 'vagrant-vbguest' }]
+
+default['chefdk_bootstrap']['virtualbox']['source'] = 'https://download.virtualbox.org/virtualbox/6.1.4/VirtualBox-6.1.4-136177-OSX.dmg'
+default['chefdk_bootstrap']['virtualbox']['checksum'] = '2bc5d7282d9af9ce12dffddb528dcf6c9eb7ea92e644885d805e1e56fd55bacf'
diff --git a/bootstrap.rb b/bootstrap.rb
@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 #
-# Copyright 2016, 2018 Nordstrom, Inc.
+# Copyright:: 2016, 2018 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -135,8 +135,8 @@ def delete
 
   # Install chef workstation
   class ChefDK
-    CHEFDK_VERSION_PATTERN = /Chef Workstation Version: (?<version>\d{1,2}\.\d{1,2}\.\d{1,2})/i
-    CHEFDK_LATEST_PATTERN = /version\s(?<version>\d{1,2}\.\d{1,2}\.\d{1,2})/i
+    CHEFDK_VERSION_PATTERN = /Chef Workstation Version: (?<version>\d{1,2}\.\d{1,2}\.\d{1,2})/i.freeze
+    CHEFDK_LATEST_PATTERN = /version\s(?<version>\d{1,2}\.\d{1,2}\.\d{1,2})/i.freeze
 
     def initialize(options)
       @target_version = options[:version]

diff --git a/libraries/os.rb b/libraries/os.rb
@@ -1,10 +1,10 @@
 #
-# Cookbook Name:: atom
+# Cookbook:: atom
 # Library:: os
 #
 # Author:: Mark Gibbons
 #
-# Copyright 2018 Nordstrom, Inc.
+# Copyright:: 2018 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/metadata.rb b/metadata.rb
@@ -1,4 +1,4 @@
-# Copyright 2015, 2018 Nordstrom, Inc.
+# Copyright:: 2015, 2018 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/atom.rb b/recipes/atom.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/atom_debian.rb b/recipes/atom_debian.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: chef-atom
+# Cookbook:: chef-atom
 # Recipe:: debian
 #
-# Copyright (c) 2016 Doug Ireton
+# Copyright:: (c) 2016 Doug Ireton
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 apt_repository 'atom-ppa' do
   uri 'http://ppa.launchpad.net/webupd8team/atom/ubuntu'
-  distribution node['lsb']['codename']
   components ['main']
   keyserver 'keyserver.ubuntu.com'
   key 'EEA14886'

diff --git a/recipes/atom_default.rb b/recipes/atom_default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: chef-atom
+# Cookbook:: chef-atom
 # Recipe:: default
 #
-# Copyright (c) 2016 Doug Ireton
+# Copyright:: (c) 2016 Doug Ireton
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/atom_mac_os_x.rb b/recipes/atom_mac_os_x.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: chef-atom
+# Cookbook:: chef-atom
 # Recipe:: mac_os_x
 #
-# Copyright (c) 2016 Doug Ireton
+# Copyright:: (c) 2016 Doug Ireton
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/atom_plugins.rb b/recipes/atom_plugins.rb
@@ -1,4 +1,4 @@
-# Copyright 2018 Nordstrom, Inc.
+# Copyright:: 2018 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/atom_windows.rb b/recipes/atom_windows.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: chef-atom
+# Cookbook:: chef-atom
 # Recipe:: windows
 #
-# Copyright (c) 2016 Doug Ireton
+# Copyright:: (c) 2016 Doug Ireton
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/bash_profile.rb b/recipes/bash_profile.rb
@@ -1,4 +1,4 @@
-# Copyright 2016 Nordstrom, Inc.
+# Copyright:: 2016 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/chef_ca.rb b/recipes/chef_ca.rb
@@ -1,4 +1,4 @@
-# Copyright 2018 Nordstrom, Inc.
+# Copyright:: 2018 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/chefdk_julia.rb b/recipes/chefdk_julia.rb
@@ -1,5 +1,5 @@
 if node['chefdk_bootstrap']['package']['chefdk_julia']
   chef_gem 'chefdk-julia'
 
-  # TODO: add the config to enable julia in knife.rb/config.rb
+  # TODO: Rip out all traces of chef julia
 end
diff --git a/recipes/conemu.rb b/recipes/conemu.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/fix_profile.rb b/recipes/fix_profile.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
 
 username = ENV['username']
 
-case node['platform_family']
-when 'windows'
+if platform_family?('windows')
   file "C:\\Users\\#{username}\\Documents\\WindowsPowerShell\\Microsoft.PowerShell_profile.ps1" do
     content ''
   end

diff --git a/recipes/git.rb b/recipes/git.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/gitconfig.rb b/recipes/gitconfig.rb
@@ -1,4 +1,4 @@
-# Copyright 2018 Nordstrom, Inc.
+# Copyright:: 2018 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/gitextensions.rb b/recipes/gitextensions.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/iterm2.rb b/recipes/iterm2.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/kdiff3.rb b/recipes/kdiff3.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/mac_os_x.rb b/recipes/mac_os_x.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,12 +14,11 @@
 #
 
 home = Dir.home(ENV['SUDO_USER'] || ENV['USER'])
-%W[
+%W(
   #{home}/.chef
   #{home}/chef
   #{home}/chef/cookbooks
-  /usr/local
-].each do |dir|
+).each do |dir|
   directory dir do
     owner ENV['SUDO_USER'] || ENV['USER']
   end

diff --git a/recipes/poshgit.rb b/recipes/poshgit.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/powershell_profile.rb b/recipes/powershell_profile.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/vagrant.rb b/recipes/vagrant.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/virtualbox.rb b/recipes/virtualbox.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/windows.rb b/recipes/windows.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 include_recipe 'chocolatey'
 
 home = Dir.home
-%W[
+%W(
   #{home}/.chef
   #{home}/chef
   #{home}/chef/cookbooks
-].each do |directory|
+).each do |directory|
   directory directory
 end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/spec/unit/bootstrap_spec.rb b/spec/unit/bootstrap_spec.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Nordstrom, Inc.
+# Copyright:: 2016 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,26 +30,26 @@
 
     context 'long options' do
       let(:arguments) do
-        %w[--json-attributes http://server/attributes.json --version 0.14.25]
+        %w(--json-attributes http://server/attributes.json --version 0.14.25)
       end
 
       it 'all long options specified' do
         options = {
           json_attributes: 'http://server/attributes.json',
-          version: '0.14.25'
+          version: '0.14.25',
         }
         expect(cli.parse).to eq(options)
       end
     end
 
     context 'short options' do
-      let(:arguments) { %w[-j http://server/attributes.json -v 0.14.25] }
+      let(:arguments) { %w(-j http://server/attributes.json -v 0.14.25) }
 
       it 'all short options specified' do
         options =
           {
             json_attributes: 'http://server/attributes.json',
-            version: '0.14.25'
+            version: '0.14.25',
           }
         expect(cli.parse).to eq(options)
       end

diff --git a/spec/unit/recipes/atom_spec.rb b/spec/unit/recipes/atom_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2016 Nordstrom, Inc.
+# Copyright:: 2016 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/spec/unit/recipes/bash_profile_spec.rb b/spec/unit/recipes/bash_profile_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2016 Nordstrom, Inc.
+# Copyright:: 2016 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
     include_context 'mac_os_x'
 
     before do
-      %w[http_proxy https_proxy no_proxy].each do |proxy_var|
+      %w(http_proxy https_proxy no_proxy).each do |proxy_var|
         ENV.delete(proxy_var)
       end
     end

diff --git a/spec/unit/recipes/chefdk_julia_spec.rb b/spec/unit/recipes/chefdk_julia_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Nordstrom, Inc.
+# Copyright:: 2015 Nordstrom, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.