puppet-lint-legacy_facts-check 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b882589a54a6bf4e353d926c036211ccd1a354eba43902cef5fa9596978e6be
-  data.tar.gz: 6fd9ce9d4330c000b0e68261522a78770678c544db6c5f35c83547cf5524247b
+  metadata.gz: 90c39fb6507da85f5d4bcd1d17587a2bdfb210fe0519c614cc2832bd04d5fda4
+  data.tar.gz: 6312725c235f5e05212b5897b47a327557e40d6a674317dacda10c4fdd7c094a
 SHA512:
-  metadata.gz: 1bac5d13a682d9ba27723624d547a9452df2c6f64fd0b71b3b9ea0250bd31f2e02dcd5cf4766ba99591d0eaa6c9c5d2fc1c8676d53062a0c946c697ea39c2522
-  data.tar.gz: 37782343cfba21ca9105ce72617c2c0ee0ad6513dce8336f1f6b45cb9dda9ae96d5a9cb148bd8a0d5dd4b7923521451a0219f1635c11a531364d11395d022625
+  metadata.gz: fb8cecf281e0eb2d27fe46b29de3812c4ad89ef36498cb416ef3c536cd6acaeb4e8d8a7974c3d49e26264d7c610b1d61e735bc848b507251f039780926f94b6a
+  data.tar.gz: 8797b37fef673e69b04d139f2e2fb93d53d80706b60591e41e114091bd41adfc6b8b74989c8c9b05fffe1bcdf87b2ad6b6b3e542ada20f053ed513d6fd6d1427

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

@@ -102,6 +102,9 @@ PuppetLint.new_check(:legacy_facts) do
   end
 
   def fix(problem)
+    # This probably should never occur, but if it does then bail out:
+    raise PuppetLint::NoFix if problem[:token].raw and problem[:token].value != problem[:token].raw
+
     if problem[:token].value.start_with?('::') then
       fact_name = problem[:token].value.sub(/^::/, '')
     elsif problem[:token].value.start_with?("facts['") then
@@ -126,5 +129,7 @@ PuppetLint.new_check(:legacy_facts) do
         problem[:token].value = "facts['solaris_zones']['zones']['" << m['name'] << "']['" << m['attribute'] << "']"
       end
     end
+
+    problem[:token].raw = problem[:token].value unless problem[:token].raw.nil?
   end
 end

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

@@ -90,6 +90,14 @@ describe 'legacy_facts' do
         expect(problems).to have(1).problem
       end
     end
+
+    context "fact variable in interpolated string \"${::osfamily}\"" do
+      let(:code) { '"start ${::osfamily} end"' }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+    end
   end
 
 
@@ -251,5 +259,17 @@ describe 'legacy_facts' do
         expect(manifest).to eq("$facts['ssh']['rsa']['key']")
       end
     end
+
+    context "fact variable in interpolated string \"${::osfamily}\"" do
+      let(:code) { '"start ${::osfamily} end"' }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should use the facts hash' do
+        expect(manifest).to eq('"start '"${facts['os']['family']}"' end"')
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-legacy_facts-check
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark McKinstry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint