puppet-lint 0.3.1 → 0.3.2

data/lib/puppet-lint.rb

@@ -39,7 +39,7 @@ rescue
       if a.empty?
         string
       else
-        Percent.bind(string).call(*a, &b)
+        Percent.bind(string).call(a, &b)
       end
 
     end

data/lib/puppet-lint/bin.rb

@@ -67,10 +67,14 @@ class PuppetLint::Bin
       end
 
       opts.load('/etc/puppet-lint.rc')
-      opts.load(File.expand_path('~/.puppet-lint.rc'))
-      if opts.load(File.expand_path('~/.puppet-lintrc'))
-        $stderr.puts 'Depreciated: Found ~/.puppet-lintrc instead of ~/.puppet-lint.rc'
+
+      if ENV['HOME']
+        opts.load(File.expand_path('~/.puppet-lint.rc'))
+        if opts.load(File.expand_path('~/.puppet-lintrc'))
+          $stderr.puts 'Depreciated: Found ~/.puppet-lintrc instead of ~/.puppet-lint.rc'
+        end
       end
+
       opts.load('.puppet-lint.rc')
       if opts.load('.puppet-lintrc')
         $stderr.puts 'Depreciated: Read .puppet-lintrc instead of .puppet-lint.rc'

data/lib/puppet-lint/lexer.rb

@@ -4,7 +4,20 @@ require 'puppet-lint/lexer/token'
 require 'set'
 
 class PuppetLint
