chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/spec/unit/knife/cookbook_list_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
-# Copyright:: Copyright (c) 2011 Thomas Bishop
+# Copyright:: Copyright 2011-2016, Thomas Bishop
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,47 +16,47 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::CookbookList do
   before do
     @knife = Chef::Knife::CookbookList.new
-    @rest_mock = double('rest')
+    @rest_mock = double("rest")
     allow(@knife).to receive(:rest).and_return(@rest_mock)
-    @cookbook_names = ['apache2', 'mysql']
-    @base_url = 'https://server.example.com/cookbooks'
+    @cookbook_names = ["apache2", "mysql"]
+    @base_url = "https://server.example.com/cookbooks"
     @cookbook_data = {}
     @cookbook_names.each do |item|
-      @cookbook_data[item] = {'url' => "#{@base_url}/#{item}",
-                              'versions' => [{'version' => '1.0.1',
-                                              'url' => "#{@base_url}/#{item}/1.0.1"}]}
+      @cookbook_data[item] = { "url" => "#{@base_url}/#{item}",
+                               "versions" => [{ "version" => "1.0.1",
+                                                "url" => "#{@base_url}/#{item}/1.0.1" }] }
     end
     @stdout = StringIO.new
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)
   end
 
-  describe 'run' do
-    it 'should display the latest version of the cookbooks' do
-      expect(@rest_mock).to receive(:get_rest).with('/cookbooks?num_versions=1').
-                                           and_return(@cookbook_data)
+  describe "run" do
+    it "should display the latest version of the cookbooks" do
+      expect(@rest_mock).to receive(:get).with("/cookbooks?num_versions=1").
+        and_return(@cookbook_data)
       @knife.run
       @cookbook_names.each do |item|
         expect(@stdout.string).to match /#{item}\s+1\.0\.1/
       end
     end
 
-    it 'should query cookbooks for the configured environment' do
-      @knife.config[:environment] = 'production'
-      expect(@rest_mock).to receive(:get_rest).
-                 with('/environments/production/cookbooks?num_versions=1').
-                 and_return(@cookbook_data)
+    it "should query cookbooks for the configured environment" do
+      @knife.config[:environment] = "production"
+      expect(@rest_mock).to receive(:get).
+        with("/environments/production/cookbooks?num_versions=1").
+        and_return(@cookbook_data)
       @knife.run
     end
 
-    describe 'with -w or --with-uri' do
-      it 'should display the cookbook uris' do
+    describe "with -w or --with-uri" do
+      it "should display the cookbook uris" do
         @knife.config[:with_uri] = true
-        allow(@rest_mock).to receive(:get_rest).and_return(@cookbook_data)
+        allow(@rest_mock).to receive(:get).and_return(@cookbook_data)
         @knife.run
         @cookbook_names.each do |item|
           pattern = /#{Regexp.escape(@cookbook_data[item]['versions'].first['url'])}/
@@ -65,18 +65,18 @@ describe Chef::Knife::CookbookList do
       end
     end
 
-    describe 'with -a or --all' do
+    describe "with -a or --all" do
       before do
         @cookbook_names.each do |item|
-          @cookbook_data[item]['versions'] << {'version' => '1.0.0',
-                                               'url' => "#{@base_url}/#{item}/1.0.0"}
+          @cookbook_data[item]["versions"] << { "version" => "1.0.0",
+                                                "url" => "#{@base_url}/#{item}/1.0.0" }
         end
       end
 
-      it 'should display all versions of the cookbooks' do
+      it "should display all versions of the cookbooks" do
         @knife.config[:all_versions] = true
-        expect(@rest_mock).to receive(:get_rest).with('/cookbooks?num_versions=all').
-                                             and_return(@cookbook_data)
+        expect(@rest_mock).to receive(:get).with("/cookbooks?num_versions=all").
+          and_return(@cookbook_data)
         @knife.run
         @cookbook_names.each do |item|
           expect(@stdout.string).to match /#{item}\s+1\.0\.1\s+1\.0\.0/

data/spec/unit/knife/cookbook_metadata_from_file_spec.rb

@@ -1,8 +1,8 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Matthew Kent (<mkent@magoazul.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,11 +18,11 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::CookbookMetadataFromFile do
   before(:each) do
-    Chef::Config[:node_name]  = "webmonkey.example.com"
+    Chef::Config[:node_name] = "webmonkey.example.com"
     @src = File.expand_path(File.join(CHEF_SPEC_DATA, "metadata", "quick_start", "metadata.rb"))
     @tgt = File.expand_path(File.join(CHEF_SPEC_DATA, "metadata", "quick_start", "metadata.json"))
     @knife = Chef::Knife::CookbookMetadataFromFile.new

data/spec/unit/knife/cookbook_metadata_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
-# Copyright:: Copyright (c) 2011 Thomas Bishop
+# Copyright:: Copyright 2011-2016, Thomas Bishop
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::CookbookMetadata do
   before(:each) do
     @knife = Chef::Knife::CookbookMetadata.new
-    @knife.name_args = ['foobar']
+    @knife.name_args = ["foobar"]
     @cookbook_dir = Dir.mktmpdir
     @json_data = '{ "version": "1.0.0" }'
     @stdout = StringIO.new
@@ -30,50 +30,50 @@ describe Chef::Knife::CookbookMetadata do
     allow(@knife.ui).to receive(:stderr).and_return(@stderr)
   end
 
-  describe 'run' do
-    it 'should print an error and exit if a cookbook name was not provided' do
+  describe "run" do
+    it "should print an error and exit if a cookbook name was not provided" do
       @knife.name_args = []
       expect(@knife.ui).to receive(:error).with(/you must specify the cookbook.+use the --all/i)
       expect { @knife.run }.to raise_error(SystemExit)
     end
 
-    it 'should print an error and exit if an empty cookbook name was provided' do
-      @knife.name_args = ['']
+    it "should print an error and exit if an empty cookbook name was provided" do
+      @knife.name_args = [""]
       expect(@knife.ui).to receive(:error).with(/you must specify the cookbook.+use the --all/i)
       expect { @knife.run }.to raise_error(SystemExit)
     end
 
-    it 'should generate the metadata for the cookbook' do
-      expect(@knife).to receive(:generate_metadata).with('foobar')
+    it "should generate the metadata for the cookbook" do
+      expect(@knife).to receive(:generate_metadata).with("foobar")
       @knife.run
     end
 
-    describe 'with -a or --all' do
+    describe "with -a or --all" do
       before(:each) do
         @knife.config[:all] = true
-        @foo = Chef::CookbookVersion.new('foo', '/tmp/blah')
-        @foo.version = '1.0.0'
-        @bar = Chef::CookbookVersion.new('bar', '/tmp/blah')
-        @bar.version = '2.0.0'
+        @foo = Chef::CookbookVersion.new("foo", "/tmp/blah")
+        @foo.version = "1.0.0"
+        @bar = Chef::CookbookVersion.new("bar", "/tmp/blah")
+        @bar.version = "2.0.0"
         @cookbook_loader = {
           "foo" => @foo,
-          "bar" => @bar
+          "bar" => @bar,
         }
         expect(@cookbook_loader).to receive(:load_cookbooks).and_return(@cookbook_loader)
-        expect(@knife).to receive(:generate_metadata).with('foo')
-        expect(@knife).to receive(:generate_metadata).with('bar')
+        expect(@knife).to receive(:generate_metadata).with("foo")
+        expect(@knife).to receive(:generate_metadata).with("bar")
       end
 
-      it 'should generate the metadata for each cookbook' do
+      it "should generate the metadata for each cookbook" do
         Chef::Config[:cookbook_path] = @cookbook_dir
         expect(Chef::CookbookLoader).to receive(:new).with(@cookbook_dir).and_return(@cookbook_loader)
         @knife.run
       end
 
-      describe 'and with -o or --cookbook-path' do
-        it 'should look in the provided path and generate cookbook metadata' do
-          @knife.config[:cookbook_path] = '/opt/chef/cookbooks'
-          expect(Chef::CookbookLoader).to receive(:new).with('/opt/chef/cookbooks').and_return(@cookbook_loader)
+      describe "and with -o or --cookbook-path" do
+        it "should look in the provided path and generate cookbook metadata" do
+          @knife.config[:cookbook_path] = "/opt/chef/cookbooks"
+          expect(Chef::CookbookLoader).to receive(:new).with("/opt/chef/cookbooks").and_return(@cookbook_loader)
           @knife.run
         end
       end
@@ -81,55 +81,55 @@ describe Chef::Knife::CookbookMetadata do
 
   end
 
-  describe 'generate_metadata' do
+  describe "generate_metadata" do
     before(:each) do
       @knife.config[:cookbook_path] = @cookbook_dir
       allow(File).to receive(:expand_path).with("#{@cookbook_dir}/foobar/metadata.rb").
-                                    and_return("#{@cookbook_dir}/foobar/metadata.rb")
+        and_return("#{@cookbook_dir}/foobar/metadata.rb")
     end
 
-    it 'should generate the metadata from metadata.rb if it exists' do
+    it "should generate the metadata from metadata.rb if it exists" do
       expect(File).to receive(:exists?).with("#{@cookbook_dir}/foobar/metadata.rb").
-                                    and_return(true)
-      expect(@knife).to receive(:generate_metadata_from_file).with('foobar', "#{@cookbook_dir}/foobar/metadata.rb")
+        and_return(true)
+      expect(@knife).to receive(:generate_metadata_from_file).with("foobar", "#{@cookbook_dir}/foobar/metadata.rb")
       @knife.run
     end
 
-    it 'should validate the metadata json if metadata.rb does not exist' do
+    it "should validate the metadata json if metadata.rb does not exist" do
       expect(File).to receive(:exists?).with("#{@cookbook_dir}/foobar/metadata.rb").
-                                    and_return(false)
-      expect(@knife).to receive(:validate_metadata_json).with(@cookbook_dir, 'foobar')
+        and_return(false)
+      expect(@knife).to receive(:validate_metadata_json).with(@cookbook_dir, "foobar")
       @knife.run
     end
   end
 
-  describe 'generate_metadata_from_file' do
+  describe "generate_metadata_from_file" do
     before(:each) do
-      @metadata_mock = double('metadata')
-      @json_file_mock = double('json_file')
+      @metadata_mock = double("metadata")
+      @json_file_mock = double("json_file")
     end
 
-    it 'should generate the metatdata json from metatdata.rb' do
+    it "should generate the metatdata json from metatdata.rb" do
       allow(Chef::Cookbook::Metadata).to receive(:new).and_return(@metadata_mock)
-      expect(@metadata_mock).to receive(:name).with('foobar')
+      expect(@metadata_mock).to receive(:name).with("foobar")
       expect(@metadata_mock).to receive(:from_file).with("#{@cookbook_dir}/foobar/metadata.rb")
-      expect(File).to receive(:open).with("#{@cookbook_dir}/foobar/metadata.json", 'w').
-                                 and_yield(@json_file_mock)
+      expect(File).to receive(:open).with("#{@cookbook_dir}/foobar/metadata.json", "w").
+        and_yield(@json_file_mock)
       expect(@json_file_mock).to receive(:write).with(@json_data)
       expect(Chef::JSONCompat).to receive(:to_json_pretty).with(@metadata_mock).
-                                                       and_return(@json_data)
-      @knife.generate_metadata_from_file('foobar', "#{@cookbook_dir}/foobar/metadata.rb")
+        and_return(@json_data)
+      @knife.generate_metadata_from_file("foobar", "#{@cookbook_dir}/foobar/metadata.rb")
       expect(@stderr.string).to match /generating metadata for foobar from #{@cookbook_dir}\/foobar\/metadata\.rb/im
     end
 
-    { Chef::Exceptions::ObsoleteDependencySyntax => 'obsolote dependency',
-      Chef::Exceptions::InvalidVersionConstraint => 'invalid version constraint'
+    { Chef::Exceptions::ObsoleteDependencySyntax => "obsolote dependency",
+      Chef::Exceptions::InvalidVersionConstraint => "invalid version constraint",
     }.each_pair do |klass, description|
       it "should print an error and exit when an #{description} syntax exception is encountered" do
         exception = klass.new("#{description} blah")
         allow(Chef::Cookbook::Metadata).to receive(:new).and_raise(exception)
         expect {
-          @knife.generate_metadata_from_file('foobar', "#{@cookbook_dir}/foobar/metadata.rb")
+          @knife.generate_metadata_from_file("foobar", "#{@cookbook_dir}/foobar/metadata.rb")
         }.to raise_error(SystemExit)
         expect(@stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
         expect(@stderr.string).to match /in #{@cookbook_dir}\/foobar\/metadata\.rb/im
@@ -138,36 +138,36 @@ describe Chef::Knife::CookbookMetadata do
     end
   end
 
-  describe 'validate_metadata_json' do
-    it 'should validate the metadata json' do
+  describe "validate_metadata_json" do
+    it "should validate the metadata json" do
       expect(File).to receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
-                                   and_return(true)
+        and_return(true)
       expect(IO).to receive(:read).with("#{@cookbook_dir}/foobar/metadata.json").
-                               and_return(@json_data)
+        and_return(@json_data)
       expect(Chef::Cookbook::Metadata).to receive(:validate_json).with(@json_data)
-      @knife.validate_metadata_json(@cookbook_dir, 'foobar')
+      @knife.validate_metadata_json(@cookbook_dir, "foobar")
     end
 
-    it 'should not try to validate the metadata json if the file does not exist' do
+    it "should not try to validate the metadata json if the file does not exist" do
       expect(File).to receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
-                                   and_return(false)
+        and_return(false)
       expect(IO).not_to receive(:read)
       expect(Chef::Cookbook::Metadata).not_to receive(:validate_json)
-      @knife.validate_metadata_json(@cookbook_dir, 'foobar')
+      @knife.validate_metadata_json(@cookbook_dir, "foobar")
     end
 
-    { Chef::Exceptions::ObsoleteDependencySyntax => 'obsolote dependency',
-      Chef::Exceptions::InvalidVersionConstraint => 'invalid version constraint'
+    { Chef::Exceptions::ObsoleteDependencySyntax => "obsolote dependency",
+      Chef::Exceptions::InvalidVersionConstraint => "invalid version constraint",
     }.each_pair do |klass, description|
       it "should print an error and exit when an #{description} syntax exception is encountered" do
         expect(File).to receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
-                                     and_return(true)
+          and_return(true)
         expect(IO).to receive(:read).with("#{@cookbook_dir}/foobar/metadata.json").
-                                 and_return(@json_data)
+          and_return(@json_data)
         exception = klass.new("#{description} blah")
         allow(Chef::Cookbook::Metadata).to receive(:validate_json).and_raise(exception)
         expect {
-          @knife.validate_metadata_json(@cookbook_dir, 'foobar')
+          @knife.validate_metadata_json(@cookbook_dir, "foobar")
         }.to raise_error(SystemExit)
         expect(@stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
         expect(@stderr.string).to match /in #{@cookbook_dir}\/foobar\/metadata\.json/im

data/spec/unit/knife/cookbook_show_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, eersion 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,15 +17,15 @@
 #
 
 # rename to cookbook not coookbook
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Knife::CookbookShow do
   before(:each) do
-    Chef::Config[:node_name]  = "webmonkey.example.com"
+    Chef::Config[:node_name] = "webmonkey.example.com"
     @knife = Chef::Knife::CookbookShow.new
-    @knife.config = { }
+    @knife.config = {}
     @knife.name_args = [ "cookbook_name" ]
-    @rest = double(Chef::REST)
+    @rest = double(Chef::ServerAPI)
     allow(@knife).to receive(:rest).and_return(@rest)
     allow(@knife).to receive(:pretty_print).and_return(true)
     allow(@knife).to receive(:output).and_return(true)
@@ -33,7 +33,7 @@ describe Chef::Knife::CookbookShow do
 
   describe "run" do
     describe "with 0 arguments: help" do
-      it 'should should print usage and exit when given no arguments' do
+      it "should should print usage and exit when given no arguments" do
         @knife.name_args = []
         expect(@knife).to receive(:show_usage)
         expect(@knife.ui).to receive(:fatal)
@@ -49,21 +49,21 @@ describe Chef::Knife::CookbookShow do
             "versions" => [
               { "version" => "0.10.0", "url" => "http://url/cookbooks/cookbook_name/0.10.0" },
               { "version" => "0.9.0", "url" => "http://url/cookbookx/cookbook_name/0.9.0" },
-              { "version" => "0.8.0", "url" => "http://url/cookbooks/cookbook_name/0.8.0" }
-            ]
+              { "version" => "0.8.0", "url" => "http://url/cookbooks/cookbook_name/0.8.0" },
+            ],
           }
         }
       end
 
       it "should show the raw cookbook data" do
-        expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name").and_return(@response)
+        expect(@rest).to receive(:get).with("cookbooks/cookbook_name").and_return(@response)
         expect(@knife).to receive(:format_cookbook_list_for_display).with(@response)
         @knife.run
       end
 
       it "should respect the user-supplied environment" do
         @knife.config[:environment] = "foo"
-        expect(@rest).to receive(:get_rest).with("environments/foo/cookbooks/cookbook_name").and_return(@response)
+        expect(@rest).to receive(:get).with("environments/foo/cookbooks/cookbook_name").and_return(@response)
         expect(@knife).to receive(:format_cookbook_list_for_display).with(@response)
         @knife.run
       end
@@ -72,11 +72,11 @@ describe Chef::Knife::CookbookShow do
     describe "with 2 arguments: name and version" do
       before(:each) do
         @knife.name_args << "0.1.0"
-        @response = { "0.1.0" => { "recipes" => {"default.rb" => ""} } }
+        @response = { "0.1.0" => { "recipes" => { "default.rb" => "" } } }
       end
 
       it "should show the specific part of a cookbook" do
-        expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@response)
+        expect(@rest).to receive(:get).with("cookbooks/cookbook_name/0.1.0").and_return(@response)
         expect(@knife).to receive(:output).with(@response)
         @knife.run
       end
@@ -92,16 +92,16 @@ describe Chef::Knife::CookbookShow do
               :name => "default.rb",
               :path => "recipes/default.rb",
               :checksum => "1234",
-              :url => "http://example.org/files/default.rb"
-            }
+              :url => "http://example.org/files/default.rb",
+            },
           ]
         }
         @cookbook_response.manifest = @manifest
-        @response = {"name"=>"default.rb", "url"=>"http://example.org/files/default.rb", "checksum"=>"1234", "path"=>"recipes/default.rb"}
+        @response = { "name" => "default.rb", "url" => "http://example.org/files/default.rb", "checksum" => "1234", "path" => "recipes/default.rb" }
       end
 
       it "should print the json of the part" do
-        expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+        expect(@rest).to receive(:get).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
         expect(@knife).to receive(:output).with(@cookbook_response.manifest["recipes"])
         @knife.run
       end
@@ -117,16 +117,16 @@ describe Chef::Knife::CookbookShow do
               :name => "default.rb",
               :path => "recipes/default.rb",
               :checksum => "1234",
-              :url => "http://example.org/files/default.rb"
-            }
+              :url => "http://example.org/files/default.rb",
+            },
           ]
         }
         @response = "Example recipe text"
       end
 
       it "should print the raw result of the request (likely a file!)" do
-        expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-        expect(@rest).to receive(:get_rest).with("http://example.org/files/default.rb", true).and_return(StringIO.new(@response))
+        expect(@rest).to receive(:get).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+        expect(@rest).to receive(:streaming_request).with("http://example.org/files/default.rb").and_return(StringIO.new(@response))
         expect(@knife).to receive(:pretty_print).with(@response)
         @knife.run
       end
@@ -143,28 +143,28 @@ describe Chef::Knife::CookbookShow do
               :path => "files/host-examplehost.example.org/afile.rb",
               :checksum => "1111",
               :specificity => "host-examplehost.example.org",
-              :url => "http://example.org/files/1111"
+              :url => "http://example.org/files/1111",
             },
             {
               :name => "afile.rb",
               :path => "files/ubuntu-9.10/afile.rb",
               :checksum => "2222",
               :specificity => "ubuntu-9.10",
-              :url => "http://example.org/files/2222"
+              :url => "http://example.org/files/2222",
             },
             {
               :name => "afile.rb",
               :path => "files/ubuntu/afile.rb",
               :checksum => "3333",
               :specificity => "ubuntu",
-              :url => "http://example.org/files/3333"
+              :url => "http://example.org/files/3333",
             },
             {
               :name => "afile.rb",
               :path => "files/default/afile.rb",
               :checksum => "4444",
               :specificity => "default",
-              :url => "http://example.org/files/4444"
+              :url => "http://example.org/files/4444",
             },
           ]
         }
@@ -177,8 +177,8 @@ describe Chef::Knife::CookbookShow do
           @knife.config[:platform] = "example_platform"
           @knife.config[:platform_version] = "1.0"
           @knife.config[:fqdn] = "examplehost.example.org"
