Merge pull request #101 from Dan33l/update_travis

Update travis

.travis.yml

@@ -5,32 +5,15 @@ before_install: gem install bundler
 install: bundle install --jobs 4 --retry 2 --without development
 script: bundle exec rake
 rvm:
-  - 1.9.3
-  - 2.1.6
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.4.4
+  - 2.5.1
 env:
-  - PUPPET_VERSION="~> 3.8.7"
-  - PUPPET_VERSION="~> 4.8.0"
-  - PUPPET_VERSION="~> 4.9.0"
+  - PUPPET_VERSION="~> 5.5.10"
+  - PUPPET_VERSION="~> 6.1.0"
+  - PUPPET_VERSION="~> 6.2.0"
   - PUPPET_VERSION=">= 0"
   - PUPPET_VERSION="git://github.com/puppetlabs/puppet.git#master"
 matrix:
-  exclude:
-    - env: PUPPET_VERSION="~> 3.8.7"
-      rvm: 2.2.6
-    - env: PUPPET_VERSION="~> 3.8.7"
-      rvm: 2.3.3
-    - env: PUPPET_VERSION="~> 3.8.7"
-      rvm: 2.4.0
-    # 4.9 with Ruby 1.9.3 issues deprecation warnings
-    - env: PUPPET_VERSION="~> 4.9.0"
-      rvm: 1.9.3
-    - env: PUPPET_VERSION=">= 0"
-      rvm: 1.9.3
-    - env: PUPPET_VERSION="git://github.com/puppetlabs/puppet.git#master"
-      rvm: 1.9.3
   allow_failures:
     - env: PUPPET_VERSION=">= 0"
     - env: PUPPET_VERSION="git://github.com/puppetlabs/puppet.git#master"
@@ -40,8 +23,8 @@ deploy:
     secure: "kwxryZZ/t9EkWuYxhz3G1v+U3ZK4WdsiN0UFHDjijnAGPxqe/n+oBcNA8hOiNhjZeTFo8bADEZkL7JtdKQo9RvgStipyaS5gDHB/C1c4LOBWv4Tga21NNCAuBcE2CDtAH3+TzrZV5vv2+SpOrhKZpzZoAoR6PR1MWVWMUie/rE0="
   gem: puppet-syntax
   on:
-    rvm: 2.4.0
-    condition: '"$PUPPET_VERSION" = "~> 4.8.0"'
+    rvm: 2.5.1
+    condition: '"$PUPPET_VERSION" = "~> 5.5.10"'
     tags: true
     all_branches: true
     repo: voxpupuli/puppet-syntax

spec/puppet-syntax/manifests_spec.rb

@@ -74,8 +74,8 @@
     expect(has_errors).to eq(true)
     if Puppet.version.to_i >= 4
       expect(output.size).to eq(5)
-      expect(output[0]).to match(/This Name has no effect. A Host Class Definition can not end with a value-producing expression without other effect at \S*\/fail_error.pp:2:32$/)
-      expect(output[1]).to match(/This Name has no effect. A value(-producing expression without other effect may only be placed last in a block\/sequence| was produced and then forgotten.*) at \S*\/fail_error.pp:2:3$/)
+      expect(output[0]).to match(/This Name has no effect. A Host Class Definition can not end with a value-producing expression without other effect \(file: \S*\/fail_error.pp, line: 2, column: 32\)$/)
+      expect(output[1]).to match(/This Name has no effect. A value was produced and then forgotten \(one or more preceding expressions may have the wrong form\) \(file: \S*\/fail_error.pp, line: 2, column: 3\)$/)
       expect(output[2]).to match('2 errors. Giving up')
       expect(output[3]).to match(/Unrecogni(s|z)ed escape sequence '\\\['/)
       expect(output[4]).to match(/Unrecogni(s|z)ed escape sequence '\\\]'/)

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

@@ -35,21 +35,4 @@
     expect(list).to include(known_eyaml_subdir)
     expect(list.count).to eq 4
   end
-
-  it 'should check manifests relative to Rakefile' do
-    if RSpec::Version::STRING < '3'
-      pending
-    else
-      skip('needs to be done')
-    end
-  end
-
-  it 'should check templates relative to Rakefile' do
-    if RSpec::Version::STRING < '3'
-      pending
-    else
-      skip('needs to be done')
-    end
-  end
-
 end

spec/puppet-syntax/templates_spec.rb

@@ -117,7 +117,7 @@
 
         expect(res.size).to eq(2)
         expect(res[0]).to match(/This Type-Name has no effect/)
-        expect(res[1]).to match(/Syntax error at '}' at \S*\/fail_error_also.epp:2:4/)
+        expect(res[1]).to match(/Syntax error at '}' \(file: \S*\/fail_error_also.epp, line: 2, column: 4\)/)
       end
 
       context "when the 'epp_only' options is set" do