Showing with 76 additions and 64 deletions.
  1. +1 −1 .fixtures.yml
  2. +43 −14 .travis.yml
  3. +13 −2 Gemfile
  4. +1 −1 README.md
  5. +1 −1 manifests/init.pp
  6. +7 −41 metadata.json
  7. +4 −4 spec/classes/init_spec.rb
  8. +6 −0 spec/spec_helper.rb
2 .fixtures.yml
View file
@@ -2,6 +2,6 @@ fixtures:
repositories:
'stdlib':
repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
ref: '3.2.0'
ref: '4.6.0'
symlinks:
vim: "#{source_dir}"
57 .travis.yml
View file
@@ -1,17 +1,46 @@
---
language: ruby

rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1.0

env:
- PUPPET_VERSION=3.3.2
- PUPPET_VERSION=3.4.2
- PUPPET_VERSION=3.5.1
- PUPPET_VERSION=3.6.0
- PUPPET_VERSION=3.7.0
matrix:
- PUPPET_GEM_VERSION="~> 3.1.0"
- PUPPET_GEM_VERSION="~> 3.2.0"
- PUPPET_GEM_VERSION="~> 3.3.0"
- PUPPET_GEM_VERSION="~> 3.4.0"
- PUPPET_GEM_VERSION="~> 3.5.1"
- PUPPET_GEM_VERSION="~> 3.6.0"
- PUPPET_GEM_VERSION="~> 3.7.0"
- PUPPET_GEM_VERSION="~> 3.7.0" PARSER="future"
- PUPPET_GEM_VERSION="~> 4.0.0"
- PUPPET_GEM_VERSION="~> 4.1.0"

sudo: false

script: 'bundle exec metadata-json-lint metadata.json && bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'

matrix:
fast_finish: true
exclude:
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.1.0"
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.1.0"
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.2.0"
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.3.0"
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.4.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.0.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.1.0"

notifications:
email: false
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
language: ruby
before_script: "gem install --no-ri --no-rdoc bundler"
script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
gemfile: Gemfile
email: false
15 Gemfile
View file
@@ -1,7 +1,18 @@
source 'https://rubygems.org'

puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
gem 'puppet', puppetversion
if puppetversion = ENV['PUPPET_GEM_VERSION']
gem 'puppet', puppetversion, :require => false
else
gem 'puppet', :require => false
end

gem 'metadata-json-lint'
gem 'puppetlabs_spec_helper', '>= 0.1.0'
gem 'puppet-lint', '>= 1.0.0'
gem 'facter', '>= 1.7.0'
gem 'rspec-puppet'

# rspec must be v2 for ruby 1.8.7
if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
gem 'rspec', '~> 2.0'
end
2 README.md
View file
@@ -9,7 +9,7 @@ This module manages vim and root's .vimrc file and .vim directory.

# Compatibility #

Puppet v3 with Ruby 1.8.7 and 1.9.3
Puppet v3 (optionally with future parser) and v4 with Ruby versions 1.8.7, 1.9.3, 2.0.0 and 2.1.0.

## OS Distributions ##

2 manifests/init.pp
View file
@@ -92,7 +92,7 @@
$package_list_real = $package_list
}

