4 changes: 4 additions & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
fixtures:
repositories:
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
provision: 'https://github.com/puppetlabs/provision.git'
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
symlinks:
registry: "#{source_dir}"
mixed_default_settings: "#{source_dir}/spec/fixtures/mixed_default_settings"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
1 change: 1 addition & 0 deletions .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/appveyor.yml
Expand Down
23 changes: 0 additions & 23 deletions .project

This file was deleted.

83 changes: 24 additions & 59 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,64 +1,29 @@
---
".gitlab-ci.yml":
delete: true
".travis.yml":
deploy_to_forge:
enabled: false
simplecov: true
appveyor.yml:
use_litmus: true
simplecov: true
matrix_extras:
- RUBY_VERSION: 25-x64
ACCEPTANCE: 'yes'
TARGET_HOST: localhost
- RUBY_VERSION: 25-x64
ACCEPTANCE: 'yes'
TARGET_HOST: localhost
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
Gemfile:
required:
':system_tests':
- gem: 'puppet-module-posix-system-r#{minor_version}'
platforms: ruby
- gem: 'puppet-module-win-system-r#{minor_version}'
platforms:
- mswin
- mingw
- x64_mingw
- gem: beaker-testmode_switcher
version: '~> 0.4'
- gem: master_manipulator
- gem: puppet-blacksmith
version: '~> 3.4'
use_litmus: true
optional:
':development':
- 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')"


.gitignore:
required:
- ---.project

spec/default_facts.yml:
unmanaged: true

# The registry module doesn't support parallel_spec
appveyor.yml:
matrix:
- RUBY_VERSION: 24-x64
CHECK: "syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
- PUPPET_GEM_VERSION: ~> 4.0
RUBY_VERSION: 21
CHECK: spec
- PUPPET_GEM_VERSION: ~> 4.0
RUBY_VERSION: 21-x64
CHECK: spec
- PUPPET_GEM_VERSION: ~> 5.0
RUBY_VERSION: 24
CHECK: spec
- PUPPET_GEM_VERSION: ~> 5.0
RUBY_VERSION: 24-x64
CHECK: spec
- PUPPET_GEM_VERSION: ~> 6.0
RUBY_VERSION: 25
CHECK: spec
- PUPPET_GEM_VERSION: ~> 6.0
RUBY_VERSION: 25-x64
CHECK: spec

.gitlab-ci.yml:
delete: true

Rakefile:
unmanaged: true

":development":
- 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')
spec/spec_helper.rb:
mock_with: ':rspec'
mock_with: ":rspec"
coverage_report: true
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,14 @@ before_install:
- gem --version
- bundle -v
script:
- 'bundle exec rake $CHECK'
- 'SIMPLECOV=yes bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- 2.5.3
stages:
- static
- spec
- acceptance
-
if: tag =~ ^v\d
name: deploy
matrix:
fast_finish: true
include:
Expand All @@ -34,9 +31,6 @@ matrix:
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
rvm: 2.5.3
stage: spec
-
env: DEPLOY_TO_FORGE=yes
stage: deploy
branches:
only:
- master
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

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).

## [v3.1.0](https://github.com/puppetlabs/puppetlabs-registry/tree/v3.1.0) (2019-12-10)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-registry/compare/v3.0.0...v3.1.0)

### Added

