diff --git a/.fixtures.yml b/.fixtures.yml index ad9b258..dde47fb 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,8 +1,8 @@ fixtures: repositories: - 'stdlib': + stdlib: repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git' - ref: '4.0.0' - 'openssl': 'https://github.com/camptocamp/puppet-openssl.git' + ref: '4.2.0' + openssl: 'https://github.com/camptocamp/puppet-openssl.git' symlinks: nsstools: "#{source_dir}" diff --git a/.travis.yml b/.travis.yml index 35b84bd..d2ddce5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,28 @@ +sudo: false language: ruby +bundler_args: --without beaker rvm: - 1.8.7 - 1.9.3 - - 2.0.0 - - 2.1.4 + - 2.0 + - 2.1 + - 2.2 env: - PUPPET_GEM_VERSION="~> 2.7" - PUPPET_GEM_VERSION="~> 3.3" - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes" matrix: allow_failures: + - rvm: 2.2 - rvm: ruby-head exclude: - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 2.7" - - rvm: 2.0.0 + - rvm: 2.0 env: PUPPET_GEM_VERSION="~> 2.7" - - rvm: 2.1.4 + - rvm: 2.1 + env: PUPPET_GEM_VERSION="~> 2.7" + - rvm: 2.2 env: PUPPET_GEM_VERSION="~> 2.7" fast_finish: true notifications: diff --git a/CHANGELOG.md b/CHANGELOG.md index abb7605..c2f6d38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ #### [Current] + * [c439a5e](../../commit/c439a5e) - __(Joshua Hoblitt)__ bump version to v1.1.0 + * [202e4f5](../../commit/202e4f5) - __(Joshua Hoblitt)__ replace Modulefile vs metadata.json + * [4a079e5](../../commit/4a079e5) - __(Joshua Hoblitt)__ update travis matrix + * [a5c4d09](../../commit/a5c4d09) - __(Joshua Hoblitt)__ update rspec-puppet to v2.0.0 + * [40303b0](../../commit/40303b0) - __(Joshua Hoblitt)__ update fixtures stdlib to 4.2.0 + * [c2ebee2](../../commit/c2ebee2) - __(Joshua Hoblitt)__ Merge pull request [#2](../../issues/2) from jhoblitt/feature/cleanups + +fix linter warnings + * [7e43fbf](../../commit/7e43fbf) - __(Joshua Hoblitt)__ fix linter warnings + * [8ac26ef](../../commit/8ac26ef) - __(Joshua Hoblitt)__ add future parser to travis matrix + * [4c6a028](../../commit/4c6a028) - __(Joshua Hoblitt)__ Merge pull request [#1](../../issues/1) from itewk/master + +FIPS and Self Signed Certs + * [34f2193](../../commit/34f2193) - __(Ian Tewksbury)__ Add type for creating a cert and key directly in the NSS DB. + * [602fae0](../../commit/602fae0) - __(Ian Tewksbury)__ add option to enable FIPS on the NSS DB. + * [91e5c91](../../commit/91e5c91) - __(Joshua Hoblitt)__ restrict rspec-core gem to < 3 + +To work around rspec 3 being incompatabile with rspec-puppet 1.0.1 (currently, +the latest release) + + RSpec::Puppet::FunctionMatchers::Run implements a legacy RSpec matcher + protocol. For the current protocol you should expose the failure messages + via the `failure_message` and `failure_message_when_negated` methods. + (Used from /home/jhoblitt/github/puppet-nsstools/spec/functions/nsstools_add_cert_spec.rb:21:in `block (2 levels) in ') + +#### v1.0.2 + * [02de101](../../commit/02de101) - __(Joshua Hoblitt)__ bump version to v1.0.2 * [05d081a](../../commit/05d081a) - __(Joshua Hoblitt)__ [re]add dep on camptocamp/openssl >= 0.2.0 The 0.2.0 release of camptocamp/openssl fixes the problem 0.1.0 had diff --git a/Gemfile b/Gemfile index deb0a85..d65b689 100644 --- a/Gemfile +++ b/Gemfile @@ -6,18 +6,22 @@ else gem 'puppet', :require => false end -gem 'rake', :require => false -gem 'puppetlabs_spec_helper', :require => false -gem 'puppet-lint', :require => false -gem 'puppet-syntax', :require => false -# The patch needed to properly test the nsstools_add_cert() function -# https://github.com/rodjek/rspec-puppet/pull/155 -# https://github.com/rodjek/rspec-puppet/commit/03e94422fb9bbdd950d5a0bec6ead5d76e06616b -gem 'rspec-puppet', - :git => 'https://github.com/rodjek/rspec-puppet.git', - :ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5', - :require => false -# rspec 3 spews warnings with rspec-puppet 1.0.1 -gem 'rspec-core', '~> 2.0', :require => false +group :development, :test do + gem 'rake', :require => false + gem 'puppetlabs_spec_helper', :require => false + gem 'puppet-lint', '>= 1.1.0', :require => false + gem 'puppet-syntax', :require => false + gem 'rspec-puppet', + :git => 'https://github.com/rodjek/rspec-puppet.git', + :ref => 'v2.0.0', + :require => false +end + +group :beaker do + gem 'serverspec', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', :require => false + gem 'pry', :require => false +end # vim:ft=ruby diff --git a/Modulefile b/Modulefile deleted file mode 100644 index fc30794..0000000 --- a/Modulefile +++ /dev/null @@ -1,12 +0,0 @@ -name 'jhoblitt/nsstools' -version '1.0.2' - -author 'Joshua Hoblitt ' -license 'Apache' -project_page 'https://github.com/jhoblitt/puppet-nsstools' -source 'git://github.com/jhoblitt/puppet-nsstools.git' -summary 'Manages NSS certificate databases' -description 'Manages NSS certificate databases' - -dependency 'puppetlabs/stdlib', '>= 4.0.0' -dependency 'camptocamp/openssl', '>= 0.2.0' diff --git a/metadata.json b/metadata.json new file mode 100644 index 0000000..8600844 --- /dev/null +++ b/metadata.json @@ -0,0 +1,19 @@ +{ + "name": "jhoblitt-nsstools", + "version": "1.1.0", + "author": "Joshua Hoblitt ", + "summary": "Manages NSS certificate databases", + "license": "Apache-2.0", + "source": "https://github.com/jhoblitt/puppet-nsstools.git", + "project_page": "https://github.com/jhoblitt/puppet-nsstools", + "issues_url": "https://github.com/jhoblitt/puppet-nsstools/issues", + "operatingsystem_support": [ + { "operatingsystem": "RedHat", "operatingsystemrelease": [ "5", "6", "7" ] }, + { "operatingsystem": "CentOS", "operatingsystemrelease": [ "5", "6", "7" ] }, + { "operatingsystem": "Scientific", "operatingsystemrelease": [ "5", "6", "7" ] } + ], + "dependencies": [ + { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 < 5.0.0" }, + { "name": "camptocamp/openssl", "version_requirement": ">= 0.2.0" } + ] +}