puppet-syntax 1.3.0 → 1.4.0

data/.travis.yml

@@ -10,6 +10,7 @@ env:
   - PUPPET_VERSION="~> 3.1.0"
   - PUPPET_VERSION="~> 3.2.0"
   - PUPPET_VERSION="~> 3.4.0"
+  - PUPPET_VERSION="~> 3.7.3"
   - PUPPET_VERSION=">= 0"
 matrix:
   allow_failures:

data/CHANGELOG

@@ -1,3 +1,8 @@
+2014-12-04 Release 1.4.0
+- Rspec 3 is now supported, thanks @tuxmea
+- Build error fixed where gem_publisher was used prematurely
+- Lazy load Puppet only when it's required, thanks @logicminds
+
 2014-08-07 Release 1.3.0
 - Add the ability to pass hieradata_paths array of globs to check
 - Check hieradata in modules ('**/data/**/*.yaml') by default

data/Rakefile

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

data/jenkins.sh

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 set -eu
 
+# Avoid Psych bug in Ruby 1.9.3p0 on Ubuntu 12.04
+export RBENV_VERSION="1.9.3"
+
 rm -f Gemfile.lock
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
+bundle install --path "${HOME}/bundles/${JOB_NAME}" --shebang ruby
 bundle exec rake
 bundle exec rake publish_gem

data/lib/puppet-syntax/manifests.rb

@@ -1,10 +1,9 @@
-require 'puppet'
-require 'puppet/face'
-
 module PuppetSyntax
   class Manifests
     def check(filelist)
       raise "Expected an array of files" unless filelist.is_a?(Array)
+      require 'puppet'
+      require 'puppet/face'
 
       errors = []
 

data/lib/puppet-syntax/version.rb

@@ -1,3 +1,3 @@
 module PuppetSyntax
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/puppet-syntax.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rake"
 
-  spec.add_development_dependency "rspec", "< 2.99.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "gem_publisher", "~> 1.3"
 end

data/spec/puppet-syntax/manifests_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'puppet'
 
 describe PuppetSyntax::Manifests do
   let(:subject) { PuppetSyntax::Manifests.new }
@@ -11,60 +12,60 @@ describe PuppetSyntax::Manifests do
     files = fixture_manifests('pass.pp')
     res = subject.check(files)
 
-    res.should == []
+    expect(res).to eq([])
   end
 
   it 'should return an error from an invalid file' do
     files = fixture_manifests('fail_error.pp')
     res = subject.check(files)
 
-    res.should have(1).items
-    res.first.should match(/Syntax error at '\}' .*:3$/)
+    expect(res.size).to eq(1)
+    expect(res[0]).to match(/Syntax error at .*:3$/)
   end
 
   it 'should return a warning from an invalid file' do
     files = fixture_manifests('fail_warning.pp')
     res = subject.check(files)
 
-    res.should have(2).items
-    res[0].should match(/Unrecognised escape sequence '\\\[' .* at line 3$/)
-    res[1].should match(/Unrecognised escape sequence '\\\]' .* at line 3$/)
+    expect(res.size).to eq(2)
+    expect(res[0]).to match(/Unrecognised escape sequence '\\\[' .* at line 3$/)
+    expect(res[1]).to match(/Unrecognised escape sequence '\\\]' .* at line 3$/)
   end
 
   it 'should ignore warnings about storeconfigs' do
     files = fixture_manifests('pass_storeconfigs.pp')
     res = subject.check(files)
 
-    res.should == []
+    expect(res).to eq([])
   end
 
   it 'should read more than one valid file' do
     files = fixture_manifests(['pass.pp', 'pass_storeconfigs.pp'])
     res = subject.check(files)
 
-    res.should == []
+    expect(res).to eq([])
   end
 
   it 'should continue after finding an error in the first file' do
     files = fixture_manifests(['fail_error.pp', 'fail_warning.pp'])
     res = subject.check(files)
 
-    res.should have(3).items
-    res[0].should match(/Syntax error at '\}' .*:3$/)
-    res[1].should match(/Unrecognised escape sequence '\\\[' .* at line 3$/)
-    res[2].should match(/Unrecognised escape sequence '\\\]' .* at line 3$/)
+    expect(res.size).to eq(3)
+    expect(res[0]).to match(/Syntax error at '\}' .*:3$/)
+    expect(res[1]).to match(/Unrecognised escape sequence '\\\[' .* at line 3$/)
+    expect(res[2]).to match(/Unrecognised escape sequence '\\\]' .* at line 3$/)
   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
