diff options
| author | Tim Smith <tsmith84@gmail.com> | 2015-10-18 20:39:42 -0700 |
|---|---|---|
| committer | Steven Murawski <steven.murawski@gmail.com> | 2015-10-21 09:22:49 -0500 |
| commit | 9469d3a5ab22655fe13a4dd09823bd371fce3c10 (patch) | |
| tree | a53f8b861298dafce4a200a50886861191b3fbed | |
| parent | a09f7e85c7ea123ee4ffdf61921c7e23b92c9d8e (diff) | |
| download | chef-9469d3a5ab22655fe13a4dd09823bd371fce3c10.tar.gz | |
Update messaging to match LWRP -> Custom Resource rename
If you showed up in a post-LWRP world these would be confusing
| -rw-r--r-- | lib/chef/resource/lwrp_base.rb | 12 | ||||
| -rw-r--r-- | spec/unit/lwrp_spec.rb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index 443e0ed819..a9a669f18c 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -1,8 +1,8 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Christopher Walters (<cw@opscode.com>) -# Author:: Daniel DeLeo (<dan@opscode.com>) -# Copyright:: Copyright (c) 2008-2012 Opscode, Inc. +# Author:: Adam Jacob (<adam@chef.io>) +# Author:: Christopher Walters (<cw@chef.io>) +# Author:: Daniel DeLeo (<dan@chef.io>) +# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -45,7 +45,7 @@ class Chef def build_from_file(cookbook_name, filename, run_context) if LWRPBase.loaded_lwrps[filename] - Chef::Log.info("LWRP resource #{filename} from cookbook #{cookbook_name} has already been loaded! Skipping the reload.") + Chef::Log.info("Custom resource #{filename} from cookbook #{cookbook_name} has already been loaded! Skipping the reload.") return loaded_lwrps[filename] end @@ -60,7 +60,7 @@ class Chef # Make a useful string for the class (rather than <Class:312894723894>) resource_class.instance_eval do define_singleton_method(:to_s) do - "LWRP resource #{resource_name} from cookbook #{cookbook_name}" + "Custom resource #{resource_name} from cookbook #{cookbook_name}" end define_singleton_method(:inspect) { to_s } end diff --git a/spec/unit/lwrp_spec.rb b/spec/unit/lwrp_spec.rb index bcb64cb21e..7f6d315bbb 100644 --- a/spec/unit/lwrp_spec.rb +++ b/spec/unit/lwrp_spec.rb @@ -190,7 +190,7 @@ describe "LWRP" do end it "should have a class that outputs a reasonable string" do - expect(get_lwrp(:lwrp_foo).to_s).to eq "LWRP resource lwrp_foo from cookbook lwrp" + expect(get_lwrp(:lwrp_foo).to_s).to eq "Custom resource lwrp_foo from cookbook lwrp" end it "should add the specified actions to the allowed_actions array" do |