puppet-syntax 1.2.0 → 1.2.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+2014-07-31 Release 1.2.2
+- Check and document conflicts with puppetlabs_spec_helper <= 0.7.0
+
+2014-07-23 Release 1.2.1
+- Remove dependency on Puppet from Gemspec (for Puppet Entreprise users).
+
 2014-03-28 Release 1.2.0
 - Optional support for Puppet's future parser.
 

data/Gemfile

@@ -4,6 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 # Override gemspec for CI matrix builds.
-if ENV['PUPPET_VERSION']
-  gem 'puppet', ENV['PUPPET_VERSION']
-end
+puppet_version = ENV['PUPPET_VERSION'] || '>2.7.0'
+gem 'puppet', puppet_version

data/README.md

@@ -14,6 +14,13 @@ This should work on any version of:
 You can see the matrix of specific versions that we currently test against
 in the [TravisCI config](.travis.yml).
 
+If you're using `puppetlabs_spec_helper/rake_tasks` and getting unexpected
+non-zero exit codes then you should upgrade to [puppetlabs_spec_helper][psh]
+\>= 0.8.0 which no longer has a conflicting rake task and now depends on
+this project.
+
+[psh]: https://github.com/puppetlabs/puppetlabs_spec_helper
+
 ## Usage
 
 Include the following in your `Rakefile`:

data/Rakefile

@@ -1,6 +1,10 @@
-require "bundler/gem_tasks"
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')
 
+require 'gem_publisher'
+task :publish_gem do
+  gem = GemPublisher.publish_if_updated('puppet-syntax.gemspec', :rubygems)
+  puts "Published #{gem}" if gem
+end
+
 task :default => [:spec]

data/jenkins.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -eu
+
+rm -f Gemfile.lock
+bundle install --path "${HOME}/bundles/${JOB_NAME}"
+bundle exec rake
+bundle exec rake publish_gem

data/lib/puppet-syntax/tasks/puppet-syntax.rb

@@ -7,12 +7,26 @@ module PuppetSyntax
     def initialize(*args)
       desc 'Syntax check Puppet manifests and templates'
       task :syntax => [
+        'syntax:check_puppetlabs_spec_helper',
         'syntax:manifests',
         'syntax:templates',
         'syntax:hiera',
       ]
 
       namespace :syntax do
+        task :check_puppetlabs_spec_helper do
+          psh_present = Rake::Task[:syntax].actions.any? { |a|
+            a.source_location.first.end_with?('puppetlabs_spec_helper/rake_tasks.rb')
+          }
+          if psh_present
+            warn <<-EOS
+[WARNING] A conflicting :syntax rake task has been defined by
+puppetlabs_spec_helper/rake_tasks. You should either disable this or upgrade
+to puppetlabs_spec_helper >= 0.8.0 which now uses puppet-syntax.
+            EOS
+          end
+        end
+
         desc 'Syntax check Puppet manifests'
         task :manifests do |t|
           $stderr.puts "---> #{t.name}"

data/lib/puppet-syntax/templates.rb

@@ -18,6 +18,9 @@ module PuppetSyntax
         rescue NameError
           # This is normal because we don't have the variables that would
           # ordinarily be bound by the parent Puppet manifest.
+        rescue TypeError
+          # This is normal because we don't have the variables that would
+          # ordinarily be bound by the parent Puppet manifest.
         rescue SyntaxError => error
           errors << error
         end

data/lib/puppet-syntax/version.rb

@@ -1,3 +1,3 @@
 module PuppetSyntax
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 end

data/puppet-syntax.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Dan Carley"]
   spec.email         = ["dan.carley@gmail.com"]
   spec.description   = %q{Syntax checks for Puppet manifests and templates}
-  spec.summary       = spec.summary
-  spec.homepage      = ""
+  spec.summary       = %q{Syntax checks for Puppet manifests, templates, and Hiera YAML}
+  spec.homepage      = "https://github.com/gds-operations/puppet-syntax"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rake"
-  spec.add_dependency "puppet", ">= 2.7.0"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "< 2.99.0"
+  spec.add_development_dependency "gem_publisher", "~> 1.3"
 end

data/spec/fixtures/test_module/templates/typeerror_shouldwin.erb

@@ -0,0 +1,2 @@
+#this is valid syntax
+<%= File.dirname(@the_path_of_the_file_you_first_thought_of) %>

data/spec/puppet-syntax/manifests_spec.rb

@@ -55,25 +55,45 @@ describe PuppetSyntax::Manifests do
     res[2].should match(/Unrecognised escape sequence '\\\]' .* at line 3$/)
   end
 
