Merge pull request #276 from StackStorm/hotfix/build-failures

Build fixes for travis failures

Author: nmaludy

.rubocop.yml

@@ -1,5 +1,7 @@
 ---
-require: rubocop-rspec
+require:
+- rubocop-rspec
+- rubocop-i18n
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: '2.1'
@@ -19,10 +21,12 @@ AllCops:
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
+GetText:
+  Enabled: false
 GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
-  - spec/*
+  - spec/**/*
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.

.ruby-version

@@ -1 +1 @@
-2.4.4
+2.5.1

.sync.yml

@@ -16,6 +16,9 @@
 .travis.yml:
   # we keep our own .travis.yml because of integration testing
   unmanaged: true
+.vscode/extensions.json:
+  # we don't use VSCode
+  unmanaged: true
 appveyor.yml:
   # we don't use Appveyor
   unmanaged: true

.travis.yml

@@ -65,42 +65,42 @@ matrix:
         - DOCS_TEST="true"
         - PUPPET_GEM_VERSION="~> 6.0"
     - name: "RHEL/CentOS 6 - Puppet 5"
-      rvm: 2.4
+      rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="centos6-puppet5"
     - name: "RHEL/CentOS 6 - Puppet 6"
-      rvm: 2.4
+      rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="centos6-puppet6"
     - name: "RHEL/CentOS 7 - Puppet 5"
-      rvm: 2.4
+      rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="centos7-puppet5"
     - name: "RHEL/CentOS 7 - Puppet 6"
-      rvm: 2.4
+      rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="centos7-puppet6"
     - name: "Ubuntu 14 - Puppet 5"
-      rvm: 2.4
+      rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="ubuntu14-puppet5"
     - name: "Ubuntu 14 - Puppet 6"
-      rvm: 2.4
+      rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="ubuntu14-puppet6"
     - name: "Ubuntu 16 - Puppet 5"
-      rvm: 2.4
+      rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="ubuntu16-puppet5"
     - name: "Ubuntu 16 - Puppet 6"
-      rvm: 2.4
+      rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="ubuntu16-puppet6"

Gemfile

@@ -23,10 +23,11 @@ group :development do
   gem "json", '= 1.8.1',                                                       require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
   gem "json", '= 2.0.4',                                                       require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   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 "puppet-module-posix-default-r#{minor_version}",                         require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}",                             require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}",                           require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}",                               require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  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-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-lint-absolute_classname-check", '>= 0.2.4',                      require: false
   gem "puppet-lint-absolute_template_path", '>= 1.0.1',                        require: false
   gem "puppet-lint-alias-check", '>= 0.1.1',                                   require: false
@@ -39,7 +40,6 @@ group :development do
   gem "puppet-lint-trailing_comma-check", '>= 0.3.2',                          require: false
   gem "puppet-lint-unquoted_string-check", '>= 0.3.0',                         require: false
   gem "puppet-lint-version_comparison-check", '>= 0.2.1',                      require: false
-  gem "r10k", '>= 2.0.0',                                                      require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

Rakefile

@@ -1,3 +1,4 @@
+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?
@@ -14,8 +15,17 @@ end
 
 def changelog_project
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['name']
-  raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
+
+  returnVal = nil
+  returnVal ||= begin
+    metadata_source = JSON.load(File.read('metadata.json'))['source']
+    metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
+
+    metadata_source_match && metadata_source_match[1]
+  end
+
+  raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
+
   puts "GitHubChangelogGenerator project:#{returnVal}"
   returnVal
 end

Vagrantfile

@@ -40,9 +40,11 @@ provider   = provider.to_sym
 # The following boxes will work for both :virtualbox and :libvirt providers
 #  - centos/6
 #  - centos/7
-#  - generic/1404
-#  - generic/1604
+#  - generic/ubuntu1404
+#  - generic/ubuntu1604
+#  - generic/ubuntu1804
 box        = ENV['BOX'] ? ENV['BOX'] : 'centos/7'
+#box        = ENV['BOX'] ? ENV['BOX'] : 'generic/ubuntu1604'
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"

build/kitchen/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
 # Gems for kitchen ci
-gem 'inspec'
+# hard code to 4.16.0 because of missing resource declaration bugs in 4.17.x
+gem 'inspec', '~> 4.16.0'
 gem 'kitchen-docker'
 gem 'kitchen-inspec'
 # install kitchen-puppet from git so we get use the resolve_with_r10k feature

metadata.json

@@ -95,7 +95,7 @@
       "version_requirement": ">= 4.7.0 < 7.0.0"
     }
   ],
-  "pdk-version": "1.10.0",
-  "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git#1.10.0",
-  "template-ref": "1.10.0-0-gbba9ac3"
+  "pdk-version": "1.13.0",
+  "template-url": "pdk-default#1.13.0",
+  "template-ref": "1.13.0-0-g66e1443"
 }

spec/spec_helper.rb

@@ -29,6 +29,11 @@
   end
 end
 
+# read default_facts and merge them over what is provided by facterdb
+default_facts.each do |fact, value|
+  add_custom_fact fact, value
+end
+
 RSpec.configure do |c|
   c.default_facts = default_facts
   c.before :each do
@@ -41,6 +46,8 @@
   end
 end
 
+# Ensures that a module is defined
+# @param module_name Name of the module
 def ensure_module_defined(module_name)
   module_name.split('::').reduce(Object) do |last_module, next_module|
     last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)