puppet-lint 0.0.4 → 0.0.5

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Tim Sharpe
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,6 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+task :default => :test
+
+RSpec::Core::RakeTask.new(:test)

data/lib/puppet-lint.rb

@@ -5,7 +5,7 @@ require 'puppet'
 class PuppetLint::NoCodeError < StandardError; end
 
 class PuppetLint
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   attr_reader :code, :file
 

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

@@ -20,7 +20,9 @@ class PuppetLint::Plugins::CheckResources < PuppetLint::CheckPlugin
         end
 
         # gather a list of start and end indexes for resource attribute blocks
-        resource_indexes << {:start => token_idx+1, :end => tokens[token_idx+1..-1].index { |r| [:SEMIC, :RBRACE].include? r.first }+token_idx}
+        if tokens[token_idx+1].first != :LBRACE
+          resource_indexes << {:start => token_idx+1, :end => tokens[token_idx+1..-1].index { |r| [:SEMIC, :RBRACE].include? r.first }+token_idx}
+        end
       end
     end
 

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

@@ -18,6 +18,7 @@ class PuppetLint::Plugins::CheckStrings < PuppetLint::CheckPlugin
           unless variable_found
             warn "double quoted string containing no variables on line #{line_no}"
           end
+          line = line[line.index('"', line.index('"')+1)..-1]
         end
       end
 

data/puppet-lint.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'puppet-lint'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.homepage = 'https://github.com/rodjek/puppet-lint/'
   s.summary = 'Ensure your Puppet manifests conform with the Puppetlabs style guide'
   s.description = 'Checks your Puppet manifests against the Puppetlabs
@@ -16,8 +16,13 @@ Gem::Specification.new do |s|
     'lib/puppet-lint/plugins.rb',
     'lib/puppet-lint.rb',
     'lib/tasks/puppet-lint.rake',
+    'LICENSE',
     'puppet-lint.gemspec',
+    'Rakefile',
     'README.md',
+    'spec/puppet-lint/check_resources_spec.rb',
+    'spec/puppet-lint/check_strings_spec.rb',
+    'spec/spec_helper.rb',
   ]
 
   s.add_development_dependency 'rspec'

data/spec/puppet-lint/check_resources_spec.rb

@@ -0,0 +1,145 @@
+require 'spec_helper'
+
+describe PuppetLint::Plugins::CheckResources do
+  subject do
+    klass = described_class.new
+    klass.test(code)
+    klass
+  end
+
+  describe '3 digit file mode' do
+    let(:code) { "file { 'foo': mode => 777 }" }
+
+    its(:warnings) { should include "mode should be represented as a 4 digit octal value on line 1" }
+    its(:errors) { should be_empty }
+  end
+
+  describe '4 digit file mode' do
+    let(:code) { "file { 'foo': mode => '0777' }" }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'ensure as only attr in a single line resource' do
+    let(:code) { "file { 'foo': ensure => present }" }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'ensure as only attr in a multi line resource' do
+    let(:code) { "
+      file { 'foo':
+        ensure => present,
+      }"
+    }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'ensure as second attr in a multi line resource' do
+    let(:code) { "
+      file { 'foo':
+        mode   => '0000',
+        ensure => present,
+      }"
+    }
+
+    its(:warnings) { should include "ensure found on line 4 but it's not the first attribute" }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'ensure as first attr in a multi line resource' do
+    let(:code) { "
+      file { 'foo':
+        ensure => present,
+        mode   => '0000',
+      }"
+    }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'quoted resource title on single line resource' do
+    let(:code) { "file { 'foo': }" }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'unquoted resource title on single line resource' do
+    let(:code) { "file { foo: }" }
+
+    its(:warnings) { should include "unquoted resource title on line 1" }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'quoted resource title on multi line resource' do
+    let(:code) { "
+      file { 'foo':
+      }"
+    }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'unquoted resource title on multi line resource' do
+    let(:code) { "
+      file { foo:
+      }"
+    }
+
+    its(:warnings) { should include "unquoted resource title on line 2" }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'condensed resources with quoted titles' do
+    let(:code) { "
+      file {
+        'foo': ;
+        'bar': ;
+      }"
+    }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'condensed resources with an unquoted title' do
+    let(:code) { "
+      file {
+        'foo': ;
+        bar: ;
+      }"
+    }
+
+    its(:warnings) { should include "unquoted resource title on line 4" }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'single line resource with an array of titles (all quoted)' do
+    let(:code) { "file { ['foo', 'bar']: }" }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'resource inside a case statement' do
+    let(:code) { "
+      case $ensure {
+        'absent': {
+          file { \"some_file_${name}\":
+            ensure => absent,
+          }
+        }
+      }"
+    }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+end

data/spec/puppet-lint/check_strings_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe PuppetLint::Plugins::CheckStrings do
+  subject do
+    klass = described_class.new
+    klass.test(code)
+    klass
+  end
+
+  describe 'double quoted string containing a variable insinde single quotes' do
+    let(:code) { "exec { \"/usr/bin/wget -O - '${source}' | /usr/bin/apt-key add -\": }" }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'multiple strings in a line' do
+    let(:code) { "\"aoeu\" '${foo}'" }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should include "single quoted string containing a variable found on line 1" }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'puppet-lint'
+
+#class PuppetLint::Warning < Exception; end
+#class PuppetLint::Error < Exception; end
+#PuppetLint::CheckPlugin.any_instance.stub(:warn) do |arg|
+#  raise PuppetLint::Warning
+#end
+
+#PuppetLint::CheckPlugin.any_instance.stub(:error) do |arg|
+#  raise PuppetLint::Error
+#end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-lint
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 Z
+date: 2011-08-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -50,8 +50,13 @@ files:
 - lib/puppet-lint/plugins.rb
 - lib/puppet-lint.rb
 - lib/tasks/puppet-lint.rake
+- LICENSE
 - puppet-lint.gemspec
+- Rakefile
 - README.md
+- spec/puppet-lint/check_resources_spec.rb
+- spec/puppet-lint/check_strings_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/rodjek/puppet-lint/
 licenses: []