diff options
| author | Thom May <thom@may.lt> | 2018-03-05 17:53:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 17:53:27 +0000 |
| commit | b2730d3f20dfd7d32a096f70862b33a54f5b6034 (patch) | |
| tree | 82d66d6c3116047e9f117f64334dfee3e8ec9eae | |
| parent | 598be5d64113a7fbc544e73df1246a68996e989a (diff) | |
| parent | 781b401e76cab359a8dc9d74a7bad1d356267d30 (diff) | |
| download | chef-b2730d3f20dfd7d32a096f70862b33a54f5b6034.tar.gz | |
Merge pull request #6903 from chef/portage
Modernize provides in the portage_package resource
| -rw-r--r-- | lib/chef/provider/package/portage.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/portage_package.rb | 10 | ||||
| -rw-r--r-- | spec/unit/resource/portage_package_spec.rb | 6 |
3 files changed, 5 insertions, 13 deletions
diff --git a/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb index 05a5df370e..e43e71f210 100644 --- a/lib/chef/provider/package/portage.rb +++ b/lib/chef/provider/package/portage.rb @@ -17,7 +17,7 @@ # require "chef/provider/package" -require "chef/resource/package" +require "chef/resource/portage_package" require "chef/util/path_helper" class Chef diff --git a/lib/chef/resource/portage_package.rb b/lib/chef/resource/portage_package.rb index a12039b555..6936f5129f 100644 --- a/lib/chef/resource/portage_package.rb +++ b/lib/chef/resource/portage_package.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,13 +22,9 @@ class Chef class Resource class PortagePackage < Chef::Resource::Package resource_name :portage_package - description "Use the portage_package resource to manage packages for the Gentoo platform." - - def initialize(name, run_context = nil) - super - @provider = Chef::Provider::Package::Portage - end + provides :portage_package + description "Use the portage_package resource to manage packages for the Gentoo platform." end end end diff --git a/spec/unit/resource/portage_package_spec.rb b/spec/unit/resource/portage_package_spec.rb index 02a7aef39a..a37cfd6e41 100644 --- a/spec/unit/resource/portage_package_spec.rb +++ b/spec/unit/resource/portage_package_spec.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,8 +29,4 @@ describe Chef::Resource::PortagePackage, "initialize" do it "sets the resource_name to :portage_package" do expect(resource.resource_name).to eql(:portage_package) end - - it "sets the provider to Chef::Provider::Package::Portage" do - expect(resource.provider).to eql(Chef::Provider::Package::Portage) - end end |