diff --git a/.gitignore b/.gitignore index 82426da..b521749 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ spec/fixtures/modules/ coverage/ log/ .idea/ +.dependencies/ +.librarian/ +Puppetfile.lock *.iml .*.sw? .yardoc/ diff --git a/.msync.yml b/.msync.yml index 1bc592b..b42c487 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '0.16.8' +modulesync_config_version: '0.19.3' diff --git a/.pmtignore b/.pmtignore new file mode 100644 index 0000000..77f12ae --- /dev/null +++ b/.pmtignore @@ -0,0 +1 @@ +docs/ diff --git a/.rubocop.yml b/.rubocop.yml index b495f77..ef85ceb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -519,5 +519,6 @@ RSpec/RepeatedDescription: RSpec/NestedGroups: Enabled: False +# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs Security/YAMLLoad: - Enabled: False + Enabled: false diff --git a/.travis.yml b/.travis.yml index 57e99e3..2c45544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ --- sudo: false -addons: - apt: - packages: - - libaugeas-dev +dist: trusty language: ruby cache: bundler bundler_args: --without system_tests development @@ -19,24 +16,18 @@ script: matrix: fast_finish: true include: - - rvm: 1.9.3 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test - - rvm: 1.9.3 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test - - rvm: 2.1.9 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test - rvm: 2.1.9 env: PUPPET_VERSION="~> 4.0" CHECK=test - rvm: 2.2.6 env: PUPPET_VERSION="~> 4.0" CHECK=test - - rvm: 2.3.3 - env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes - - rvm: 2.3.3 - env: PUPPET_VERSION="~> 4.0" CHECK=rubocop - rvm: 2.3.3 env: PUPPET_VERSION="~> 4.0" CHECK=test - rvm: 2.4.0 env: PUPPET_VERSION="~> 4.0" CHECK=test + - rvm: 2.4.0 + env: PUPPET_VERSION="~> 4.0" CHECK=rubocop + - rvm: 2.4.0 + env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes - rvm: default env: BEAKER_set="debian-7-x86_64-docker" PUPPET_AIO="yes" services: docker @@ -49,8 +40,6 @@ matrix: env: BEAKER_set="centos-7-x86_64-docker" PUPPET_AIO="yes" services: docker sudo: required - allow_failures: - - rvm: 2.4.0 branches: only: - master diff --git a/.yardopts b/.yardopts index 29c933b..3687f51 100644 --- a/.yardopts +++ b/.yardopts @@ -1 +1,2 @@ --markup markdown +--output-dir docs/ diff --git a/Gemfile b/Gemfile index 868105d..3bbbce9 100644 --- a/Gemfile +++ b/Gemfile @@ -29,11 +29,12 @@ group :test do gem 'redcarpet', :require => false gem 'rubocop', '~> 0.47.0', :require => false if RUBY_VERSION >= '2.3.0' gem 'rubocop-rspec', '~> 1.10.0', :require => false if RUBY_VERSION >= '2.3.0' - gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0' gem 'mocha', '>= 1.2.1', :require => false - gem 'coveralls', :require => false if RUBY_VERSION >= '2.0.0' - gem 'simplecov-console', :require => false if RUBY_VERSION >= '2.0.0' - gem 'ruby-augeas', :require => false + gem 'coveralls', :require => false + gem 'simplecov-console', :require => false + gem 'github_changelog_generator', '~> 1.13.0', :require => false if RUBY_VERSION < '2.2.2' + gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2' + gem 'github_changelog_generator', :require => false if RUBY_VERSION >= '2.2.2' end group :development do diff --git a/Rakefile b/Rakefile index d00f247..2def02f 100644 --- a/Rakefile +++ b/Rakefile @@ -30,4 +30,15 @@ task test: [ :metadata_lint, :release_checks, ] + +begin + require 'github_changelog_generator/task' + GitHubChangelogGenerator::RakeTask.new :changelog do |config| + version = (Blacksmith::Modulefile.new).version + config.future_release = "#{version}" + config.header = "# Change log\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not impact the functionality of the module." + config.exclude_labels = %w{duplicate question invalid wontfix modulesync} + end +rescue LoadError +end # vim: syntax=ruby diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ec90ce1..2aa9da7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,19 +2,7 @@ require 'rspec-puppet-facts' include RspecPuppetFacts -# Setup augeasproviders -require 'pathname' -dir = Pathname.new(__FILE__).parent -$LOAD_PATH.unshift(dir, File.join(dir, 'fixtures/modules/augeasproviders_core/spec/lib'), File.join(dir, '..', 'lib')) -require 'augeas_spec' -require 'pathname' -dir = Pathname.new(__FILE__).parent -Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules') -puts 'augeasproviders: setting Puppet[:libdir] to work around broken type autoloading' -# libdir is only a single dir, so it can only workaround loading of one external module -Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib" - -if Dir.exist?(File.expand_path('../../lib', __FILE__)) && RUBY_VERSION !~ %r{^1.9} +if Dir.exist?(File.expand_path('../../lib', __FILE__)) require 'coveralls' require 'simplecov' require 'simplecov-console'