From 81cba7eb0f8a15b728820f5c077eca5633479c70 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Mon, 16 Nov 2020 13:40:37 +0000 Subject: [PATCH 1/2] Update travis to add ruby 2.7 testing and use puppet#main instead of #master --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 362f0fd0..245d91fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,9 @@ jobs: - rvm: 2.5.7 env: PUPPET_GEM_VERSION='~> 6.14.0' - rvm: 2.5.7 - env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#master' + env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#main' + - rvm: 2.7 + env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#main' - rvm: 2.4.3 env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#5.5.x' notifications: From d5c0cb76d1ac833804d3e6d7f506187093e1c8f0 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Mon, 16 Nov 2020 14:25:33 +0000 Subject: [PATCH 2/2] Fix ruby2.7 deprecation warnings --- lib/puppet/resource_api/parameter.rb | 2 +- lib/puppet/resource_api/property.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/resource_api/parameter.rb b/lib/puppet/resource_api/parameter.rb index ef749405..5460c057 100644 --- a/lib/puppet/resource_api/parameter.rb +++ b/lib/puppet/resource_api/parameter.rb @@ -17,7 +17,7 @@ def initialize(type_name, data_type, attribute_name, resource_hash) @type_name = type_name @data_type = data_type @attribute_name = attribute_name - super(resource_hash) # Pass resource to parent Puppet class. + super(**resource_hash) # Pass resource to parent Puppet class. end # This method assigns value to the parameter and cleans value. diff --git a/lib/puppet/resource_api/property.rb b/lib/puppet/resource_api/property.rb index 34609f8c..8d04721b 100644 --- a/lib/puppet/resource_api/property.rb +++ b/lib/puppet/resource_api/property.rb @@ -18,7 +18,7 @@ def initialize(type_name, data_type, attribute_name, resource_hash) # Define class method insync?(is) if the name is :ensure def_insync? if @attribute_name == :ensure && self.class != Puppet::ResourceApi::Property # Pass resource to parent Puppet class. - super(resource_hash) + super(**resource_hash) end # This method returns value of the property.