diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-10-13 10:50:24 -0500 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-10-16 10:33:02 -0500 |
| commit | 43e8d8b751293bf1eb03b69e6dc3c2c621154ed4 (patch) | |
| tree | d3816573c99ea3c11530b849b7e6bb50223e62a3 /lib/chef/shell | |
| parent | b2f47460c7036f94e1bed1ca23f4d18409374af2 (diff) | |
| download | chef-43e8d8b751293bf1eb03b69e6dc3c2c621154ed4.tar.gz | |
Finishing all code changes to split resource collection into 2 data containers
Diffstat (limited to 'lib/chef/shell')
| -rw-r--r-- | lib/chef/shell/ext.rb | 4 | ||||
| -rw-r--r-- | lib/chef/shell/shell_session.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/shell/ext.rb b/lib/chef/shell/ext.rb index bc4e955169..ea11d9d1a8 100644 --- a/lib/chef/shell/ext.rb +++ b/lib/chef/shell/ext.rb @@ -244,7 +244,7 @@ E :skip_back => "move back in the run list", :skip_forward => "move forward in the run list" def chef_run - Shell.session.resource_collection.iterator + Shell.session.resource_list.iterator end desc "resets the current recipe" @@ -547,7 +547,7 @@ E desc "list all the resources on the current recipe" def resources(*args) if args.empty? - pp run_context.resource_collection.instance_variable_get(:@resources_by_name).keys + pp run_context.resource_set.keys else pp resources = original_resources(*args) resources diff --git a/lib/chef/shell/shell_session.rb b/lib/chef/shell/shell_session.rb index 73e6c34ebb..6486a5ebeb 100644 --- a/lib/chef/shell/shell_session.rb +++ b/lib/chef/shell/shell_session.rb @@ -69,8 +69,8 @@ module Shell @node.consume_attributes(@node_attributes) end - def resource_collection - run_context.resource_collection + def resource_list + run_context.resource_list end def run_context |