puppet-lint-legacy_facts-check 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzMwOGE1YmM4ZWI4ODExNTA1ZGZmYTc2ZDcwNWEyMDA3MmY2NGFkNg==
+    OTM0ZDNlZDRmMzk4MzVkYzMzNDJmMzA5YTEzNDNkOTI1M2FkMzI3YQ==
   data.tar.gz: !binary |-
-    OTZmMWQxNTgyZDA2YmZmODI5NTAyMTQyNDA3MWQwMjIxNDA5Y2NhOA==
+    NTc3MTg5NWQ3MmQwMTA3M2I3NGUwNTNkOGE4ZjQxNDI2NjM0MDQ2MA==
 SHA512:
   metadata.gz: !binary |-
-    OGM4ZjI1M2M3NmZkMTYxNGZlZGJkNmFlZjBjZGI0NDI3ODJlYTVkNDlkNGEw
-    YmMzNzBkMWEwYzdhYjU3M2VjNDc0MWMzMjY1NDllM2I3YjAwNWZhOWQzZTNj
-    MTdmNDI0MmE3ZDYwM2ExZWY5ZmY4OWE5MzBlZGUzNDlmODY5OWI=
+    OTgyZDM1MzQwODEzYjBjYjQwOWQ5Y2I1OGY1M2Y5MTg5ZWFjYmU4OGYxYzhk
+    OGQ2NGIyNWM1ODY4OWVmNDlmZTg3MTdjNGVhMDMxNDQwYzkwMTljMTU5NTc2
+    ZWMyZjFkZGY0MGRlOGMyN2Y5MDY0NDRhYzAyM2Q1YTJhODM0ZWU=
   data.tar.gz: !binary |-
-    YTViODU4MTU3ZDIzNTliOGMwMGEyYzhkZWVlYTIyMTQxOTgxMzE3ZTA5NDI0
-    YjljNzViODZmMjA2ZTI1MGY2N2ZiZTAxNjhiNWU2ZTI5ZmNkYzQyOGNhY2Zi
-    ZGMzY2I5MGY0NTMyYjViYTljZWNmMjhmY2ZiNmJiOGUzNThmMzk=
+    M2I4Y2I4YjU2MDY2YWEyNjRjZDFmZTkwMTA4ODhjODVmYmVjMWU3ZDQ2NWMz
+    ZWVlZjliY2Y0YmY5ZTQyNjgzNWJlMTU2ZWJlNzg1Y2QzYmJjNTEwNTJlYzMy
+    MzA4YzlhMTliYjI4MGM0MGY4YzcwZmI4YTNjYjBiNmIwYzc1NzY=

data/README.md

