proper privatize class methods

Author: mschuchard

lib/puppet-check/cli.rb

@@ -16,7 +16,7 @@ def self.run(args)
 
   # parse the user arguments
   def self.parse(args)
-    private_class_method :method
+    private_class_method :parse
     require 'optparse'
 
     # show help message if no args specified

lib/puppet-check/data_parser.rb

@@ -206,7 +206,7 @@ def self.json(files)
 
   # checks hieradata
   def self.hiera(data, file)
-    private_class_method :method
+    private_class_method :hiera
     warnings = []
 
     # disregard nil/undef value data check if default values (common)

lib/puppet-check/output_results.rb

@@ -33,7 +33,7 @@ def self.run(files, format)
 
   # output the results as text
   def self.text(files)
-    private_class_method :method
+    private_class_method :text
 
     # output text for each of four file categories
     %i[errors warnings clean ignored].each do |category|

lib/puppet-check/regression_check.rb

@@ -24,7 +24,7 @@ def self.smoke(interface_nodes, octoconfig)
 
     # config file loading
     def self.config(octoconfig)
-      private_class_method :method
+      private_class_method :config
       OctocatalogDiff::API::V1.config(filename: octoconfig)
     end
   end

lib/puppet-check/rspec_puppet_support.rb

@@ -30,7 +30,7 @@ def self.run
 
   # setup the files, directories, and symlinks for rspec-puppet testing
   def self.file_setup(module_name)
-    private_class_method :method
+    private_class_method :file_setup
     # create all the necessary fixture dirs that are missing
     ['spec/fixtures', 'spec/fixtures/manifests', 'spec/fixtures/modules'].each do |dir|
       Dir.mkdir(dir) unless File.directory?(dir)
@@ -59,7 +59,7 @@ def self.file_setup(module_name)
 
   # setup the module dependencies for rspec-puppet testing
   def self.dependency_setup
-    private_class_method :method
+    private_class_method :dependency_setup
     require 'json'
 
     # parse the metadata.json (assumes DataParser.json has already given it a pass)
@@ -86,7 +86,7 @@ def self.dependency_setup
 
   # download external module dependency with git
   def self.git(git_url, args = '')
-    private_class_method :method
+    private_class_method :git
     # establish path to clone module to
     path = "spec/fixtures/modules/#{File.basename(git_url, '.git')}"
     # is the module present and already cloned with git? do a pull; otherwise, do a clone
@@ -99,15 +99,15 @@ def self.git(git_url, args = '')
 
   # download external module dependency with forge
   def self.forge(forge_name, args = '')
-    private_class_method :method
+    private_class_method :forge
     # is the module present? do an upgrade; otherwise, do an install
     subcommand = File.directory?("spec/fixtures/modules/#{forge_name}") ? 'upgrade' : 'install'
     spawn("puppet module #{subcommand} --modulepath spec/fixtures/modules/ #{args} #{forge_name}")
   end
 
   # download external module dependency with svn
   def self.svn(svn_url, args = '')
-    private_class_method :method
+    private_class_method :svn
     # establish path to checkout module to
     path = "spec/fixtures/modules/#{File.basename(svn_url)}"
     # is the module present and already checked out with svn? do an update; otherwise, do a checkout
@@ -120,7 +120,7 @@ def self.svn(svn_url, args = '')
 
   # download external module dependency with hg
   def self.hg(hg_url, args = '')
-    private_class_method :method
+    private_class_method :hg
     # establish path to clone module to
     path = "spec/fixtures/modules/#{File.basename(hg_url)}"
     # is the module present and already cloned with hg? do a pull and update; otherwise do a clone

lib/puppet_check.rb

@@ -70,7 +70,7 @@ def run(settings = {}, paths = [])
 
   # establish default settings
   def self.defaults(settings = {})
