puppet-syntax 1.1.1 → 1.2.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+2014-03-28 Release 1.2.0
+- Optional support for Puppet's future parser.
+
 2014-03-17 Release 1.1.1
 - Ignore exit(1) from Puppet 3.4
 - Don't use hardcoded version of parser face.

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/gds-operations/puppet-syntax.svg?branch=master)](https://travis-ci.org/gds-operations/puppet-syntax)
+
 # Puppet::Syntax
 
 Syntax checks for Puppet manifests, templates, and Hiera YAML.
@@ -48,6 +50,11 @@ Paths can be excluded with:
 
     PuppetSyntax.exclude_paths = ["vendor/**/*"]
 
+When you are using a Puppet version greater then 3.2, you can select the future parse by specifying
+
+    PuppetSyntax.future_parser = true
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/puppet-syntax.rb

@@ -5,10 +5,14 @@ require "puppet-syntax/hiera"
 
 module PuppetSyntax
   class << self
-    attr_accessor :exclude_paths
+    attr_accessor :exclude_paths, :future_parser
 
     def exclude_paths
       @exclude_paths || []
     end
+
+    def future_parser
+      @future_parser || false
+    end
   end
 end

data/lib/puppet-syntax/manifests.rb

@@ -42,6 +42,7 @@ module PuppetSyntax
 
     private
     def validate_manifest(file)
+      Puppet[:parser] = 'future' if PuppetSyntax.future_parser
       Puppet::Face[:parser, :current].validate(file)
     end
   end

data/lib/puppet-syntax/version.rb

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

data/puppet-syntax.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "puppet", ">= 2.7.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/spec/fixtures/test_module/manifests/future_syntax.pp

@@ -0,0 +1,3 @@
+class module_with_future_syntax {
+	$a = $b = 10
+}

data/spec/puppet-syntax/manifests_spec.rb

@@ -54,4 +54,26 @@ describe PuppetSyntax::Manifests do
     res[1].should match(/Unrecognised escape sequence '\\\[' .* at line 3$/)
     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
+
+
+    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(0).items
+    end
+  end
+
+
 end

data/spec/puppet-syntax_spec.rb

@@ -9,4 +9,10 @@ describe PuppetSyntax do
     PuppetSyntax.exclude_paths = ["foo", "bar/baz"]
     PuppetSyntax.exclude_paths.should == ["foo", "bar/baz"]
   end
+
+  it 'should support future parser setting' do
+    PuppetSyntax.future_parser = true
+    PuppetSyntax.future_parser.should == true
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-syntax
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +101,7 @@ files:
 - spec/fixtures/hiera/hiera_good.yaml
 - spec/fixtures/test_module/manifests/fail_error.pp
 - spec/fixtures/test_module/manifests/fail_warning.pp
+- spec/fixtures/test_module/manifests/future_syntax.pp
 - spec/fixtures/test_module/manifests/pass.pp
 - spec/fixtures/test_module/manifests/pass_storeconfigs.pp
 - spec/fixtures/test_module/templates/fail_error.erb
@@ -144,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1226069919684334403
+      hash: -2224316869698270261
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1226069919684334403
+      hash: -2224316869698270261
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -166,6 +151,7 @@ test_files:
 - spec/fixtures/hiera/hiera_good.yaml
 - spec/fixtures/test_module/manifests/fail_error.pp
 - spec/fixtures/test_module/manifests/fail_warning.pp
+- spec/fixtures/test_module/manifests/future_syntax.pp
 - spec/fixtures/test_module/manifests/pass.pp
 - spec/fixtures/test_module/manifests/pass_storeconfigs.pp
 - spec/fixtures/test_module/templates/fail_error.erb