summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMat Schaffer <mat@schaffer.me>2015-11-11 22:56:15 +0900
committerMat Schaffer <mat@schaffer.me>2015-11-11 22:56:15 +0900
commitf8e55db82af844448f50611fa7fc8d770a634f17 (patch)
tree60c441e4963260aeed94b1236d51d75a955b947e
parentb0dbe243d469cc36477ba8102b74a8456b6f276d (diff)
downloadchef-f8e55db82af844448f50611fa7fc8d770a634f17.tar.gz
Require ShellOut before Knife::SSH definition
I ran into a NameError when trying to run https://github.com/matschaffer/knife-solo/blob/master/test/knife_bootstrap_test.rb#L14 that I think this should fix. My suspicion is that under normal operation shell_out gets required via the application or platform. And prior to moving config into its own project it was being required in chef/config.rb In my tests since I end up loading knife ssh directly without the surrounding application things don't work out. I'll likely just add a line to my test helper for now but wanted to open this for comment or future improvement.
-rw-r--r--lib/chef/knife/ssh.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index 89a9608c60..921b02f6f0 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -16,6 +16,7 @@
# limitations under the License.
#
+require 'chef/mixin/shell_out'
require 'chef/knife'
class Chef
@@ -29,7 +30,6 @@ class Chef
require 'readline'
require 'chef/exceptions'
require 'chef/search/query'
- require 'chef/mixin/shell_out'
require 'chef/mixin/command'
require 'chef/util/path_helper'
require 'mixlib/shellout'