Fix lint and spec tests after PDK update

Author: edestecd

.fixtures.yml

@@ -2,6 +2,9 @@ fixtures:
   repositories:
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
+    chocolatey: "https://github.com/puppetlabs/puppetlabs-chocolatey.git"
+    powershell: "https://github.com/puppetlabs/puppetlabs-powershell.git"
+    registry: "https://github.com/puppetlabs/puppetlabs-registry.git"
     vcsrepo: "https://github.com/puppetlabs/puppetlabs-vcsrepo.git"
   symlinks:
     software: "#{source_dir}"

.sync.yml

@@ -47,3 +47,7 @@ Gemfile:
       - gem: puppet-lint-unquoted_string-check
       - gem: puppet-lint-variable_contains_upcase
       - gem: puppet-lint-version_comparison-check
+
+Rakefile:
+  extra_disabled_lint_checks:
+    - disable_security_package_pinned_version

Rakefile

@@ -3,3 +3,4 @@ require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 
 PuppetLint.configuration.send('relative')
+PuppetLint.configuration.send('disable_security_package_pinned_version')

lib/puppet/provider/package/apm.rb

@@ -2,39 +2,39 @@
 
 require 'puppet/provider/package'
 
-Puppet::Type.type(:package).provide(:apm, :parent => Puppet::Provider::Package) do
+Puppet::Type.type(:package).provide(:apm, parent: Puppet::Provider::Package) do
   desc 'Atom packages via `apm`.'
 
   has_feature :installable, :uninstallable, :upgradeable, :versionable
 
-  commands :apm => 'apm'
+  commands apm: 'apm'
 
   def self.parse(line, user)
-    return unless line.chomp =~ / (\S+)@(\d+\.\d+\.\d+)/
-    { :name => Regexp.last_match(1), :provider => :apm,
-      :ensure => Regexp.last_match(2), :source => user }
+    return unless line.chomp =~ %r{ (\S+)@(\d+\.\d+\.\d+)}
+    { name: Regexp.last_match(1), provider: :apm,
+      ensure: Regexp.last_match(2), source: user }
   end
 
   def self.instances_by_user(user)
     command = [command(:apm), :list, '--no-color']
 
     begin
       output = execute(command, command_opts(user))
-      [].tap do |a|
+      [].tap { |a|
         output.lines.each do |line|
           next unless (package = parse(line, user))
           a << new(package)
         end
-      end.compact
+      }.compact
     rescue Puppet::ExecutionFailure => e
       raise Puppet::Error, "Could not list atom packages: #{e}"
     end
   end
 
   def self.instances
-    Dir.entries(home_prefix).reject { |u| u.start_with?('.') || u.eql?('Shared') }.collect do |user|
+    Dir.entries(home_prefix).reject { |u| u.start_with?('.') || u.eql?('Shared') }.map { |user|
       instances_by_user(user)
-    end.flatten
+    }.flatten
   end
 
   def query
@@ -50,7 +50,7 @@ def latest
     command = [command(:apm), :upgrade, '--list', '--no-color']
     output = execute(command, self.class.command_opts(@resource[:source]))
 
