puppet-lint-file_ensure-check 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24a250bf3d18fc54957c0fcc5dd769f814eac13dcd25fd431e7feecad2efd859
-  data.tar.gz: 983689aa805f26a121d8c1cb27c0fb9b7321bdf40e1dbae2e86cb23e8c834380
+  metadata.gz: 57769e66e286d300d039e15ba4ab871ba1008fc3cf6a65f374d8c5b42f1c8022
+  data.tar.gz: 1a1ec2f4427e2d3a90d4258718b79dac39bd126177e2988d0560581ed1dd9f97
 SHA512:
-  metadata.gz: 8fa3b8e16f13802f579aa029bc8c668e9cca8d16037403aa53468be154458b289f9758690de7f55cf235f9d871e5e7cae7525fc3d75fe565d5ba3505c35b8654
-  data.tar.gz: 606cc86fe430246fcb6e6ca8327f90749bfda0b309a1613b067cc00e761e48e79c6fe90ec04cbf44d7277792f532d4022fd3380b50ed1e1f55d6bc83d446e916
+  metadata.gz: 96e38cf8c1a28ef389e238c98e05bc6567b9a3ab50d760b15e915c73b3d690205cd39b278873146741c7e7171ea79429fa032b678b54bf1e4cfe54fb56ba1327
+  data.tar.gz: 93fecbbf38081246b2402e59438e8e96c1f3cf45f77541a2e08bbc7ee2e184bff192036ff1f174b629914115cd793ecc1c8ad51059a8aca354690ca221278461

data/lib/puppet-lint/plugins/check_file_ensure.rb

@@ -1,33 +1,39 @@
 PuppetLint.new_check(:file_ensure) do
   def check
     resource_indexes.each do |resource|
-      if resource[:type].value == 'file'
-        attr = resource[:tokens].select { |t| t.type == :NAME && \
-                                              t.value == 'ensure' && \
-                                              t.next_code_token.type == :FARROW }
-        next if attr.empty?
-        val_token = attr[0].next_code_token.next_code_token
-        next unless val_token.value == 'present'
-        next unless [:NAME, :STRING, :SSTRING].include? val_token.type
-        notify :warning, {
-          :message  => 'ensure set to present on file resource',
-          :line     => val_token.line,
-          :column   => val_token.column,
-          :token    => val_token,
-          :resource => resource,
-        }
+      next unless resource[:type].value == 'file'
+
+      attr = resource[:tokens].select do |t|
+        t.type == :NAME &&
+          t.value == 'ensure' &&
+          t.next_code_token.type == :FARROW
       end
+      next if attr.empty?
+
+      val_token = attr[0].next_code_token.next_code_token
+      next unless val_token.value == 'present'
+      next unless %i[NAME STRING SSTRING].include? val_token.type
+
+      notify :warning, {
+        message: 'ensure set to present on file resource',
+        line: val_token.line,
+        column: val_token.column,
+        token: val_token,
+        resource: resource,
+      }
     end
   end
 
   def fix(problem)
-    target_attr = problem[:resource][:tokens].select { |t| t.type == :NAME && \
-                                                           t.value == 'target' && \
-                                                           t.next_code_token.type == :FARROW }
-    if target_attr.empty?
-      problem[:token].value = 'file'
-    else
-      problem[:token].value = 'link'
+    target_attr = problem[:resource][:tokens].select do |t|
+      t.type == :NAME &&
+        t.value == 'target' &&
+        t.next_code_token.type == :FARROW
     end
+    problem[:token].value = if target_attr.empty?
+                              'file'
+                            else
+                              'link'
+                            end
   end
 end

data/spec/puppet-lint/plugins/check_file_ensure/check_file_ensure_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe 'file_ensure' do
-  let (:msg) { 'ensure set to present on file resource' }
+  let(:msg) { 'ensure set to present on file resource' }
 
   context 'with fix disabled' do
     context 'correct file resource declarations' do
-      let (:code) {
+      let(:code) do
         <<-EOS
         file { '/etc/sudoers':
           ensure => file,
@@ -20,15 +20,15 @@ describe 'file_ensure' do
           ensure => $present,
         }
         EOS
-      }
+      end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
 
     context 'wrong file resource declarations' do
-      let (:code) {
+      let(:code) do
         <<-EOS
         file { '/etc/sudoers':
           ensure => present,
@@ -43,13 +43,13 @@ describe 'file_ensure' do
           ensure => $present,
         }
         EOS
-      }
+      end
 
-      it 'should detect problems' do
+      it 'detects problems' do
         expect(problems).to have(2).problems
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(2).in_column(21)
         expect(problems).to contain_warning(msg).on_line(6).in_column(21)
       end
@@ -66,7 +66,7 @@ describe 'file_ensure' do
     end
 
     context 'correct file resource declarations' do
-      let (:code) {
+      let(:code) do
         <<-EOS
         file { '/etc/sudoers':
           ensure => file,
@@ -81,19 +81,19 @@ describe 'file_ensure' do
           ensure => $present,
         }
         EOS
-      }
+      end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end
 
     context 'wrong file resource declarations' do
-      let (:code) {
+      let(:code) do
         <<-EOS
         file { '/etc/sudoers':
           ensure => present,
@@ -108,20 +108,20 @@ describe 'file_ensure' do
           ensure => $present,
         }
         EOS
-      }
+      end
 
-      it 'should detect two problems' do
+      it 'detects two problems' do
         expect(problems).to have(2).problems
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_fixed(msg).on_line(2).in_column(21)
         expect(problems).to contain_fixed(msg).on_line(6).in_column(21)
       end
 
-      it 'should fix the ensure parameter' do
+      it 'fixes the ensure parameter' do
         expect(manifest).to eq(
-          <<-EOS
+          <<-EOS,
         file { '/etc/sudoers':
           ensure => file,
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-file_ensure-check
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
@@ -16,104 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.1
 description: "    A puppet-lint plugin to check the ensure attribute on file resources.\n"
 email: voxpupuli@groups.io
 executables: []
@@ -137,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -148,6 +84,4 @@ rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: A puppet-lint plugin to check the ensure attribute on file resources.
-test_files:
-- spec/puppet-lint/plugins/check_file_ensure/check_file_ensure_spec.rb
-- spec/spec_helper.rb
+test_files: []