Merge pull request #4041 from inspec/mj/encoding

Remove `# encoding: utf8` magic comments
2024-11-10 15:14:23 +00:00 · 2019-05-08 13:00:08 -07:00 · 2019-05-08 13:00:08 -07:00 · b4131b0799
commit b4131b0799
parent 654a6617d3 11b8da3283
505 changed files with 4 additions and 507 deletions
--- a/1
+++ b/1
@ -1,4 +1,3 @@
-# encoding: utf-8
 source 'https://rubygems.org'

 gem 'inspec', path: '.'
--- a/1
+++ b/1
@ -1,5 +1,4 @@
 #!/usr/bin/env rake
-# encoding: utf-8

 require 'bundler'
 require 'bundler/gem_helper'
--- a/examples/custom-resource/controls/example.rb
+++ b/examples/custom-resource/controls/example.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 describe gordon do
  its('crime_rate') { should be < 5 }
--- a/examples/inheritance/controls/example.rb
+++ b/examples/inheritance/controls/example.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2016, Chef Software, Inc.

 # manipulate controls of `profile`
--- a/examples/kitchen-ansible/Gemfile
+++ b/examples/kitchen-ansible/Gemfile
@ -1,4 +1,3 @@
-# encoding: utf-8
 source 'https://rubygems.org'

 gem 'inspec', path: '../../.'
--- a/examples/kitchen-ansible/test/integration/default/web_spec.rb
+++ b/examples/kitchen-ansible/test/integration/default/web_spec.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/examples/kitchen-chef/Gemfile
+++ b/examples/kitchen-chef/Gemfile
@ -1,4 +1,3 @@
-# encoding: utf-8
 source 'https://rubygems.org'

 gem 'inspec', path: '../../.'
--- a/examples/kitchen-chef/recipes/default.rb
+++ b/examples/kitchen-chef/recipes/default.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/examples/kitchen-chef/recipes/nginx.rb
+++ b/examples/kitchen-chef/recipes/nginx.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/examples/kitchen-chef/test/integration/default/web_spec.rb
+++ b/examples/kitchen-chef/test/integration/default/web_spec.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/examples/kitchen-puppet/Gemfile
+++ b/examples/kitchen-puppet/Gemfile
@ -1,4 +1,3 @@
-# encoding: utf-8
 source 'https://rubygems.org'

 gem 'inspec', path: '../../.'
--- a/examples/kitchen-puppet/test/integration/default/web_spec.rb
+++ b/examples/kitchen-puppet/test/integration/default/web_spec.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/examples/meta-profile/controls/example.rb
+++ b/examples/meta-profile/controls/example.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2015, The Authors

 # import full profile
--- a/examples/plugins/inspec-resource-lister/Gemfile
+++ b/examples/plugins/inspec-resource-lister/Gemfile
@ -1,4 +1,3 @@
-# encoding: utf-8
 source 'https://rubygems.org'

 gemspec
--- a/examples/plugins/inspec-resource-lister/lib/inspec-resource-lister.rb
+++ b/examples/plugins/inspec-resource-lister/lib/inspec-resource-lister.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 # This file is known as the "entry point."
 # This is the file InSpec will try to load if it
--- a/examples/plugins/inspec-resource-lister/lib/inspec-resource-lister/cli_command.rb
+++ b/examples/plugins/inspec-resource-lister/lib/inspec-resource-lister/cli_command.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 require 'inspec/resource'

--- a/examples/plugins/inspec-resource-lister/lib/inspec-resource-lister/plugin.rb
+++ b/examples/plugins/inspec-resource-lister/lib/inspec-resource-lister/plugin.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8

 # Plugin Definition file
 # The purpose of this file is to declare to InSpec what plugin_types (capabilities)
--- a/examples/plugins/inspec-resource-lister/lib/inspec-resource-lister/version.rb
+++ b/examples/plugins/inspec-resource-lister/lib/inspec-resource-lister/version.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8

 # This file simply makes it easier for CI engines to update
 # the version stamp, and provide a clean way for the gemspec
--- a/examples/profile-attribute/controls/example.rb
+++ b/examples/profile-attribute/controls/example.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 val_user = attribute('user', value: 'alice', description: 'An identification for the user')
 val_password = attribute('password', description: 'A value for the password')

--- a/examples/profile-sensitive/controls/sensitive-failures.rb
+++ b/examples/profile-sensitive/controls/sensitive-failures.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 describe 'bob' do
  it { should eq 'billy' }
--- a/examples/profile-sensitive/controls/sensitive.rb
+++ b/examples/profile-sensitive/controls/sensitive.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 describe 'bob' do
  it { should eq 'bob' }
--- a/examples/profile/controls/example.rb
+++ b/examples/profile/controls/example.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2015, Chef Software, Inc.

 title '/tmp profile'