-    if output =~ / #{Regexp.escape @resource[:name]} (\d+\.\d+\.\d+) -> (\d+\.\d+\.\d+)/
+    if output =~ %r{ #{Regexp.escape @resource[:name]} (\d+\.\d+\.\d+) -> (\d+\.\d+\.\d+)}
       Regexp.last_match(2)
     else
       @property_hash[:ensure]
@@ -61,7 +61,7 @@ def install
     command = [command(:apm), :install]
 
     should = @resource.should(:ensure)
-    command << if %i[latest installed present].include?(should)
+    command << if [:latest, :installed, :present].include?(should)
                  @resource[:name]
                else
                  "#{@resource[:name]}@#{should}"
@@ -101,13 +101,13 @@ def self.home_prefix
   def self.command_opts(user)
     Dir.chdir(home(user).to_s)
     @command_opts ||= {
-      :combine            => true,
-      :custom_environment => {
-        'HOME'            => home(user).to_s,
-        'PATH'            => '/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin'
+      combine: true,
+      custom_environment: {
+        'HOME' => home(user).to_s,
+        'PATH' => '/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin',
       },
-      :failonfail         => true,
-      :uid                => default_user(user)
+      failonfail: true,
+      uid: default_user(user),
     }
   end
 end

lib/puppet/provider/package/appcompressed.rb

@@ -1,43 +1,43 @@
 # lib/puppet/provider/package/appcompressed.rb
 
 require 'puppet/provider/package'
-Puppet::Type.type(:package).provide(:appcompressed, :parent => Puppet::Provider::Package) do
+Puppet::Type.type(:package).provide(:appcompressed, parent: Puppet::Provider::Package) do
   desc 'Installs a compressed .app. Supports zip, tar.gz, tar.bz2'
 
   FLAVORS = %w[zip tgz tar.gz tbz tbz2 tar.bz2].freeze
 
-  confine :operatingsystem => :darwin
+  confine operatingsystem: :darwin
 
-  commands :curl  => '/usr/bin/curl'
-  commands :ditto => '/usr/bin/ditto'
-  commands :tar   => '/usr/bin/tar'
+  commands curl: '/usr/bin/curl'
+  commands ditto: '/usr/bin/ditto'
+  commands tar: '/usr/bin/tar'
   # commands :rm    => '/bin/rm'
 
   # JJM We store a cookie for each installed .app.compressed in /var/db
   def self.instances_by_name
     # Allow this gross code....
-    # rubocop:disable Style/BlockDelimiters, Style/MultilineBlockChain
-    Dir.entries('/var/db').find_all { |f|
-      f =~ /^\.puppet_appcompressed_installed_/
-    }.collect do |f|
-      name = f.sub(/^\.puppet_appcompressed_installed_/, '')
+    # rubocop:disable Style/MultilineBlockChain
+    Dir.entries('/var/db').select { |f|
+      f =~ %r{^\.puppet_appcompressed_installed_}
+    }.map do |f|
+      name = f.sub(%r{^\.puppet_appcompressed_installed_}, '')
       yield name if block_given?
       name
     end
-    # rubocop:enable Style/BlockDelimiters, Style/MultilineBlockChain
+    # rubocop:enable Style/MultilineBlockChain
   end
 
   def self.instances
-    instances_by_name.collect do |name|
-      new(:name => name, :provider => :appcompressed, :ensure => :installed)
+    instances_by_name.map do |name|
+      new(name: name, provider: :appcompressed, ensure: :installed)
     end
   end
 
   def query
     return unless File.exist?(receipt_path)
     {
-      :name   => @resource[:name],
-      :ensure => :installed
+      name: @resource[:name],
+      ensure: :installed,
     }
   end
 
@@ -86,7 +86,7 @@ def install
   private
 
   def flavor
-    @resource[:flavor] || @resource[:source].match(/\.(#{FLAVORS.join('|')})$/i) { |m| m[1] }
+    @resource[:flavor] || @resource[:source].match(%r{\.(#{FLAVORS.join('|')})$}i) { |m| m[1] }
   end
 
   # This is not always correct...

lib/puppet/provider/package/prefpanecompressed.rb

@@ -1,43 +1,43 @@
 # lib/puppet/provider/package/prefpanecompressed.rb
 
 require 'puppet/provider/package'
-Puppet::Type.type(:package).provide(:prefpanecompressed, :parent => Puppet::Provider::Package) do
+Puppet::Type.type(:package).provide(:prefpanecompressed, parent: Puppet::Provider::Package) do
   desc 'Installs a compressed .prefPane. Supports zip, tar.gz, tar.bz2'
 
   FLAVORZ = %w[zip tgz tar.gz tbz tbz2 tar.bz2].freeze
 
-  confine :operatingsystem => :darwin
+  confine operatingsystem: :darwin
 
-  commands :curl  => '/usr/bin/curl'
-  commands :ditto => '/usr/bin/ditto'
-  commands :tar   => '/usr/bin/tar'
+  commands curl: '/usr/bin/curl'
+  commands ditto: '/usr/bin/ditto'
+  commands tar: '/usr/bin/tar'
   # commands :rm    => '/bin/rm'
 
   # JJM We store a cookie for each installed .app.compressed in /var/db
   def self.instances_by_name
     # Allow this gross code....
-    # rubocop:disable Style/BlockDelimiters, Style/MultilineBlockChain
-    Dir.entries('/var/db').find_all { |f|
-      f =~ /^\.puppet_prefpanecompressed_installed_/
-    }.collect do |f|
-      name = f.sub(/^\.puppet_prefpanecompressed_installed_/, '')
+    # rubocop:disable Style/MultilineBlockChain
+    Dir.entries('/var/db').select { |f|
+      f =~ %r{^\.puppet_prefpanecompressed_installed_}
+    }.map do |f|
+      name = f.sub(%r{^\.puppet_prefpanecompressed_installed_}, '')
       yield name if block_given?
       name
     end
-    # rubocop:enable Style/BlockDelimiters, Style/MultilineBlockChain
+    # rubocop:enable Style/MultilineBlockChain
   end
 
   def self.instances
-    instances_by_name.collect do |name|
-      new(:name => name, :provider => :prefpanecompressed, :ensure => :installed)
+    instances_by_name.map do |name|
+      new(name: name, provider: :prefpanecompressed, ensure: :installed)
     end
   end
 
   def query
     return unless File.exist?(receipt_path)
     {
-      :name   => @resource[:name],
-      :ensure => :installed
+      name: @resource[:name],
+      ensure: :installed,
     }
   end
 
@@ -86,7 +86,7 @@ def install
   private
 
   def flavor
-    @resource[:flavor] || @resource[:source].match(/\.(#{FLAVORZ.join('|')})$/i) { |m| m[1] }
+    @resource[:flavor] || @resource[:source].match(%r{\.(#{FLAVORZ.join('|')})$}i) { |m| m[1] }
   end
 
   # This is not always correct...

manifests/editors/atom.pp

@@ -85,6 +85,8 @@
       }
     }
     'windows': {
+      $apm_require = undef
+
       package { 'atom':
         ensure   => $ensure,
         provider => chocolatey,

manifests/init.pp

@@ -16,8 +16,5 @@
 ) inherits software::params {
 
   # Not Used
-  fail("The ${module_name} module does not use the ${name} class.
-  Just include the software or group classes you want like this:
-  include software::browsers::chrome (just chrome) include software::browsers (all browsers in group)")
-
+  fail("The ${module_name} module does not use the ${name} class. Just include the software or group classes you want.")
 }