+        expect(PuppetSyntax.future_parser).to eq(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$/)
+        expect(res.size).to eq(1)
+        expect(res[0]).to match(/Syntax error at '='; expected '\}' .*:2$/)
       end
     end
 
@@ -79,7 +80,7 @@ describe PuppetSyntax::Manifests do
             files = fixture_manifests(['future_syntax.pp'])
             res = subject.check(files)
 
-            res.should have(0).items
+            expect(res.size).to eq(0)
           end
         end
       else
@@ -88,8 +89,8 @@ describe PuppetSyntax::Manifests 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"
+            expect(res.size).to eq(1)
+            expect(res[0]).to match("Attempt to assign a value to unknown configuration parameter :parser")
           end
         end
       end

data/spec/puppet-syntax/tasks/puppet-syntax_spec.rb

@@ -2,10 +2,18 @@ require 'spec_helper'
 
 describe 'PuppetSyntax rake tasks' do
   it 'should generate FileList of manifests relative to Rakefile' do
-    pending
+    if RSpec::Version::STRING < '3'
+      pending
+    else
+      skip('needs to be done')
+    end
   end
 
   it 'should generate FileList of templates relative to Rakefile' do
-    pending
+    if RSpec::Version::STRING < '3'
+      pending
+    else
+      skip('needs to be done')
+    end
   end
 end

data/spec/puppet-syntax/templates_spec.rb

@@ -11,52 +11,52 @@ describe PuppetSyntax::Templates do
     files = fixture_templates('pass.erb')
     res = subject.check(files)
 
-    res.should == []
+    expect(res).to match([])
   end
 
   it 'should ignore NameErrors from unbound variables' do
     files = fixture_templates('pass_unbound_var.erb')
     res = subject.check(files)
 
-    res.should == []
+    expect(res).to match([])
   end
 
   it 'should catch SyntaxError' do
     files = fixture_templates('fail_error.erb')
     res = subject.check(files)
 
-    res.should have(1).items
-    res.first.should match(/2: syntax error, unexpected/)
+    expect(res.size).to eq(1)
+    expect(res[0]).to match(/2: syntax error, unexpected/)
   end
 
   it 'should catch Ruby warnings' do
     files = fixture_templates('fail_warning.erb')
     res = subject.check(files)
 
-    res.should have(1).items
-    res.first.should match(/2: warning: found = in conditional/)
+    expect(res.size).to eq(1)
+    expect(res[0]).to match(/2: warning: found = in conditional/)
   end
 
   it 'should read more than one valid file' do
     files = fixture_templates(['pass.erb', 'pass_unbound_var.erb'])
     res = subject.check(files)
 
-    res.should == []
+    expect(res).to match([])
   end
 
   it 'should continue after finding an error in the first file' do
     files = fixture_templates(['fail_error.erb', 'fail_warning.erb'])
     res = subject.check(files)
 
-    res.should have(2).items
-    res[0].should match(/2: syntax error, unexpected/)
-    res[1].should match(/2: warning: found = in conditional/)
+    expect(res.size).to eq(2)
+    expect(res[0]).to match(/2: syntax error, unexpected/)
+    expect(res[1]).to 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 == []
+    expect(res).to match([])
   end
 end

data/spec/puppet-syntax_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe PuppetSyntax do
   it 'should default exclude_paths to empty array' do
-    PuppetSyntax.exclude_paths.should be_empty
+    expect(PuppetSyntax.exclude_paths).to be_empty
   end
 
   it 'should support setting exclude_paths' do
     PuppetSyntax.exclude_paths = ["foo", "bar/baz"]
-    PuppetSyntax.exclude_paths.should == ["foo", "bar/baz"]
+    expect(PuppetSyntax.exclude_paths).to eq(["foo", "bar/baz"])
   end
 
   it 'should support future parser setting' do
     PuppetSyntax.future_parser = true
-    PuppetSyntax.future_parser.should == true
+    expect(PuppetSyntax.future_parser).to eq(true)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-syntax
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2583985716201075116
+      hash: 2107948252144902184
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,10 +124,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2583985716201075116
+      hash: 2107948252144902184
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Syntax checks for Puppet manifests, templates, and Hiera YAML