- \(FM-8190\) convert module to litmus [\#190](https://github.com/puppetlabs/puppetlabs-registry/pull/190) ([DavidS](https://github.com/DavidS))

## [v3.0.0](https://github.com/puppetlabs/puppetlabs-registry/tree/v3.0.0) (2019-10-17)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-registry/compare/2.1.0...v3.0.0)
Expand Down
11 changes: 2 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,11 @@ group :development do
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
end
group :system_tests do
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "beaker-testmode_switcher", '~> 0.4', require: false
gem "master_manipulator", require: false
gem "puppet-blacksmith", '~> 3.4', require: false
end

puppet_version = ENV['PUPPET_GEM_VERSION']
facter_version = ENV['FACTER_GEM_VERSION']
Expand Down
File renamed without changes.
46 changes: 8 additions & 38 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,40 +1,9 @@
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
begin
require 'beaker/tasks/test'
rescue LoadError
#Do nothing, rescue for Windows as beaker does not work and will not be installed
end

#Due to puppet-lint not ignoring tests folder or the ignore paths attribute
#we have to ignore many things
# #Due to bug in puppet-lint we have to clear and redo the lint tasks to achieve ignore paths
Rake::Task[:lint].clear
PuppetLint::RakeTask.new(:lint) do |config|
config.pattern = 'manifests/**/*.pp'
config.fail_on_warnings = true
config.disable_checks = [
'80chars',
'class_inherits_from_params_class',
'class_parameter_defaults',
'documentation',
'single_quote_string_with_variables']
config.ignore_paths = ["tests/*.pp", "spec/**/*.pp", "pkg/**/*.pp"]
end

desc 'Run RSpec'
RSpec::Core::RakeTask.new(:test) do |t|
t.pattern = 'spec/{unit}/**/*.rb'
#t.rspec_opts = ['--color']
end

desc 'Generate code coverage'
RSpec::Core::RakeTask.new(:coverage) do |t|
t.rcov = true
t.rcov_opts = ['--exclude', 'spec']
end
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-syntax/tasks/puppet-syntax'
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?

def changelog_user
return unless Rake.application.top_level_tasks.include? "changelog"
Expand Down Expand Up @@ -113,4 +82,5 @@ Gemfile:
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
EOM
end
end
end

44 changes: 23 additions & 21 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ init:
- 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0'
- 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0'
environment:
SIMPLECOV: yes
matrix:
-
RUBY_VERSION: 24-x64
Expand All @@ -35,29 +36,30 @@ environment:
RUBY_VERSION: 25-x64
CHECK: parallel_spec
-
PUPPET_GEM_VERSION: ~> 4.0
RUBY_VERSION: 21
CHECK: spec
-
PUPPET_GEM_VERSION: ~> 4.0
RUBY_VERSION: 21-x64
CHECK: spec
-
PUPPET_GEM_VERSION: ~> 5.0
RUBY_VERSION: 24
CHECK: spec
-
PUPPET_GEM_VERSION: ~> 5.0
RUBY_VERSION: 24-x64
CHECK: spec
-
PUPPET_GEM_VERSION: ~> 6.0
RUBY_VERSION: 25
CHECK: spec
RUBY_VERSION: 25-x64
ACCEPTANCE: yes
TARGET_HOST: localhost
-
PUPPET_GEM_VERSION: ~> 6.0
RUBY_VERSION: 25-x64
CHECK: spec
ACCEPTANCE: yes
TARGET_HOST: localhost
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
for:
-
matrix:
only:
- ACCEPTANCE: yes
install:
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
- bundle install --jobs 4 --retry 2
- type Gemfile.lock
test_script:
- bundle exec puppet -V
- ruby -v
- gem -v
- bundle -v
- bundle exec rake spec_prep
- bundle exec rake litmus:acceptance:localhost
matrix:
fast_finish: true
install:
Expand Down
25 changes: 25 additions & 0 deletions distelli-manifest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
team-modules/puppetlabs-registry:
PreBuild:
- source /opt/rh/rh-ruby25/enable
- echo "--- LETS update BUNDLER ---"
- bundle install --path vendor/bundle --jobs 3
Build:
- echo "--- PROVISIONING ---"
- source /opt/rh/rh-ruby25/enable
- bundle exec rake litmus:provision_list[release_checks]
- cat inventory.yaml
- echo "--- AGENT INSTALLATION ---"
- bundle exec rake litmus:install_agent
- echo "--- MODULE INSTALLATION ---"
- bundle exec rake litmus:install_module
- echo "--- TESTS RUNNING ---"
- bundle exec rake litmus:acceptance:parallel
AfterBuildSuccess:
- source /opt/rh/rh-ruby25/enable
- bundle exec rake litmus:tear_down
AfterBuildFailure:
- source /opt/rh/rh-ruby25/enable
- bundle exec rake litmus:tear_down
CommitData:
- RepoType: Git
- RepoPath: .
3 changes: 1 addition & 2 deletions manifests/value.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
) {

# ensure windows os
if $::operatingsystem != 'windows'{
if $::operatingsystem != 'windows' {
fail("Unsupported OS ${::operatingsystem}")
}

Expand All @@ -73,4 +73,3 @@
data => $data,
}
}

6 changes: 3 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-registry",
"version": "3.0.0",
"version": "3.1.0",
"author": "puppetlabs",
"summary": "This module provides a native type and provider to manage keys and values in the Windows Registry",
"license": "Apache-2.0",
Expand Down Expand Up @@ -33,7 +33,7 @@
}
],
"description": "This module provides a native type and provider to manage keys and values in the Windows Registry",
"pdk-version": "1.13.0",
"pdk-version": "1.14.1",
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
"template-ref": "1.14.0-0-g1bf3a4e"
"template-ref": "heads/master-0-g643529a"
}
10 changes: 10 additions & 0 deletions provision.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
default:
provisioner: vmpooler
images: ['win-2016-x86_64']
release_checks:
provisioner: vmpooler
images: ['win-2008-x86_64', 'win-2008r2-x86_64', 'win-2012-x86_64', 'win-2012r2-x86_64', 'win-2016-core-x86_64', 'win-2019-core-x86_64', 'win-7-x86_64', 'win-81-x86_64', 'win-10-pro-x86_64']
vagrant:
provisioner: vagrant
images: ['gusztavvargadr/windows-server']
10 changes: 0 additions & 10 deletions spec/acceptance/nodesets/centos-7-x64.yml

This file was deleted.

Loading