-    private_class_method :method
+    private_class_method :defaults
 
     # return settings with defaults where unspecified
     {
@@ -95,7 +95,7 @@ def self.defaults(settings = {})
 
   # parse the paths and return the array of files
   def self.parse_paths(paths = [])
-    private_class_method :method
+    private_class_method :parse_paths
     files = []
 
     # traverse the unique paths and return all files not explicitly in fixtures

spec/puppet-check/cli_spec.rb

@@ -12,39 +12,39 @@
 
   context '.parse' do
     it 'raises an error if an invalid option was specified' do
-      expect { PuppetCheck::CLI.parse(%w[-s -asdf foo]) }.to raise_error(OptionParser::InvalidOption)
+      expect { PuppetCheck::CLI.send(:parse, %w[-s -asdf foo]) }.to raise_error(OptionParser::InvalidOption)
     end
 
     it 'allows fail on warnings, style, smoke, and regression checks to be enabled' do
-      expect(PuppetCheck::CLI.parse(%w[--fail-on-warnings -s -r --smoke foo])).to include(fail_on_warnings: true, style: true, smoke: true, regression: true)
+      expect(PuppetCheck::CLI.send(:parse, %w[--fail-on-warnings -s -r --smoke foo])).to include(fail_on_warnings: true, style: true, smoke: true, regression: true)
     end
 
     it 'correctly parser EYAML options' do
-      expect(PuppetCheck::CLI.parse(%w[--public pub.pem --private priv.pem])).to include(public: 'pub.pem', private: 'priv.pem')
+      expect(PuppetCheck::CLI.send(:parse, %w[--public pub.pem --private priv.pem])).to include(public: 'pub.pem', private: 'priv.pem')
     end
 
     it 'correctly parses a formatting option' do
-      expect(PuppetCheck::CLI.parse(%w[-o text])).to include(output_format: 'text')
+      expect(PuppetCheck::CLI.send(:parse, %w[-o text])).to include(output_format: 'text')
     end
 
     it 'correctly parses octocatalog-diff options' do
-      expect(PuppetCheck::CLI.parse(%w[--octoconfig config.cfg.rb --octonodes server1,server2])).to include(octoconfig: 'config.cfg.rb', octonodes: %w[server1 server2])
+      expect(PuppetCheck::CLI.send(:parse, %w[--octoconfig config.cfg.rb --octonodes server1,server2])).to include(octoconfig: 'config.cfg.rb', octonodes: %w[server1 server2])
     end
 
     it 'correctly parses PuppetLint arguments' do
-      expect(PuppetCheck::CLI.parse(%w[--puppet-lint puppetlint-arg-one,puppetlint-arg-two foo])).to include(puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'])
+      expect(PuppetCheck::CLI.send(:parse, %w[--puppet-lint puppetlint-arg-one,puppetlint-arg-two foo])).to include(puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'])
     end
 
     it 'correctly loads a .puppet-lint.rc' do
-      expect(PuppetCheck::CLI.parse(%W[-c #{fixtures_dir}/manifests/.puppet-lint.rc])).to include(puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'])
+      expect(PuppetCheck::CLI.send(:parse, %W[-c #{fixtures_dir}/manifests/.puppet-lint.rc])).to include(puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'])
     end
 
     it 'correctly parses Rubocop arguments' do
-      expect(PuppetCheck::CLI.parse(%w[--rubocop rubocop-arg-one,rubocop-arg-two foo])).to include(rubocop_args: ['--except', 'rubocop-arg-one,rubocop-arg-two'])
+      expect(PuppetCheck::CLI.send(:parse, %w[--rubocop rubocop-arg-one,rubocop-arg-two foo])).to include(rubocop_args: ['--except', 'rubocop-arg-one,rubocop-arg-two'])
     end
 
     it 'correctly parses multiple sets of arguments' do
-      expect(PuppetCheck::CLI.parse(%w[-s --puppet-lint puppetlint-arg-one,puppetlint-arg-two --rubocop rubocop-arg-one,rubocop-arg-two foo])).to include(style: true, puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'], rubocop_args: ['--except', 'rubocop-arg-one,rubocop-arg-two'])
+      expect(PuppetCheck::CLI.send(:parse, %w[-s --puppet-lint puppet-lint-arg-one,puppet-lint-arg-two --rubocop rubocop-arg-one,rubocop-arg-two foo])).to include(style: true, puppetlint_args: ['--puppet-lint-arg-one', '--puppet-lint-arg-two'], rubocop_args: ['--except', 'rubocop-arg-one,rubocop-arg-two'])
     end
   end
 end

spec/puppet-check/output_results_spec.rb

@@ -5,19 +5,19 @@
   context '.text' do
     it 'outputs files with errors' do
       files = { errors: { 'foo' => ['i had an error'] } }
-      expect { OutputResults.text(files) }.to output("\033[31mThe following files have errors:\033[0m\n-- foo:\ni had an error\n\n").to_stdout
+      expect { OutputResults.send(:text, files) }.to output("\033[31mThe following files have errors:\033[0m\n-- foo:\ni had an error\n\n").to_stdout
     end
     it 'outputs files with warnings' do
       files = { warnings: { 'foo' => ['i had a warning'] } }
-      expect { OutputResults.text(files) }.to output("\033[33mThe following files have warnings:\033[0m\n-- foo:\ni had a warning\n\n").to_stdout
+      expect { OutputResults.send(:text, files) }.to output("\033[33mThe following files have warnings:\033[0m\n-- foo:\ni had a warning\n\n").to_stdout
     end
     it 'outputs files with no errors or warnings' do
       files = { clean: ['foo'] }
-      expect { OutputResults.text(files) }.to output("\033[32mThe following files have no errors or warnings:\033[0m\n-- foo\n\n").to_stdout
+      expect { OutputResults.send(:text, files) }.to output("\033[32mThe following files have no errors or warnings:\033[0m\n-- foo\n\n").to_stdout
     end
     it 'outputs files that were not processed' do
       files = { ignored: ['foo'] }
-      expect { OutputResults.text(files) }.to output("\033[36mThe following files have unrecognized formats and therefore were not processed:\033[0m\n-- foo\n\n").to_stdout
+      expect { OutputResults.send(:text, files) }.to output("\033[36mThe following files have unrecognized formats and therefore were not processed:\033[0m\n-- foo\n\n").to_stdout
     end
   end
 

spec/puppet-check/regression_check_spec.rb

@@ -7,10 +7,10 @@
     context '.config' do
       # json gem is messed up for the EOL Ruby versions
       it 'raise an appropriate error if the file is malformed' do
-        expect { RegressionCheck.config("#{fixtures_dir}metadata.json") }.to raise_error(OctocatalogDiff::Errors::ConfigurationFileContentError, 'Configuration must define OctocatalogDiff::Config!')
+        expect { RegressionCheck.send(:config, "#{fixtures_dir}metadata.json") }.to raise_error(OctocatalogDiff::Errors::ConfigurationFileContentError, 'Configuration must define OctocatalogDiff::Config!')
       end
       it 'loads in a good octocatalog-diff config file' do
-        expect { RegressionCheck.config("#{octocatalog_diff_dir}octocatalog_diff.cfg.rb") }.not_to raise_exception
+        expect { RegressionCheck.send(:config, "#{octocatalog_diff_dir}octocatalog_diff.cfg.rb") }.not_to raise_exception
       end
       it 'loads in the settings from the file correctly' do
         # TODO

spec/puppet_check_spec.rb

@@ -33,7 +33,7 @@
 
   context 'defaults' do
     it 'returns defaults correctly' do
-      expect(PuppetCheck.defaults).to eql(
+      expect(PuppetCheck.send(:defaults)).to eql(
         {
           fail_on_warning: false,
           style: false,
@@ -64,18 +64,18 @@
         puppetlint_args: %w[--puppetlint-arg-one --puppetlint-arg-two],
         rubocop_args: %w[--rubocop-arg-one --rubocop-arg-two]
       }
-      expect(PuppetCheck.defaults(settings)).to eql(settings)
+      expect(PuppetCheck.send(:defaults, settings)).to eql(settings)
     end
   end
 
   context '.parse_paths' do
     before(:each) { Dir.chdir(fixtures_dir) }
 
-    let(:no_files) { PuppetCheck.parse_paths(%w[foo bar baz]) }
-    let(:file) { PuppetCheck.parse_paths(['lib/good.rb']) }
-    let(:dir) { PuppetCheck.parse_paths(['.']) }
-    let(:multi_dir) { PuppetCheck.parse_paths(%w[hieradata lib manifests]) }
-    let(:repeats) { PuppetCheck.parse_paths(['hieradata', 'hieradata', 'lib', 'hieradata/good.json', 'manifests/good.pp', 'manifests/good.pp']) }
+    let(:no_files) { PuppetCheck.send(:parse_paths, %w[foo bar baz]) }
+    let(:file) { PuppetCheck.send(:parse_paths, ['lib/good.rb']) }
+    let(:dir) { PuppetCheck.send(:parse_paths, ['.']) }
+    let(:multi_dir) { PuppetCheck.send(:parse_paths, %w[hieradata lib manifests]) }
+    let(:repeats) { PuppetCheck.send(:parse_paths, ['hieradata', 'hieradata', 'lib', 'hieradata/good.json', 'manifests/good.pp', 'manifests/good.pp']) }
 
     it 'raises an error if no files were found' do
       expect { no_files }.to raise_error(RuntimeError, 'puppet-check: no files found in supplied paths \'foo, bar, baz\'.')