if type($package_list_real) != 'String' and type($package_list_real) != 'Array' {
if type3x($package_list_real) != 'String' and type3x($package_list_real) != 'Array' {
fail('vim::package_list must be a string or an array.')
}

48 metadata.json
View file
@@ -1,24 +1,21 @@
{
"name": "ghoneycutt-vim",
"version": "2.9.1",
"version": "2.10.0",
"author": "ghoneycutt",
"summary": "Manage everyone's favorite editor, Vim.",
"license": "Apache License, Version 2.0",
"description": "Manage Vim",
"license": "Apache-2.0",
"source": "git://github.com/ghoneycutt/puppet-module-vim.git",
"project_page": "https://github.com/ghoneycutt/puppet-module-vim",
"issues_url": "https://github.com/ghoneycutt/puppet-module-vim/issues",
"requirements": [
{
"name": "pe",
"version_requirement": "3.2.x"
"version_requirement": ">= 3.2.0"
},
{
"name": "puppet",
"version_requirement": "3.x"
},
{
"name": "facter",
"version_requirement": ">= 1.7.0"
"version_requirement": ">= 3.0.0 < 5.0.0"
}
],
"operatingsystem_support": [
@@ -91,40 +88,9 @@
]
}
],
"description": "Manage Vim",
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 3.2.0"
"name": "puppetlabs/stdlib","version_requirement": ">= 4.6.0 < 6.0.0"
}
],
"types": [

],
"checksums": {
"CHANGELOG": "15458e8eb413081b0a9cec5ef4d51ba8",
"Gemfile": "93225a60957b051c8d28a6da599477b2",
"Gemfile.lock": "b424c9b84d11b8e15b3d2b3977f7ba94",
"LICENSE": "567e6cc3941d464d60c74d1f4abd5f46",
"Modulefile": "ecbc0db42bd46bf8a4eeecfad8b9a3d9",
"README.md": "f3d01996fa02b755d5916bf0b7e853d9",
"Rakefile": "87ee3b5b114ae2b1eaaedaf0cd50df37",
"files/vim/README": "09dd5ea687ea7074686df050905782a2",
"files/vim/ftdetect/markdown.vim": "14fc924038beb57c8730110f53dbc425",
"files/vim/ftdetect/nginx.vim": "8a72fb7c9ac10412b24351449fbd5e7e",
"files/vim/ftdetect/puppet.vim": "9e93cd63787de6b9ed458c95061f06eb",
"files/vim/ftplugin/markdown.vim": "325f5b3717d3906e1c3e0d4cd8932d10",
"files/vim/ftplugin/puppet.vim": "0fde61360edf2bb205947f768bfb2d57",
"files/vim/indent/puppet.vim": "4bc2dee4c9c4e74aa3103339ad3ab227",
"files/vim/syntax/javascript.vim": "f6380b9c12e72b02d465a72a6e0c7f33",
"files/vim/syntax/markdown.vim": "584186c5c51edfa9981cd21473f1be9f",
"files/vim/syntax/nginx.vim": "f6a7d3d4f7a7a7d4d6af9deffeda9632",
"files/vim/syntax/puppet.vim": "b89d71a7e7d6ce4eb81d884565977be2",
"files/vim/tools/less.vim": "1621e9e4c01f7f6b5b1844b6674863c7",
"files/vimrc": "2efa71e75dd8d5d78a369df4ffca5ac1",
"manifests/init.pp": "92782170e93e9359a59bd578e03d21ba",
"spec/classes/init_spec.rb": "a5b38cca31992296f2e65b2f7423ac90",
"spec/spec_helper.rb": "0db89c9a486df193c0e40095422e19dc",
"tests/init.pp": "b651e1a93505b3f5baf094fd19fdc663"
}
]
}
8 spec/classes/init_spec.rb
View file
@@ -224,7 +224,7 @@
it 'should fail' do
expect {
should contain_class('vim')
}.to raise_error(Puppet::Error,/^true is not a string/)
}.to raise_error(Puppet::Error,/true is not a string/)
end
end
end
@@ -240,7 +240,7 @@
it 'should fail' do
expect {
should contain_class('vim')
}.to raise_error(Puppet::Error,/^vim supports Suse 10, 11, and 12\. Detected lsbmajdistrelease is <9>/)
}.to raise_error(Puppet::Error,/vim supports Suse 10, 11, and 12\. Detected lsbmajdistrelease is <9>/)
end
end

@@ -254,7 +254,7 @@
it 'should fail' do
expect {
should contain_class('vim')
}.to raise_error(Puppet::Error,/^vim supports Solaris 10 and 11\. Detected kernelrelease is <5\.9>/)
}.to raise_error(Puppet::Error,/vim supports Solaris 10 and 11\. Detected kernelrelease is <5\.9>/)
end
end

@@ -268,7 +268,7 @@
it 'should fail' do
expect {
should contain_class('vim')
}.to raise_error(Puppet::Error,/^vim supports OS families Debian, RedHat, Solaris, Suse and Ubuntu\. Detected osfamily is <Unsupported>\./)
}.to raise_error(Puppet::Error,/vim supports OS families Debian, RedHat, Solaris, Suse and Ubuntu\. Detected osfamily is <Unsupported>\./)
end
end
end
6 spec/spec_helper.rb
View file
@@ -1 +1,7 @@
require 'puppetlabs_spec_helper/module_spec_helper'

RSpec.configure do |config|
config.before :each do
Puppet[:parser] = 'future' if ENV['PARSER'] == 'future'
end
end