Showing with 593 additions and 173 deletions.
  1. +2 −0 .gitignore
  2. +24 −0 .pdkignore
  3. +19 −2 .rubocop.yml
  4. +12 −45 .sync.yml
  5. +13 −14 .travis.yml
  6. +1 −0 .yardopts
  7. +36 −2 CHANGELOG.md
  8. +17 −80 Gemfile
  9. +226 −0 HISTORY.md
  10. +2 −0 README.md
  11. +73 −1 Rakefile
  12. +12 −15 appveyor.yml
  13. +3 −4 lib/puppet/provider/java_ks/keytool.rb
  14. +6 −7 metadata.json
  15. +59 −0 spec/acceptance/chain_key_spec.rb
  16. +41 −0 spec/acceptance/pkcs12_spec.rb
  17. +8 −0 spec/default_facts.yml
  18. +21 −0 spec/spec_helper.rb
  19. +18 −3 spec/spec_helper_acceptance.rb
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.git/
.*.sw[op]
.metadata
.yardoc
Expand All @@ -19,4 +20,5 @@
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
24 changes: 24 additions & 0 deletions .pdkignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.git/
.*.sw[op]
.metadata
.yardoc
.yardwarns
*.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
21 changes: 19 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,21 @@ AllCops:
Exclude:
- bin/*
- ".vendor/**/*"
- Gemfile
- Rakefile
- "**/Gemfile"
- "**/Rakefile"
- pkg/**/*
- spec/fixtures/**/*
- vendor/**/*
- "**/Puppetfile"
- "**/Vagrantfile"
- "**/Guardfile"
Metrics/LineLength:
Description: People have wide screens, use them.
Max: 200
GetText/DecorateString:
Description: We don't want to decorate test output.
Exclude:
- spec/*
RSpec/BeforeAfterAll:
Description: Beware of using after(:all) as it may cause state to leak between tests.
A necessary evil in acceptance testing.
Expand Down Expand Up @@ -64,6 +71,14 @@ Style/SymbolArray:
Description: Using percent style obscures symbolic intent of array's contents.
EnforcedStyle: brackets
inherit_from: ".rubocop_todo.yml"
RSpec/MessageSpies:
EnforcedStyle: receive
Style/Documentation:
Exclude:
- lib/puppet/parser/functions/**/*
- spec/**/*
Style/WordArray:
EnforcedStyle: brackets
Style/CollectionMethods:
Enabled: true
Style/MethodCalledOnDoEndBlock:
Expand All @@ -72,6 +87,8 @@ Style/StringMethods:
Enabled: true
Layout/EndOfLine:
Enabled: false
Layout/IndentHeredoc:
Enabled: false
Metrics/AbcSize:
Enabled: false
Metrics/BlockLength:
Expand Down
57 changes: 12 additions & 45 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,14 @@
---
appveyor.yml:
environment:
PUPPET_GEM_VERSION: "~> 4.0"
matrix:
- RUBY_VERSION: 24-x64
CHECK: "syntax lint"
- RUBY_VERSION: 24-x64
CHECK: metadata_lint
- RUBY_VERSION: 24-x64
CHECK: rubocop
- RUBY_VERSION: 24
CHECK: spec
- RUBY_VERSION: 21
CHECK: spec
- PUPPET_GEM_VERSION: ~> 5.0
RUBY_VERSION: 24
CHECK: spec
- PUPPET_GEM_VERSION: ~> 5.0
RUBY_VERSION: 24-x64
CHECK: spec

.travis.yml:
bundle_args: --without system_tests
docker_sets:
- set: docker/centos-7
options:
- set: docker/ubuntu-14.04
options:
docker_defaults:
bundler_args: ""
secure: ""
branches:
- release
extras:
- env: CHECK=release_checks
rvm: 2.1.9


Gemfile:
required:
':system_tests':
Expand All @@ -46,25 +19,19 @@ Gemfile:
- mswin
- mingw
- x64_mingw
- gem: beaker
version: '~> 3.13'
from_env: BEAKER_VERSION
- gem: beaker-abs
from_env: BEAKER_ABS_VERSION
version: '~> 0.1'
- gem: beaker-pe
- gem: beaker-hostgenerator
from_env: BEAKER_HOSTGENERATOR_VERSION
- gem: beaker-rspec
from_env: BEAKER_RSPEC_VERSION
optional:
':development':
- gem: puppet-blacksmith
version: '~> 3.4'

Rakefile:
requires:
- puppet_blacksmith/rake_tasks
- gem: 'github_changelog_generator'
git: 'https://github.com/skywinder/github-changelog-generator'
ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"

.rubocop.yml:
default_configs:
inherit_from: .rubocop_todo.yml

.gitlab-ci.yml:
unmanaged: true