@@ -1,11 +1,68 @@
 [![Build Status](https://travis-ci.org/mmckinst/puppet-lint-legacy_facts-check.svg?branch=master)](https://travis-ci.org/mmckinst/puppet-lint-legacy_facts-check)
 [![Gem](https://img.shields.io/gem/v/puppet-lint-legacy_facts-check.svg?maxAge=2592000)](https://rubygems.org/gems/puppet-lint-legacy_facts-check)
 
+## Overview
+
 A pupet-lint to check you are not using legacy facts like `$::operatingsystem`
 or `$facts['operatingsystem']`. You should use the new structured facts like
 `$facts['os']['name']` instead
 
-## Overview
+## Installing
+
+### From the command line
+
+```shell
+$ gem install puppet-lint-legacy_facts-check
+```
+
+### In a Gemfile
+
+```ruby
+gem 'puppet-lint-legacy_facts-check', :require => false
+```
+
+## Checks
+
+#### What you have done
+
+```puppet
+$package_name = $::operatingsystem {
+  'CentOS' => 'httpd',
+  'Debian' => 'apache2',
+}
+```
+
+```puppet
+$package_name = $facts['operatingsystem'] {
+  'CentOS' => 'httpd',
+  'Debian' => 'apache2',
+}
+```
+
+#### What you should have done
+
+```puppet
+$service_name = $facts['os']['name'] {
+  'CentOS' => 'httpd',
+  'Debian' => 'apache2',
+}
+```
+
+#### Disabling the check
+
+To disable this check, you can add `--no-legacy_facts` to your puppet-lint
+command line.
+
+```shell
+$ puppet-lint --no-legacy_facts path/to/file.pp
+```
+
+Alternatively, if you’re calling puppet-lint via the Rake task, you should
+insert the following line to your `Rakefile`.
+
+```ruby
+PuppetLint.configuration.send('disable_legacy_facts')
+```
 
 ## Limitations
 
@@ -108,63 +165,6 @@ This can be duplicated using the following string:
 `"$facts['ssh']['rsa']['fingerprints']['sha1']
 $facts['ssh']['rsa']['fingerprints']['sha256']"`
 
-## Installing
-
-### From the command line
-
-```shell
-$ gem install puppet-lint-legacy_facts-check
-```
-
-### In a Gemfile
-
-```ruby
-gem 'puppet-lint-legacy_facts-check', :require => false
-```
-
-## Checks
-
-#### What you have done
-
-```puppet
-$package_name = $::operatingsystem {
-  'CentOS' => 'httpd',
-  'Debian' => 'apache2',
-}
-```
-
-```puppet
-$package_name = $facts['operatingsystem'] {
-  'CentOS' => 'httpd',
-  'Debian' => 'apache2',
-}
-```
-
-#### What you should have done
-
-```puppet
-$service_name = $facts['os']['name'] {
-  'CentOS' => 'httpd',
-  'Debian' => 'apache2',
-}
-```
-
-#### Disabling the check
-
-To disable this check, you can add `--no-legacy_facts` to your puppet-lint
-command line.
-
-```shell
-$ puppet-lint --no-legacy_facts path/to/file.pp
-```
-
-Alternatively, if you’re calling puppet-lint via the Rake task, you should
-insert the following line to your `Rakefile`.
-
-```ruby
-PuppetLint.configuration.send('disable_legacy_facts')
-```
-
 ## License
 
 ```

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

@@ -84,7 +84,12 @@ PuppetLint.new_check(:legacy_facts) do
   }
   def check
     tokens.select { |x| x.type == :VARIABLE}.each do |token|
-      fact_name = token.value.sub(/^(::)?(facts|trusted)?\[?['"]?/, '').sub(/['"]?\]?$/ ,'')
+      fact_name = ''
+      if token.value.start_with?('::') then
+        fact_name = token.value.sub(/^::/, '')
+      elsif token.value.start_with?('facts[') then
+        fact_name = token.value.match(/facts\['(.*)'\]/)[1]
+      end
       if EASY_FACTS.include?(fact_name) or UNCONVERTIBLE_FACTS.include?(fact_name) or fact_name.match(Regexp.union(REGEX_FACTS)) then
         notify :warning, {
           :message => 'legacy fact',
@@ -97,7 +102,11 @@ PuppetLint.new_check(:legacy_facts) do
   end
 
   def fix(problem)
-    fact_name = problem[:token].value.sub(/^(::)?(facts|trusted)?\[?['"]?/, '').sub(/['"]?\]?$/ ,'')
+    if problem[:token].value.start_with?('::') then
+      fact_name = problem[:token].value.sub(/^::/, '')
+    elsif problem[:token].value.start_with?('facts[') then
+      fact_name = problem[:token].value.match(/facts\['(.*)'\]/)[1]
+    end
     if EASY_FACTS.include?(fact_name)
       problem[:token].value = EASY_FACTS[fact_name]
     elsif fact_name.match(Regexp.union(REGEX_FACTS))

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

@@ -11,16 +11,16 @@ describe 'legacy_facts' do
       end
     end
 
-    context "fact variable using legacy $facts['osfamily']" do
-      let(:code) { "$facts['osfamily']" }
+    context "fact variable using legacy $osfamily" do
+      let(:code) { "$osfamily" }
 
       it 'should only detect a single problem' do
-        expect(problems).to have(1).problem
+        expect(problems).to have(0).problem
       end
     end
 
-    context "fact variable using legacy $osfamily" do
-      let(:code) { "$osfamily" }
+    context "fact variable using legacy $facts['osfamily']" do
+      let(:code) { "$facts['osfamily']" }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -102,24 +102,16 @@ describe 'legacy_facts' do
       end
     end
 
-    context "fact variable using legacy $facts['osfamily']" do
-      let(:code) { "$facts['osfamily']" }
+    context "fact variable using legacy $osfamily" do
+      let(:code) { "$osfamily" }
 
       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(1)
-      end
-
-      it 'should use the facts hash' do
-        expect(manifest).to eq("$facts['os']['family']")
+        expect(problems).to have(0).problem
       end
     end
 
-    context "fact variable using legacy $osfamily" do
-      let(:code) { "$osfamily" }
+    context "fact variable using legacy $facts['osfamily']" do
+      let(:code) { "$facts['osfamily']" }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -132,7 +124,6 @@ describe 'legacy_facts' do
       it 'should use the facts hash' do
         expect(manifest).to eq("$facts['os']['family']")
       end
-
     end
 
     context "fact variable using legacy $::osfamily" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-legacy_facts-check
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mark McKinstry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint