puppet-lint-unquoted_string-check 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291b64ffce98ef8d006f793f70313b4e12447a0f
-  data.tar.gz: 177deb1ca1f4df8bd46eddda2438da2ead2c91d8
+  metadata.gz: 40bb27f1ef50991d0fbdf1d76f5e4d5071e3c720
+  data.tar.gz: f7ed70c0b3c8e374ba3f42018a2ce43d40606348
 SHA512:
-  metadata.gz: 2669575654bb0f7952d7acc64444f104a2b5c1330b5eb0dde5da50a36e665104b1dd58de47c8e24457095c9ed5d2e3259c8cd1089902967741dba2c51dc0c250
-  data.tar.gz: bcb7f8f6413520d8b0b273b88cf4c1f4f1a06ba635b6418415a0c9dbf4d3186c0e5049899778d3b7e24efce2d4af00823c59da7488fa800a429fe72a37da19c1
+  metadata.gz: e2266dcab6a9cfc29b5e9e9b09514106ba8fd52ed7b250b008395de1bb596f3eea96f7a5c90e618d79b161ae68963c2e8bc13e652791e370c0b07a7fe3d8978c
+  data.tar.gz: dcbb50f022a8c71a1e093d3cd25c4b39c4f92b5e1d288c1bc1ffeaa9693fd7a8007ec9fec2ac5be4637550d86052eb8ef4ee970db3fd3ab4779c474aad1c4256

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

@@ -35,6 +35,34 @@ PuppetLint.new_check(:unquoted_string_in_case) do
       end
     end
   end 
+
+  def fix(problem)
+    case_indexes = []
+
+    tokens.each_index do |token_idx|
+      if tokens[token_idx].type == :CASE
+        depth = 0
+        tokens[(token_idx + 1)..-1].each_index do |case_token_idx|
+          idx = case_token_idx + token_idx + 1
+          if tokens[idx].type == :LBRACE
+            depth += 1
+          elsif tokens[idx].type == :RBRACE
+            depth -= 1
+            if depth == 0
+              case_indexes << {:start => token_idx, :end => idx}
+              break
+            end
+          end
+        end
+      end
+    end
+
+    case_indexes.each do |kase|
+      case_tokens = tokens[kase[:start]..kase[:end]]
+
+      case_tokens.index { |r| r.type = :SSTRING if r.type == :NAME || r.type == :CLASSREF }
+    end
+  end
 end
 
 PuppetLint.new_check(:unquoted_string_in_selector) do
@@ -72,4 +100,32 @@ PuppetLint.new_check(:unquoted_string_in_selector) do
       end
     end
   end 
+
+  def fix(problem)
+    qmark_indexes = []
+
+    tokens.each_index do |token_idx|
+      if tokens[token_idx].type == :QMARK
+        depth = 0
+        tokens[(token_idx + 1)..-1].each_index do |case_token_idx|
+          idx = case_token_idx + token_idx + 1
+          if tokens[idx].type == :LBRACE
+            depth += 1
+          elsif tokens[idx].type == :RBRACE
+            depth -= 1
+            if depth == 0
+              qmark_indexes << {:start => token_idx, :end => idx}
+              break
+            end
+          end
+        end
+      end
+    end
+
+    qmark_indexes.each do |kase|
+      qmark_tokens = tokens[kase[:start]..kase[:end]]
+
+      qmark_tokens.index { |r| r.type = :SSTRING if r.type == :NAME || r.type == :CLASSREF }
+    end
+  end
 end

data/spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_case_spec.rb

@@ -70,4 +70,128 @@ describe 'unquoted_string_in_case' do
       end
     end
   end
+
+  context 'with fix enabled' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    context 'quoted case' do
+      let(:code) do
+        <<-EOS
+        case $osfamily {
+          'Solaris': {
+            $rootgroup = 'wheel'
+          }
+          /(Darwin|FreeBSD)/: {
+            $rootgroup = 'wheel'
+          }
+          default: {
+            $rootgroup = 'root'
+          }
+        }
+        EOS
+      end
+
+      it 'should not detect any problems' do
+        expect(problems).to have(0).problems
+      end
+
+      it 'should not modify the manifest' do
+        expect(manifest).to eq(code)
+      end
+    end
+
+    context ':NAME in case' do
+      let(:code) do
+        <<-EOS
+        case $osfamily {
+          solaris: {
+            $rootgroup = 'wheel'
+          }
+          /(Darwin|FreeBSD)/: {
+            $rootgroup = 'wheel'
+          }
+          default: {
+            $rootgroup = 'root'
+          }
+        }
+        EOS
+      end
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the problem' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(9)
+      end
+
+      it 'should quote the case statement' do
+        expect(manifest).to eq(
+          <<-EOS
+        case $osfamily {
+          'solaris': {
+            $rootgroup = 'wheel'
+          }
+          /(Darwin|FreeBSD)/: {
+            $rootgroup = 'wheel'
+          }
+          default: {
+            $rootgroup = 'root'
+          }
+        }
+          EOS
+        )
+      end
+    end
+
+    context ':CLASSREF in case' do
+      let(:code) do
+        <<-EOS
+        case $osfamily {
+          Solaris: {
+            $rootgroup = 'wheel'
+          }
+          /(Darwin|FreeBSD)/: {
+            $rootgroup = 'wheel'
+          }
+          default: {
+            $rootgroup = 'root'
+          }
+        }
+        EOS
+      end
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the problem' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(9)
+      end
+
+      it 'should quote the case statement' do
+        expect(manifest).to eq(
+          <<-EOS
+        case $osfamily {
+          'Solaris': {
+            $rootgroup = 'wheel'
+          }
+          /(Darwin|FreeBSD)/: {
+            $rootgroup = 'wheel'
+          }
+          default: {
+            $rootgroup = 'root'
+          }
+        }
+          EOS
+        )
+      end
+    end
+  end
 end

data/spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_selector_spec.rb

@@ -52,4 +52,98 @@ describe 'unquoted_string_in_selector' do
       end
     end
   end
+
+  context 'with fix enabled' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    context 'quoted case' do
+      let(:code) do
+        <<-EOS
+        $rootgroup = $osfamily ? {
+          'Solaris'          => 'wheel',
+          /(Darwin|FreeBSD)/ => 'wheel',
+          default            => 'root',
+        }
+        EOS
+      end
+
+      it 'should not detect any problems' do
+        expect(problems).to have(0).problems
+      end
+
+      it 'should not modify the manifest' do
+        expect(manifest).to eq(code)
+      end
+    end
+
+    context ':NAME in case' do
+      let(:code) do
+        <<-EOS
+        $rootgroup = $osfamily ? {
+          solaris            => 'wheel',
+          /(Darwin|FreeBSD)/ => 'wheel',
+          default            => 'root',
+        }
+        EOS
+      end
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the problem' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(32)
+      end
+
+      it 'should quote the case statement' do
+        expect(manifest).to eq(
+          <<-EOS
+        $rootgroup = $osfamily ? {
+          'solaris'            => 'wheel',
+          /(Darwin|FreeBSD)/ => 'wheel',
+          default            => 'root',
+        }
+          EOS
+        )
+      end
+    end
+
+    context ':CLASSREF in case' do
+      let(:code) do
+        <<-EOS
+        $rootgroup = $osfamily ? {
+          Solaris            => 'wheel',
+          /(Darwin|FreeBSD)/ => 'wheel',
+          default            => 'root',
+        }
+        EOS
+      end
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the problem' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(32)
+      end
+
+      it 'should quote the case statement' do
+        expect(manifest).to eq(
+          <<-EOS
+        $rootgroup = $osfamily ? {
+          'Solaris'            => 'wheel',
+          /(Darwin|FreeBSD)/ => 'wheel',
+          default            => 'root',
+        }
+          EOS
+        )
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-unquoted_string-check
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mickaël Canévet