appveyor.yml:
spec_type: spec
27 changes: 13 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,47 +5,46 @@ language: ruby
cache: bundler
before_install:
- bundle -v
- rm Gemfile.lock || true
- rm -f Gemfile.lock
- gem update --system
- gem update bundler
- gem --version
- bundle -v
script:
- 'bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- 2.4.1
- 2.1.9
- 2.5.0
env:
- PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
- PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
global:
- BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
matrix:
fast_finish: true
include:
-
bundler_args:
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
rvm: 2.4.1
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
rvm: 2.5.0
script: bundle exec rake beaker
services: docker
sudo: required
-
bundler_args:
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
rvm: 2.4.1
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
rvm: 2.5.0
script: bundle exec rake beaker
services: docker
sudo: required
-
env: CHECK=rubocop
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
-
env: CHECK="syntax lint"
env: CHECK=parallel_spec
-
env: CHECK=metadata_lint
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
rvm: 2.4.4
-
env: CHECK=release_checks
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
rvm: 2.1.9
branches:
only:
Expand Down
1 change: 1 addition & 0 deletions .yardopts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--markup markdown
38 changes: 36 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,36 @@
## Supported Release [2.2.0]
# Change log

All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).

## [2.3.0](https://github.com/puppetlabs/puppetlabs-java_ks/tree/2.3.0) (2018-09-27)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-java_ks/compare/2.2.0...2.3.0)

### Added

- \(FM-7238\) - Addition of support for Ubuntu 18.04 [\#237](https://github.com/puppetlabs/puppetlabs-java_ks/pull/237) ([david22swan](https://github.com/david22swan))

### Fixed

- \(MODULES-1997\) - Update the target when the cert chain changes [\#233](https://github.com/puppetlabs/puppetlabs-java_ks/pull/233) ([johngmyers](https://github.com/johngmyers))

### UNCATEGORIZED PRS; GO LABEL THEM

- pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#247](https://github.com/puppetlabs/puppetlabs-java_ks/pull/247) ([pmcmaw](https://github.com/pmcmaw))
- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#246](https://github.com/puppetlabs/puppetlabs-java_ks/pull/246) ([tphoney](https://github.com/tphoney))
- \(FM-7345\) - Update to test output to account for windows changes [\#243](https://github.com/puppetlabs/puppetlabs-java_ks/pull/243) ([david22swan](https://github.com/david22swan))
- pdksync - \(MODULES-7658\) use beaker4 in puppet-module-gems [\#242](https://github.com/puppetlabs/puppetlabs-java_ks/pull/242) ([tphoney](https://github.com/tphoney))
- \(MODULES-7632\) - Update README Limitations section [\#239](https://github.com/puppetlabs/puppetlabs-java_ks/pull/239) ([eimlav](https://github.com/eimlav))
- \(FM-7277\) Fix incorrect reference [\#238](https://github.com/puppetlabs/puppetlabs-java_ks/pull/238) ([beergeek](https://github.com/beergeek))
- \(FM-7218\) Bump to java test version on windows. [\#234](https://github.com/puppetlabs/puppetlabs-java_ks/pull/234) ([david22swan](https://github.com/david22swan))
- PDK Update 1.5.0 [\#232](https://github.com/puppetlabs/puppetlabs-java_ks/pull/232) ([david22swan](https://github.com/david22swan))
- \(MODULES-6342\) Update pathing for new java in \#229 [\#231](https://github.com/puppetlabs/puppetlabs-java_ks/pull/231) ([hunner](https://github.com/hunner))
- \[FM-6966\] Removal of unsupported OS from java\_ks [\#230](https://github.com/puppetlabs/puppetlabs-java_ks/pull/230) ([david22swan](https://github.com/david22swan))
- \(MODULES-6918\) update jdk version in spec\_helper\_acceptance [\#229](https://github.com/puppetlabs/puppetlabs-java_ks/pull/229) ([eputnam](https://github.com/eputnam))
- \(MODULES-7153\) - Run release\_checks againt 2.4.1 and unmanage gitlabs-ci [\#227](https://github.com/puppetlabs/puppetlabs-java_ks/pull/227) ([pmcmaw](https://github.com/pmcmaw))
- Release mergeback 2.2.0 [\#225](https://github.com/puppetlabs/puppetlabs-java_ks/pull/225) ([pmcmaw](https://github.com/pmcmaw))

## 2.2.0
### Summary
A release that converts the module to the PDK version 1.3.2, alongside an additional parameter added.

Expand All @@ -8,7 +40,6 @@ A release that converts the module to the PDK version 1.3.2, alongside an additi
### Changed
- Module has been converted to the PDK with version 1.3.2.


## Supported Release [2.1.0]
### Summary
The main purpose of this module is to release Rubocop changes, with some other minor updates included.
Expand Down Expand Up @@ -225,3 +256,6 @@ Fixes an issue with ibm java handling input from stdin on SLES

[2.1.0]:https://github.com/puppetlabs/puppetlabs-java_ks/compare/2.0.0...2.1.0
[2.0.0]:https://github.com/puppetlabs/puppetlabs-java_ks/compare/1.6.0...2.0.0


\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
Loading