--- a/examples/profile/controls/gordon.rb
+++ b/examples/profile/controls/gordon.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2016, Chef Software, Inc.

 title 'Gordon Config Checks'
--- a/inspec-bin/bin/inspec
+++ b/inspec-bin/bin/inspec
@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 # Copyright 2015 Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/bundles/inspec-supermarket.rb
+++ b/lib/bundles/inspec-supermarket.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/lib/bundles/inspec-supermarket/api.rb
+++ b/lib/bundles/inspec-supermarket/api.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 # author: Christoph Hartmann
 # author: Dominik Richter
--- a/lib/bundles/inspec-supermarket/cli.rb
+++ b/lib/bundles/inspec-supermarket/cli.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter
 require 'inspec/base_cli'
--- a/lib/bundles/inspec-supermarket/target.rb
+++ b/lib/bundles/inspec-supermarket/target.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/lib/fetchers/git.rb
+++ b/lib/fetchers/git.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'tmpdir'
 require 'fileutils'
 require 'mixlib/shellout'
--- a/lib/fetchers/local.rb
+++ b/lib/fetchers/local.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/fetchers/mock.rb
+++ b/lib/fetchers/mock.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/fetchers/url.rb
+++ b/lib/fetchers/url.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec.rb
+++ b/lib/inspec.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2015, Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/archive/tar.rb
+++ b/lib/inspec/archive/tar.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/lib/inspec/archive/zip.rb
+++ b/lib/inspec/archive/zip.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/lib/inspec/backend.rb
+++ b/lib/inspec/backend.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2015, Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/base_cli.rb
+++ b/lib/inspec/base_cli.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/lib/inspec/cached_fetcher.rb
+++ b/lib/inspec/cached_fetcher.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'inspec/fetcher'
 require 'forwardable'

--- a/lib/inspec/cli.rb
+++ b/lib/inspec/cli.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright 2015 Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/control_eval_context.rb
+++ b/lib/inspec/control_eval_context.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann
 require 'inspec/dsl'
--- a/lib/inspec/dependencies/cache.rb
+++ b/lib/inspec/dependencies/cache.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'fileutils'

 module Inspec
--- a/lib/inspec/dependencies/dependency_set.rb
+++ b/lib/inspec/dependencies/dependency_set.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'inspec/dependencies/requirement'
 require 'inspec/dependencies/resolver'

--- a/lib/inspec/dependencies/lockfile.rb
+++ b/lib/inspec/dependencies/lockfile.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'yaml'

 module Inspec
--- a/lib/inspec/dependencies/requirement.rb
+++ b/lib/inspec/dependencies/requirement.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'inspec/cached_fetcher'
 require 'semverse'

--- a/lib/inspec/dependencies/resolver.rb
+++ b/lib/inspec/dependencies/resolver.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Steven Danna <steve@chef.io>
 require 'inspec/log'
 require 'inspec/errors'
--- a/lib/inspec/describe.rb
+++ b/lib/inspec/describe.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/dsl.rb
+++ b/lib/inspec/dsl.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2015, Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/dsl_shared.rb
+++ b/lib/inspec/dsl_shared.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 module Inspec
  #
  # Contains methods we would like in multiple DSL
--- a/lib/inspec/env_printer.rb
+++ b/lib/inspec/env_printer.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'inspec/shell_detector'
 require 'erb'
 require 'shellwords'
--- a/lib/inspec/errors.rb
+++ b/lib/inspec/errors.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/exceptions.rb
+++ b/lib/inspec/exceptions.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2017, Chef Software Inc.

 module Inspec
--- a/lib/inspec/expect.rb
+++ b/lib/inspec/expect.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2016, Chef Software Inc.
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/fetcher.rb
+++ b/lib/inspec/fetcher.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/file_provider.rb
+++ b/lib/inspec/file_provider.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'rubygems/package'
 require 'zlib'
 require 'zip'
--- a/lib/inspec/impact.rb
+++ b/lib/inspec/impact.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 # Impact scores based off CVSS 3.0
 module Inspec::Impact
--- a/lib/inspec/library_eval_context.rb
+++ b/lib/inspec/library_eval_context.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Steven Danna
 # author: Victoria Jeffrey
 require 'inspec/plugin/v1/plugin_types/resource'
--- a/lib/inspec/log.rb
+++ b/lib/inspec/log.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/metadata.rb
+++ b/lib/inspec/metadata.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright 2015 Dominik Richter

 require 'logger'
--- a/lib/inspec/method_source.rb
+++ b/lib/inspec/method_source.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/objects.rb
+++ b/lib/inspec/objects.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 module Inspec
  autoload :Input, 'inspec/objects/input'
--- a/lib/inspec/objects/control.rb
+++ b/lib/inspec/objects/control.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 module Inspec
  class Control
--- a/lib/inspec/objects/describe.rb
+++ b/lib/inspec/objects/describe.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 module Inspec
  class Describe
