puppet-lint-global_resource-check 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77994a51ca8467d8a0845d8ade3d37d4cdc7f538
-  data.tar.gz: d9bd060093957e2b9d981ff0aa66fa81e1825bfe
+  metadata.gz: e3340a27869cec4a76dc1db589d2bd788987bc86
+  data.tar.gz: 0023d95f505828fc2eaf8a33c570f60f8cb2f1f2
 SHA512:
-  metadata.gz: 2d19e3c5a8a203d07a23c1fb302838a3a3a42c5edbbe89af1fdfd7dad98fe27abc2b5672ddc7969c0837ed2a1e4703a94396caded0b45922082e96c1abb20fa8
-  data.tar.gz: 11bdec57f50c953c8f6e324425ae9239bfe4c35a5645ade892ff48d646fea1b0d333ef90586e00bf10fcc6ed93767f3defcbd9cd841a5ac08b0767a7ae491f26
+  metadata.gz: 4a004b21c5f162e7d0db6b03c44b34870b37a07b75b0b120938231b74e12bd478991442b55b5fe4e2587728b193713625f9c9193764a23814d4d2b592caf8dba
+  data.tar.gz: cd9e1fe6442f7cd1cd4d8d66c3eb73eeb549d79e2057c5ae21221d669259703f4a737c0190ceaaeefd6b9416edcc5e51145f8846d1afe3901b8907e9c4fbd7fb

data/README.md

@@ -1,6 +1,7 @@
 # puppet-lint global resource check
 
 [![Build Status](https://travis-ci.org/ninech/puppet-lint-global_resource-check.svg?branch=master)](https://travis-ci.org/ninech/puppet-lint-global_resource-check)
+[![Gem Version](https://badge.fury.io/rb/puppet-lint-global_resource-check.svg)](https://badge.fury.io/rb/puppet-lint-global_resource-check)
 
 ## Installation
 
@@ -8,13 +9,13 @@ To use this plugin, add the following like to the Gemfile in your Puppet code
 base and run `bundle install`.
 
 ```ruby
-gem 'puppet-lint-global_resource-check', '~> '0.3.0'
+gem 'puppet-lint-global_resource-check', '~> 0.3.0'
 ```
 
 For puppet-lint version 1.1
 
 ```ruby
-gem 'puppet-lint-global_resource-check', '~> '0.2.0'
+gem 'puppet-lint-global_resource-check', '~> 0.2.0'
 ```
 
 ## Usage

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

@@ -1,47 +1,43 @@
 PuppetLint.new_check(:global_resource) do
   def check
+    @secure = secure_ranges
 
+    check_for_global_resources
+    check_for_global_includes
+  end
+
+  def secure_ranges
     secure = []
 
     class_indexes.each { |c| secure << [c[:start], c[:end]] }
     defined_type_indexes.each { |d| secure << [d[:start], d[:end]] }
     node_indexes.each { |n| secure << [n[:start], n[:end]] }
 
+    secure
+  end
+
+  def check_for_global_resources
     resource_indexes.each do |r|
-      encap = 0
-      secure.each do |s|
-        if s[0] < r[:start] and s[1] > r[:end]
-          encap = 1
-        end
-      end
-      next if encap == 1
-
-      notify(:error, {
-        :message => "Resource #{r[:type].value} in global space",
-        :line => r[:type].line,
-        :column => r[:type].column,
-      })
+      next if @secure.any? { |s| s[0] < r[:start] && s[1] > r[:end] }
+
+      notify :error,
+             message: "Resource #{r[:type].value} in global space",
+             line: r[:type].line,
+             column: r[:type].column
     end
+  end
 
+  def check_for_global_includes
     tokens.each_index do |i|
       token = tokens[i]
-      next unless token.type == :NAME and token.value == 'include'
-
-      encap= 0
-      secure.each do |s|
-        if s[0] < i and s[1] > i
-          encap = 1
-        end
-      end
-      next if encap == 1
-
-      notify(:error, {
-        :message => "include #{token.next_code_token.value} in global space",
-        :line => token.line,
-        :column => token.column,
-      })
-    end
+      next unless token.type == :NAME && token.value == 'include'
 
-  end
+      next if @secure.any? { |s| s[0] < i && s[1] > i }
 
+      notify :error,
+             message: "include #{token.next_code_token.value} in global space",
+             line: token.line,
+             column: token.column
+    end
+  end
 end

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

@@ -1,15 +1,9 @@
 require 'spec_helper'
 
 describe 'global_resource' do
-
-  before do
-    # Bugfix/Workaround for https://github.com/rodjek/puppet-lint/pull/569
-    PuppetLint::Data.instance_variable_set '@node_indexes', nil
-  end
-  
   context 'just a class' do
     let(:code) { "class test { file { 'file': } }" }
-    
+
     it 'should not detect any problems' do
       expect(problems).to have(0).problems
     end
@@ -32,7 +26,9 @@ describe 'global_resource' do
   end
 
   context 'global file' do
-    let(:code) { "file { 'file': } define test ($param = undef) { file { 'file': } }" }
+    let(:code) do
+      "file { 'file': } define test ($param = undef) { file { 'file': } }"
+    end
 
     it 'should detect a problem' do
       expect(problems).to have(1).problems
@@ -43,8 +39,7 @@ describe 'global_resource' do
     let(:code) { "class test { file { 'file': } } \ninclude class" }
 
     it 'should detect a problem' do
-        expect(problems).to have(1).problems
+      expect(problems).to have(1).problems
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,3 +1,12 @@
 require 'puppet-lint'
+require 'simplecov'
+require 'simplecov-console'
 
 PuppetLint::Plugins.load_spec_helper
+
+SimpleCov.formatter = SimpleCov::Formatter::Console
+SimpleCov.start do
+  add_filter '/spec'
+  add_filter '.bundle'
+  add_filter '/vendor'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-global_resource-check
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Marius Rieder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-json_expectations
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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-console
+  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'
 description: "    Extends puppet-lint to ensure that your manifests have no global
   resources.\n"
 email: marius.rieder@nine.ch
@@ -116,5 +158,5 @@ signing_key:
 specification_version: 4
 summary: puppet-lint global_resource check
 test_files:
-- spec/puppet-lint/plugins/check_global_resource_spec.rb
 - spec/spec_helper.rb
+- spec/puppet-lint/plugins/check_global_resource_spec.rb