-          expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-          expect(@rest).to receive(:get_rest).with("http://example.org/files/1111", true).and_return(StringIO.new(@response))
+          expect(@rest).to receive(:get).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+          expect(@rest).to receive(:streaming_request).with("http://example.org/files/1111").and_return(StringIO.new(@response))
           expect(@knife).to receive(:pretty_print).with(@response)
           @knife.run
         end
@@ -189,8 +189,8 @@ describe Chef::Knife::CookbookShow do
           @knife.config[:platform] = "ubuntu"
           @knife.config[:platform_version] = "1.0"
           @knife.config[:fqdn] = "differenthost.example.org"
-          expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-          expect(@rest).to receive(:get_rest).with("http://example.org/files/3333", true).and_return(StringIO.new(@response))
+          expect(@rest).to receive(:get).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+          expect(@rest).to receive(:streaming_request).with("http://example.org/files/3333").and_return(StringIO.new(@response))
           expect(@knife).to receive(:pretty_print).with(@response)
           @knife.run
         end
@@ -201,8 +201,8 @@ describe Chef::Knife::CookbookShow do
           @knife.config[:platform] = "ubuntu"
           @knife.config[:platform_version] = "9.10"
           @knife.config[:fqdn] = "differenthost.example.org"
-          expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-          expect(@rest).to receive(:get_rest).with("http://example.org/files/2222", true).and_return(StringIO.new(@response))
+          expect(@rest).to receive(:get).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+          expect(@rest).to receive(:streaming_request).with("http://example.org/files/2222").and_return(StringIO.new(@response))
           expect(@knife).to receive(:pretty_print).with(@response)
           @knife.run
         end
@@ -210,8 +210,8 @@ describe Chef::Knife::CookbookShow do
 
       describe "with none of the arguments, it should use the default" do
         it "should pass them all" do
-          expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-          expect(@rest).to receive(:get_rest).with("http://example.org/files/4444", true).and_return(StringIO.new(@response))
+          expect(@rest).to receive(:get).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+          expect(@rest).to receive(:streaming_request).with("http://example.org/files/4444").and_return(StringIO.new(@response))
           expect(@knife).to receive(:pretty_print).with(@response)
           @knife.run
         end
@@ -220,4 +220,3 @@ describe Chef::Knife::CookbookShow do
     end
   end
 end
-