-  if Puppet::Util::Package.versioncmp(Puppet.version, '3.2') >= 0
-    it 'should fail without setting future option to true on future manifest' do
-      PuppetSyntax.future_parser = false
-      files = fixture_manifests(['future_syntax.pp'])
-      res = subject.check(files)
-
-      res.should have(1).items
-      res[0].should match(/Syntax error at '='; expected '\}' .*:2$/)
-    end
+  describe 'future_parser' do
+    context 'future_parser = false (default)' do
+      it 'should fail without setting future option to true on future manifest' do
+        PuppetSyntax.future_parser.should == false
 
+        files = fixture_manifests(['future_syntax.pp'])
+        res = subject.check(files)
 
-    it 'should pass with future option set to true on future manifest' do
-      PuppetSyntax.future_parser = true
-      files = fixture_manifests(['future_syntax.pp'])
-      res = subject.check(files)
+        res.should have(1).items
+        res[0].should match(/Syntax error at '='; expected '\}' .*:2$/)
+      end
+    end
 
-      res.should have(0).items
+    context 'future_parser = true' do
+      before(:each) {
+        PuppetSyntax.future_parser = true
+      }
+
+      if Puppet::Util::Package.versioncmp(Puppet.version, '3.2') >= 0
+        context 'Puppet >= 3.2' do
+          it 'should pass with future option set to true on future manifest' do
+            files = fixture_manifests(['future_syntax.pp'])
+            res = subject.check(files)
+
+            res.should have(0).items
+          end
+        end
+      else
+        context 'Puppet <= 3.2' do
+          it 'should return an error that the parser option is not supported' do
+            files = fixture_manifests(['future_syntax.pp'])
+            res = subject.check(files)
+
+            res.should have(1).items
+            res[0].should == "Attempt to assign a value to unknown configuration parameter :parser"
+          end
+        end
+      end
     end
   end
 
-
 end

data/spec/puppet-syntax/templates_spec.rb

@@ -52,4 +52,11 @@ describe PuppetSyntax::Templates do
     res[0].should match(/2: syntax error, unexpected/)
     res[1].should match(/2: warning: found = in conditional/)
   end
+
+  it 'should ignore a TypeError' do
+    files = fixture_templates('typeerror_shouldwin.erb')
+    res = subject.check(files)
+
+    res.should == []
+  end
 end

data/spec/spec_helper.rb

@@ -19,6 +19,6 @@ def fixture_files(list, path)
 end
 
 RSpec.configure do |config|
-  config.color_enabled = true
-  config.formatter     = 'documentation'
+  config.color     = true
+  config.formatter = 'documentation'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-syntax
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,23 +28,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puppet
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: 2.7.0
-  type: :runtime
+        version: 2.99.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Syntax checks for Puppet manifests and templates
 email:
 - dan.carley@gmail.com
@@ -89,6 +73,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- jenkins.sh
 - lib/puppet-syntax.rb
 - lib/puppet-syntax/hiera.rb
 - lib/puppet-syntax/manifests.rb
@@ -108,13 +93,14 @@ files:
 - spec/fixtures/test_module/templates/fail_warning.erb
 - spec/fixtures/test_module/templates/pass.erb
 - spec/fixtures/test_module/templates/pass_unbound_var.erb
+- spec/fixtures/test_module/templates/typeerror_shouldwin.erb
 - spec/puppet-syntax/hiera_spec.rb
 - spec/puppet-syntax/manifests_spec.rb
 - spec/puppet-syntax/tasks/puppet-syntax_spec.rb
 - spec/puppet-syntax/templates_spec.rb
 - spec/puppet-syntax_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/gds-operations/puppet-syntax
 licenses:
 - MIT
 post_install_message: 
@@ -129,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2224316869698270261
+      hash: 3933301885653005104
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,13 +124,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2224316869698270261
+      hash: 3933301885653005104
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: ''
+summary: Syntax checks for Puppet manifests, templates, and Hiera YAML
 test_files:
 - spec/fixtures/hiera/hiera_bad.yaml
 - spec/fixtures/hiera/hiera_bad_18.yaml
@@ -158,6 +144,7 @@ test_files:
 - spec/fixtures/test_module/templates/fail_warning.erb
 - spec/fixtures/test_module/templates/pass.erb
 - spec/fixtures/test_module/templates/pass_unbound_var.erb
+- spec/fixtures/test_module/templates/typeerror_shouldwin.erb
 - spec/puppet-syntax/hiera_spec.rb
 - spec/puppet-syntax/manifests_spec.rb
 - spec/puppet-syntax/tasks/puppet-syntax_spec.rb