--- a/lib/inspec/objects/each_loop.rb
+++ b/lib/inspec/objects/each_loop.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 module Inspec
  class EachLoop < List
--- a/lib/inspec/objects/input.rb
+++ b/lib/inspec/objects/input.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 require 'utils/deprecation'

--- a/lib/inspec/objects/list.rb
+++ b/lib/inspec/objects/list.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 module Inspec
  class List < Value
--- a/lib/inspec/objects/or_test.rb
+++ b/lib/inspec/objects/or_test.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 module Inspec
  class OrTest
--- a/lib/inspec/objects/ruby_helper.rb
+++ b/lib/inspec/objects/ruby_helper.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 module Inspec
  module RubyHelper
--- a/lib/inspec/objects/tag.rb
+++ b/lib/inspec/objects/tag.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 module Inspec
  class Tag
--- a/lib/inspec/objects/test.rb
+++ b/lib/inspec/objects/test.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 module Inspec
  class Test
--- a/lib/inspec/objects/value.rb
+++ b/lib/inspec/objects/value.rb
@ -1,4 +1,3 @@
-# encoding:utf-8

 module Inspec
  class Value
--- a/lib/inspec/plugin/v1/plugin_types/cli.rb
+++ b/lib/inspec/plugin/v1/plugin_types/cli.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/lib/inspec/plugin/v1/plugin_types/fetcher.rb
+++ b/lib/inspec/plugin/v1/plugin_types/fetcher.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann
 require 'inspec/file_provider'
--- a/lib/inspec/plugin/v1/plugin_types/resource.rb
+++ b/lib/inspec/plugin/v1/plugin_types/resource.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/plugin/v1/plugin_types/secret.rb
+++ b/lib/inspec/plugin/v1/plugin_types/secret.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/plugin/v1/plugin_types/source_reader.rb
+++ b/lib/inspec/plugin/v1/plugin_types/source_reader.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/plugin/v1/plugins.rb
+++ b/lib/inspec/plugin/v1/plugins.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/plugin/v1/registry.rb
+++ b/lib/inspec/plugin/v1/registry.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/polyfill.rb
+++ b/lib/inspec/polyfill.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2016, Chef Software Inc.
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/profile.rb
+++ b/lib/inspec/profile.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright 2015 Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/profile_context.rb
+++ b/lib/inspec/profile_context.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann
 require 'inspec/log'
--- a/lib/inspec/profile_vendor.rb
+++ b/lib/inspec/profile_vendor.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Adam Leff

 require 'inspec/profile'
--- a/lib/inspec/reporters/automate.rb
+++ b/lib/inspec/reporters/automate.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 require 'json'
 require 'net/http'
--- a/lib/inspec/reporters/cli.rb
+++ b/lib/inspec/reporters/cli.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 module Inspec::Reporters
  class CLI < Base
--- a/lib/inspec/reporters/json.rb
+++ b/lib/inspec/reporters/json.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 require 'json'

--- a/lib/inspec/reporters/json_automate.rb
+++ b/lib/inspec/reporters/json_automate.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 require 'json'

--- a/lib/inspec/reporters/json_min.rb
+++ b/lib/inspec/reporters/json_min.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 require 'json'

--- a/lib/inspec/reporters/junit.rb
+++ b/lib/inspec/reporters/junit.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 module Inspec::Reporters
  class Junit < Base
--- a/lib/inspec/reporters/yaml.rb
+++ b/lib/inspec/reporters/yaml.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 require 'yaml'

--- a/lib/inspec/require_loader.rb
+++ b/lib/inspec/require_loader.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/resource.rb
+++ b/lib/inspec/resource.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2015, Vulcano Security GmbH
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/rule.rb
+++ b/lib/inspec/rule.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2015, Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/runner.rb
+++ b/lib/inspec/runner.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # copyright: 2015, Dominik Richter
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/runner_mock.rb
+++ b/lib/inspec/runner_mock.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/runner_rspec.rb
+++ b/lib/inspec/runner_rspec.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/runtime_profile.rb
+++ b/lib/inspec/runtime_profile.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright 2017 Chef Software
 # author: Dominik Richter
 # author: Christoph Hartmann
--- a/lib/inspec/schema.rb
+++ b/lib/inspec/schema.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'json'

 module Inspec
--- a/lib/inspec/secrets.rb
+++ b/lib/inspec/secrets.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Christoph Hartmann
 # author: Dominik Richter

--- a/lib/inspec/secrets/yaml.rb
+++ b/lib/inspec/secrets/yaml.rb
@ -1,4 +1,3 @@
-# encoding: utf-8

 require 'yaml'

--- a/lib/inspec/shell.rb
+++ b/lib/inspec/shell.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann

--- a/lib/inspec/shell_detector.rb
+++ b/lib/inspec/shell_detector.rb
@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'etc'
 require 'rbconfig'

--- a/Show more
+++ b/Show more