-  class LexerError < RuntimeError; end
+  class LexerError < StandardError
+    attr_reader :line_no, :column
+    def initialize(code, offset)
+      chunk = code[0..offset]
+      @line_no = chunk.count("\n") + 1
+      if @line_no == 1
+        @column = chunk.length
+      else
+        @column = chunk.length - chunk.rindex("\n") - 1
+      end
+      @column = 1 if @column == 0
+    end
+  end
+
   class Lexer
     KEYWORDS = {
       'class' => true,
@@ -126,12 +139,12 @@ class PuppetLint
             i += var_name.size + 1
 
           elsif chunk.match(/\A'(.*?)'/m)
-            str_content = StringScanner.new(code[i+1..-1]).scan_until(/(\A|\\\\|[^\\])'/m)
+            str_content = StringScanner.new(code[i+1..-1]).scan_until(/(\A|[^\\])(\\\\)*'/m)
             tokens << new_token(:SSTRING, str_content[0..-2], :chunk => code[0..i])
             i += str_content.size + 1
 
           elsif chunk.match(/\A"/)
-            str_contents = StringScanner.new(code[i+1..-1]).scan_until(/(\A|\\\\|[^\\])"/m)
+            str_contents = StringScanner.new(code[i+1..-1]).scan_until(/(\A|[^\\])(\\\\)*"/m)
             _ = code[0..i].split("\n")
             interpolate_string(str_contents, _.count, _.last.length)
             i += str_contents.size + 1
@@ -159,7 +172,7 @@ class PuppetLint
             i += mlcomment_size
 
           elsif chunk.match(/\A\/.*?\//) && possible_regex?
-            str_content = StringScanner.new(code[i+1..-1]).scan_until(/(\A|\\\\|[^\\])\//m)
+            str_content = StringScanner.new(code[i+1..-1]).scan_until(/(\A|[^\\])(\\\\)*\//m)
             tokens << new_token(:REGEX, str_content[0..-2], :chunk => code[0..i])
             i += str_content.size + 1
 
@@ -181,7 +194,7 @@ class PuppetLint
             i += 1
 
           else
-            raise PuppetLint::LexerError, chunk
+            raise PuppetLint::LexerError.new(code, i)
           end
         end
       end

data/lib/puppet-lint/plugin.rb

@@ -4,7 +4,7 @@ class PuppetLint::Checks
 
   def initialize
     @problems = []
-    @default_info = {:check => 'unknown', :linenumber => 0}
+    @default_info = {:check => 'unknown', :linenumber => 0, :column => 0}
 
     PuppetLint.configuration.checks.each do |check|
       method = PuppetLint.configuration.check_method[check]
@@ -36,7 +36,16 @@ class PuppetLint::Checks
 
   def load_data(fileinfo, data)
     lexer = PuppetLint::Lexer.new
-    @tokens = lexer.tokenise(data)
+    begin
+      @tokens = lexer.tokenise(data)
+    rescue PuppetLint::LexerError => e
+      notify :error, {
+        :message => 'Syntax error (try running `puppet parser validate <file>`)',
+        :linenumber => e.line_no,
+        :column => e.column,
+      }
+      @tokens = []
+    end
     @fileinfo = fileinfo
     @data = data
   end

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

@@ -116,8 +116,8 @@ class PuppetLint::Plugins::CheckClasses < PuppetLint::CheckPlugin
         paren_stack = []
         param_tokens.each_index do |param_tokens_idx|
           this_token = param_tokens[param_tokens_idx]
-          next_token = param_tokens[param_tokens_idx+1]
-          prev_token = param_tokens[param_tokens_idx-1]
+          next_token = this_token.next_code_token
+          prev_token = this_token.prev_code_token
 
           if this_token.type == :LPAREN
             paren_stack.push(true)

data/lib/puppet-lint/version.rb

@@ -1,3 +1,3 @@
 class PuppetLint
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/fixtures/test/manifests/malformed.pp

@@ -0,0 +1 @@
+class { 'apacheds': master => true' }

data/spec/puppet-lint/bin_spec.rb

@@ -67,6 +67,13 @@ describe PuppetLint::Bin do
     ].join("\n") }
   end
 
+  context 'when passed a malformed file' do
+    let(:args) { 'spec/fixtures/test/manifests/malformed.pp' }
+
+    its(:exitstatus) { should == 1 }
+    its(:stdout) { should == 'ERROR: Syntax error (try running `puppet parser validate <file>`) on line 1' }
+  end
+
   context 'when limited to errors only' do
     let(:args) { [
       '--error-level', 'error',

data/spec/puppet-lint/lexer_spec.rb

@@ -741,4 +741,12 @@ describe PuppetLint::Lexer do
       tokens.select { |r| r.type == :REGEX }.should == []
     end
   end
+
+  context ':STRING' do
+    it 'should parse strings with \\\\\\' do
+      expect {
+        @lexer.tokenise("exec { \"/bin/echo \\\\\\\"${environment}\\\\\\\"\": }")
+      }.to_not raise_error(PuppetLint::LexerError)
+    end
+  end
 end

data/spec/puppet-lint/plugins/check_classes/class_parameter_defaults_spec.rb

@@ -6,14 +6,39 @@ describe 'class_parameter_defaults' do
 
     its(:problems) {
       should only_have_problem({
-        :kind => :warning,
-        :message => 'parameterised class parameter without a default value',
+        :kind       => :warning,
+        :message    => 'parameterised class parameter without a default value',
         :linenumber => 1,
         :column     => 11,
       })
     }
   end
 
+  describe 'parameterised class with multiple params with a default value' do
+    let(:code) { "class foo($bar, $baz, $gronk) { }" }
+
+    its(:problems) do
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'parameterised class parameter without a default value',
+        :linenumber => 1,
+        :column     => 11,
+      })
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'parameterised class parameter without a default value',
+        :linenumber => 1,
+        :column     => 17,
+      })
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'parameterised class parameter without a default value',
+        :linenumber => 1,
+        :column     => 23,
+      })
+    end
+  end
+
   describe 'class without parameters' do
     let(:code) {"
       class myclass {

data/spec/puppet-lint_spec.rb

@@ -7,4 +7,14 @@ describe PuppetLint do
     subject.code = "class foo { }"
     subject.data.should_not be_nil
   end
+
+  it 'should have support for % with a hash' do
+    string = 'replace %{hash}' % {:hash => 'replaced'}
+    string.should match 'replace replaced'
+  end
+
+  it 'should not break regular % support' do
+    string = 'replace %s %s' % ['get','replaced']
+    string.should match 'replace get replaced'
+  end
 end

metadata

@@ -1,76 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puppet-lint
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-26 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: |-
-  Checks your Puppet manifests against the Puppetlabs
-    style guide and alerts you to any discrepancies.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "Checks your Puppet manifests against the Puppetlabs\n  style guide
+  and alerts you to any discrepancies."
 email: tim@sharpe.id.au
-executables: 
+executables:
 - puppet-lint
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -98,6 +94,7 @@ files:
 - puppet-lint.gemspec
 - spec/fixtures/test/manifests/fail.pp
 - spec/fixtures/test/manifests/init.pp
+- spec/fixtures/test/manifests/malformed.pp
 - spec/fixtures/test/manifests/warning.pp
 - spec/puppet-lint/bin_spec.rb
 - spec/puppet-lint/configuration_spec.rb
@@ -136,43 +133,34 @@ files:
 - spec/puppet-lint/plugins/check_whitespace/trailing_whitespace_spec.rb
 - spec/puppet-lint_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/rodjek/puppet-lint/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ensure your Puppet manifests conform with the Puppetlabs style guide
-test_files: 
+test_files:
 - spec/fixtures/test/manifests/fail.pp
 - spec/fixtures/test/manifests/init.pp
+- spec/fixtures/test/manifests/malformed.pp
 - spec/fixtures/test/manifests/warning.pp
 - spec/puppet-lint/bin_spec.rb
 - spec/puppet-lint/configuration_spec.rb