diff options
| -rw-r--r-- | lib/chef/knife/cookbook_upload.rb | 4 | ||||
| -rw-r--r-- | spec/integration/knife/cookbook_upload_spec.rb | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/lib/chef/knife/cookbook_upload.rb b/lib/chef/knife/cookbook_upload.rb index 765541399d..d3db87a434 100644 --- a/lib/chef/knife/cookbook_upload.rb +++ b/lib/chef/knife/cookbook_upload.rb @@ -39,9 +39,7 @@ class Chef option :cookbook_path, short: "-o 'PATH:PATH'", long: "--cookbook-path 'PATH:PATH'", - description: "A colon-separated path to look for cookbooks in. - Colon seprated path has been deprecated for Windows machine. - In windows please use semicolon-separated path(For ex: 'PATH;PATH').", + description: "A delimited path to search for cookbooks. On Unix the delimiter is ':', on Windows it is ';'.", proc: lambda { |o| o.split(File::PATH_SEPARATOR) } option :freeze, diff --git a/spec/integration/knife/cookbook_upload_spec.rb b/spec/integration/knife/cookbook_upload_spec.rb index 29bc713703..45e4cd9edb 100644 --- a/spec/integration/knife/cookbook_upload_spec.rb +++ b/spec/integration/knife/cookbook_upload_spec.rb @@ -97,16 +97,17 @@ describe "knife cookbook upload", :workstation do expect { knife("cookbook upload x -o #{cb_dir}") }.to raise_error(Chef::Exceptions::MetadataNotValid) end end - - when_the_repository "have cookbooks at muliple paths" do - let(:cb_dir_first) do - File.join(@repository_dir,"cookbooks") - .gsub(File::SEPARATOR,File::ALT_SEPARATOR || File::SEPARATOR) + + when_the_repository "has cookbooks at multiple paths" do + + let(:cb_dir_first) do + File.join(@repository_dir, "cookbooks") + .gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR) end - + let(:cb_dir_second) do - File.join(@repository_dir,"test_cookbooks") - .gsub(File::SEPARATOR,File::ALT_SEPARATOR || File::SEPARATOR) + File.join(@repository_dir, "test_cookbooks") + .gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR) end before(:each) do |