diff options
| author | Claire McQuin <claire@getchef.com> | 2014-09-24 10:29:32 -0700 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-09-24 10:29:32 -0700 |
| commit | d9894dcf47200a047b5e54284f43543dbf2e322b (patch) | |
| tree | 94de5ed782a1b5b12d07b4e4a1bb5617e007498f | |
| parent | 2f25202d08edcbd77212b6083b120df4e47e6a87 (diff) | |
| download | chef-d9894dcf47200a047b5e54284f43543dbf2e322b.tar.gz | |
Remove requires path_helper from knife class, add to knife subclasses using PathHelper.
| -rw-r--r-- | lib/chef/knife.rb | 1 | ||||
| -rw-r--r-- | lib/chef/knife/core/bootstrap_context.rb | 2 | ||||
| -rw-r--r-- | lib/chef/knife/core/object_loader.rb | 1 | ||||
| -rw-r--r-- | lib/chef/knife/data_bag_from_file.rb | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 377d3841d8..6421384f01 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -28,7 +28,6 @@ require 'chef/knife/core/ui' require 'chef/local_mode' require 'chef/rest' require 'pp' -require 'chef/util/path_helper' class Chef class Knife diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb index 2b3d2c53a8..03e3a42e4a 100644 --- a/lib/chef/knife/core/bootstrap_context.rb +++ b/lib/chef/knife/core/bootstrap_context.rb @@ -17,6 +17,8 @@ # require 'chef/run_list' +require 'chef/util/path_helper' + class Chef class Knife module Core diff --git a/lib/chef/knife/core/object_loader.rb b/lib/chef/knife/core/object_loader.rb index ba60a7c811..209f6987d4 100644 --- a/lib/chef/knife/core/object_loader.rb +++ b/lib/chef/knife/core/object_loader.rb @@ -17,6 +17,7 @@ # require 'ffi_yajl' +require 'chef/util/path_helper' class Chef class Knife diff --git a/lib/chef/knife/data_bag_from_file.rb b/lib/chef/knife/data_bag_from_file.rb index aaa1ed4f64..2ff79b6256 100644 --- a/lib/chef/knife/data_bag_from_file.rb +++ b/lib/chef/knife/data_bag_from_file.rb @@ -18,6 +18,7 @@ # require 'chef/knife' +require 'chef/util/path_helper' class Chef class Knife |