puppet-lint-racism_terminology-check 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4528e23b9efcaa3ba1a21367a4e54c14c2a2aca8
-  data.tar.gz: 4eb78af7211badb530710c2e936d4c2a7c6b45ff
+  metadata.gz: a91aff3c2a51b66db807699b59e7cc700a239a5b
+  data.tar.gz: e1d217beae733167aeedda26a7f2208a4e8d7a32
 SHA512:
-  metadata.gz: ade22d5d2d64138ab9902b2e7901f96a6c042c14ce140bb3ae67efa97a36ea4868052a0d0c689732734c8ae1d72a9dc3c9fe137ec7db1ddd5259668261d97af5
-  data.tar.gz: 9a84d4f719a0fc8ade947606be1cbb607c4bb9742ce359795791f8c08684d7d224656fcc26d7987c2bec41d8a8766a360b43ac98e7acfcd5503022f4ca94fd66
+  metadata.gz: 763979051f930ebaf4b858b665dddbfc5ce9bc4b0114c744d92c2383289b625ce83d1e6e0b86ab5941aaed986e4e1d37e92044e59b98c9e0b78c2f390042d743
+  data.tar.gz: c405ef5bbdc89398bb110a142f90a2f0d169a7d18079a99f32b86200fcc4ef330e067b77e2ed4b55f8846bffae49c852c86cb2598b0657a081e4f1b9dfcbe7b0

data/README.md

@@ -2,7 +2,7 @@
 
 A puppet-lint extension that offers warnings when you include words that
 have a racist history: 'master/slave', 'whitelist/blacklist', for
-starters.  See: <https://datatracker.ietf.org/doc/draft-knodel-terminology/13/>
+starters.  See: <https://www.ietf.org/archive/id/draft-knodel-terminology-13.txt>
 
 This check will not match against URL's. This is by design to not flag
 for every comment that may contain a github link to a repo using

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 PuppetLint.new_check(:racism_terminology) do
   # rubocop:disable Style/Next
   def check
     manifest_lines.each_with_index do |line, idx|
-      if line =~ /\b(master|slave)\b/ && line !~ URI::DEFAULT_PARSER.make_regexp
+      if line =~ /(\b|-|_)(master|slave)(\b|-|_)/ && line !~ %r{http(s)?://}
         notify(
           :warning,
           message: 'master/slave terminology, perhaps leader/follower?',
@@ -11,7 +13,7 @@ PuppetLint.new_check(:racism_terminology) do
         )
       end
 
-      if line =~ /\b(blacklist|whitelist)\b/ && line !~ URI::DEFAULT_PARSER.make_regexp
+      if line =~ /(\b|-|_)(blacklist|whitelist)(\b|-|_)/ && line !~ %r{http(s)?://}
         notify(
           :warning,
           message: 'blacklist/whitelist terminology, perhaps blocklist/approvelist?',

data/spec/puppet-lint/plugins/check_racism_terminology_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'racism_terminology' do
@@ -27,6 +29,48 @@ describe 'racism_terminology' do
     end
   end
 
+  context 'slave in code as param' do
+    let(:code) do
+      <<-PP
+        redis::instance { $redis_server_name:
+          cluster_slave_validity_factor => 1,
+          hash => {
+            'slave' => true,
+          }
+        }
+      PP
+    end
+    let(:msg) { 'master/slave terminology, perhaps leader/follower?' }
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(msg).on_line(2)
+      expect(problems).to contain_warning(msg).on_line(4)
+    end
+  end
+
+  context 'slave in code comments' do
+    let(:code) do
+      <<-PP
+        # @summary this is slave code
+        file { 'foo': ensure => 'present' }
+      PP
+    end
+    let(:msg) { 'master/slave terminology, perhaps leader/follower?' }
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(msg).on_line(1)
+    end
+  end
+
+  context 'slave in code' do
+    let(:code) { 'include slave' }
+    let(:msg) { 'master/slave terminology, perhaps leader/follower?' }
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(msg).on_line(1)
+    end
+  end
+
   context 'slave' do
     let(:code) { "file { '/tmp/slave': }" }
     let(:msg) { 'master/slave terminology, perhaps leader/follower?' }
@@ -54,12 +98,28 @@ describe 'racism_terminology' do
     end
   end
 
+  context 'master in code as param' do
+    let(:code) do
+      <<-PP
+      selinux::permissive { 'allow-postfix_master_t':
+        seltype => 'postfix_master_t',
+      }
+      PP
+    end
+    let(:msg) { 'master/slave terminology, perhaps leader/follower?' }
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(msg).on_line(1)
+      expect(problems).to contain_warning(msg).on_line(2)
+    end
+  end
+
   context 'master in a URL' do
-      let(:code) { '# Some URL example.com/master/' }
-      let(:msg) { 'url testing' }
+    let(:code) { '# Some URL example.com/master/' }
+    let(:msg) { 'url testing' }
 
-      it 'should not create a warning' do
-        expect(problems).not_to contain_warning
-      end
+    it 'should not create a warning' do
+      expect(problems).not_to contain_warning
     end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet-lint'
 
 PuppetLint::Plugins.load_spec_helper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-racism_terminology-check
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Tim Skirvin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint