chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/spec/functional/shell_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,9 +16,10 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require 'functional/resource/base'
 require 'chef/version'
 require 'chef/shell'
+require 'chef/mixin/command/unix'
 
 describe Shell do
 
@@ -26,6 +27,7 @@ describe Shell do
   # not catch cases where chef-shell fails to boot because of changes in
   # chef/client.rb
   describe "smoke tests", :unix_only => true do
+    include Chef::Mixin::Command::Unix
 
     def read_until(io, expected_value)
       start = Time.new
@@ -59,32 +61,52 @@ describe Shell do
     end
 
     def run_chef_shell_with(options)
-      # Windows ruby installs don't (always?) have PTY,
-      # so hide the require here
-      require 'pty'
-      config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA)
-      path_to_chef_shell = File.expand_path("../../../bin/chef-shell", __FILE__)
-      reader, writer, pid = PTY.spawn("#{path_to_chef_shell} -c #{config} #{options}")
-      read_until(reader, "chef >")
-      yield reader, writer if block_given?
-      writer.puts('"done"')
-      output = read_until(reader, '=> "done"')
-      writer.print("exit\n")
-      read_until(reader, "exit")
-      read_until(reader, "\n")
-      read_until(reader, "\n")
-      writer.close
+      case ohai[:platform]
+      when "aix"
+        config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA)
+        path_to_chef_shell = File.expand_path("../../../bin/chef-shell", __FILE__)
+        output = ''
+        status = popen4("#{path_to_chef_shell} -c #{config} #{options}", :waitlast => true) do |pid, stdin, stdout, stderr|
+          read_until(stdout, "chef >")
+          yield stdout, stdin if block_given?
+          stdin.write("'done'\n")
+          output = read_until(stdout, '=> "done"')
+          stdin.print("exit\n")
+          read_until(stdout, "\n")
+        end
+
+        [output, status.exitstatus]
+      else
+        # Windows ruby installs don't (always?) have PTY,
+        # so hide the require here
+        begin
+          require 'pty'
+          config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA)
+          path_to_chef_shell = File.expand_path("../../../bin/chef-shell", __FILE__)
+          reader, writer, pid = PTY.spawn("#{path_to_chef_shell} -c #{config} #{options}")
+          read_until(reader, "chef >")
+          yield reader, writer if block_given?
+          writer.puts('"done"')
+          output = read_until(reader, '=> "done"')
+          writer.print("exit\n")
+          read_until(reader, "exit")
+          read_until(reader, "\n")
+          read_until(reader, "\n")
+          writer.close
 
-      exitstatus = wait_or_die(pid)
+          exitstatus = wait_or_die(pid)
 
-      [output, exitstatus]
-    rescue PTY::ChildExited => e
-      [output, e.status]
+          [output, exitstatus]
+        rescue PTY::ChildExited => e
+          [output, e.status]
+        end
+      end
     end
 
     it "boots correctly with -lauto" do
       output, exitstatus = run_chef_shell_with("-lauto")
-      exitstatus.should be_success
+      output.should include("done")
+      expect(exitstatus).to eq(0)
     end
 
     it "sets the log_level from the command line" do
@@ -94,9 +116,7 @@ describe Shell do
         read_until(out, show_log_level_code)
       end
       output.should include("===fatal===")
-      exitstatus.should be_success
+      expect(exitstatus).to eq(0)
     end
-
   end
-
 end

data/spec/functional/tiny_server_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/functional/version_spec.rb

@@ -0,0 +1,35 @@
+#
+# Author:: Serdar Sutay (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require File.expand_path('../../spec_helper', __FILE__)
+require 'chef/mixin/shell_out'
+require 'chef/version'
+require 'ohai/version'
+
+describe "Chef Versions" do
+  include Chef::Mixin::ShellOut
+  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..") }
+
+  binaries = [ "chef-client", "chef-shell", "chef-apply", "knife", "chef-solo" ]
+
+  binaries.each do |binary|
+    it "#{binary} version should be sane" do
+      shell_out!("ruby #{File.join("bin", binary)} -v", :cwd => chef_dir).stdout.chomp.should == "Chef: #{Chef::VERSION}"
+    end
+  end
+
+end

data/spec/functional/win32/versions_spec.rb

@@ -44,7 +44,7 @@ describe "Chef::ReservedNames::Win32::Version", :windows_only do
       # The name from WMI is actually what we want in Win2k8R2+.
       # So this expectation sould continue to hold without modification
       # as new versions of Windows are released.
-      @current_os_version = host.caption      
+      @current_os_version = host.caption
     end
 
     @version = Chef::ReservedNames::Win32::Version.new
@@ -55,10 +55,10 @@ describe "Chef::ReservedNames::Win32::Version", :windows_only do
       @current_os_version.should include(@version.marketing_name)
     end
   end
- 
+
   def is_windows_server_2008?(wmi_host)
     is_win2k8 = false
-    
+
     os_version = wmi_host.send('Version')
 
     # The operating system version is a string in the following form

data/spec/integration/client/client_spec.rb

@@ -0,0 +1,146 @@
+require 'support/shared/integration/integration_helper'
+require 'chef/mixin/shell_out'
+
+describe "chef-client" do
+  extend IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  when_the_repository "has a cookbook with a no-op recipe" do
+    file 'cookbooks/x/recipes/default.rb', ''
+
+    it "should complete with success" do
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+
+      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+      result.error!
+    end
+
+    context 'and no config file' do
+      it 'should complete with success when cwd is just above cookbooks and paths are not specified' do
+        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
+        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
+        result.error!
+      end
+
+      it 'should complete with success when cwd is below cookbooks and paths are not specified' do
+        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
+        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to('cookbooks/x'))
+        result.error!
+      end
+
+      it 'should fail when cwd is below high above and paths are not specified' do
+        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
+        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => File.expand_path('..', path_to('')))
+        result.exitstatus.should == 1
+      end
+    end
+
+    context 'and a config file under .chef/knife.rb' do
+      file '.chef/knife.rb', 'xxx.xxx'
+
+      it 'should load .chef/knife.rb when -z is specified' do
+        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
+        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('')}\"", :cwd => path_to(''))
+        result.exitstatus.should == 2
+      end
+
+      it 'fails to load .chef/knife.rb when -z is specified and --config-file-jail does not include the .chef/knife.rb' do
+        chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
+        result = shell_out("#{chef_dir}/chef-client -z -o 'x::default' --config-file-jail \"#{path_to('roles')}\"", :cwd => path_to(''))
+        result.error!
+      end
+    end
+
+    it "should complete with success" do
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+
+      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+      result.error!
+    end
+
+    context 'and a private key' do
+      file 'mykey.pem', <<EOM
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEApubutqtYYQ5UiA9QhWP7UvSmsfHsAoPKEVVPdVW/e8Svwpyf
+0Xef6OFWVmBE+W442ZjLOe2y6p2nSnaq4y7dg99NFz6X+16mcKiCbj0RCiGqCvCk
+NftHhTgO9/RFvCbmKZ1RKNob1YzLrFpxBHaSh9po+DGWhApcd+I+op+ZzvDgXhNn
+0nauZu3rZmApI/r7EEAOjFedAXs7VPNXhhtZAiLSAVIrwU3ZajtSzgXOxbNzgj5O
+AAAMmThK+71qPdffAdO4J198H6/MY04qgtFo7vumzCq0UCaGZfmeI1UNE4+xQWwP
+HJ3pDAP61C6Ebx2snI2kAd9QMx9Y78nIedRHPwIDAQABAoIBAHssRtPM1GacWsom
+8zfeN6ZbI4KDlbetZz0vhnqDk9NVrpijWlcOP5dwZXVNitnB/HaqCqFvyPDY9JNB
+zI/pEFW4QH59FVDP42mVEt0keCTP/1wfiDDGh1vLqVBYl/ZphscDcNgDTzNkuxMx
+k+LFVxKnn3w7rGc59lALSkpeGvbbIDjp3LUMlUeCF8CIFyYZh9ZvXe4OCxYdyjxb
+i8tnMLKvJ4Psbh5jMapsu3rHQkfPdqzztQUz8vs0NYwP5vWge46FUyk+WNm/IhbJ
+G3YM22nwUS8Eu2bmTtADSJolATbCSkOwQ1D+Fybz/4obfYeGaCdOqB05ttubhenV
+ShsAb7ECgYEA20ecRVxw2S7qA7sqJ4NuYOg9TpfGooptYNA1IP971eB6SaGAelEL
+awYkGNuu2URmm5ElZpwJFFTDLGA7t2zB2xI1FeySPPIVPvJGSiZoFQOVlIg9WQzK
+7jTtFQ/tOMrF+bigEUJh5bP1/7HzqSpuOsPjEUb2aoCTp+tpiRGL7TUCgYEAwtns
+g3ysrSEcTzpSv7fQRJRk1lkBhatgNd0oc+ikzf74DaVLhBg1jvSThDhiDCdB59mr
+Jh41cnR1XqE8jmdQbCDRiFrI1Pq6TPaDZFcovDVE1gue9x86v3FOH2ukPG4d2/Xy
+HevXjThtpMMsWFi0JYXuzXuV5HOvLZiP8sN3lSMCgYANpdxdGM7RRbE9ADY0dWK2
+V14ReTLcxP7fyrWz0xLzEeCqmomzkz3BsIUoouu0DCTSw+rvAwExqcDoDylIVlWO
+fAifz7SeZHbcDxo+3TsXK7zwnLYsx7YNs2+aIv6hzUUbMNmNmXMcZ+IEwx+mRMTN
+lYmZdrA5mr0V83oDFPt/jQKBgC74RVE03pMlZiObFZNtheDiPKSG9Bz6wMh7NWMr
+c37MtZLkg52mEFMTlfPLe6ceV37CM8WOhqe+dwSGrYhOU06dYqUR7VOZ1Qr0aZvo
+fsNPu/Y0+u7rMkgv0fs1AXQnvz7kvKaF0YITVirfeXMafuKEtJoH7owRbur42cpV
+YCAtAoGAP1rHOc+w0RUcBK3sY7aErrih0OPh9U5bvJsrw1C0FIZhCEoDVA+fNIQL
+syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
++vFmf54y9YdnLXaqv+FhJT6B6V7WX7IpU9BMqJY1cJYXHuHG2KA=
+-----END RSA PRIVATE KEY-----
+EOM
+
+      it "should complete with success even with a client key" do
+        file 'config/client.rb', <<EOM
+local_mode true
+client_key "#{path_to('mykey.pem')}"
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+
+        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+        result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+        result.error!
+      end
+    end
+
+    it "should complete with success when passed the -z flag" do
+      file 'config/client.rb', <<EOM
+chef_server_url 'http://omg.com/blah'
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+
+      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
+      result.error!
+    end
+
+    it "should complete with success when passed the --local-mode flag" do
+      file 'config/client.rb', <<EOM
+chef_server_url 'http://omg.com/blah'
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+
+      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' --local-mode", :cwd => chef_dir)
+      result.error!
+    end
+
+    it "should complete with success when passed -z and --chef-zero-port" do
+      file 'config/client.rb', <<EOM
+chef_server_url 'http://omg.com/blah'
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+
+      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
+      result.error!
+    end
+  end
+end

data/spec/integration/knife/chef_fs_data_store_spec.rb

@@ -0,0 +1,353 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'support/shared/integration/integration_helper'
+require 'chef/knife/list'
+require 'chef/knife/delete'
+require 'chef/knife/show'
+require 'chef/knife/raw'
+require 'chef/knife/cookbook_upload'
+
+describe 'knife raw -z' do
+  extend IntegrationSupport
+  include KnifeSupport
+
+  when_the_repository "has one of each thing" do
+    file 'clients/x.json', {}
+    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
+    file 'data_bags/x/y.json', {}
+    file 'environments/x.json', {}
+    file 'nodes/x.json', {}
+    file 'roles/x.json', {}
+    file 'users/x.json', {}
+
+    context 'GET /TYPE' do
+      it 'knife list -z -R returns everything' do
+        knife('list -z -Rfp /').should_succeed <<EOM
+/clients/
+/clients/x.json
+/cookbooks/
+/cookbooks/x/
+/cookbooks/x/metadata.rb
+/data_bags/
+/data_bags/x/
+/data_bags/x/y.json
+/environments/
+/environments/x.json
+/nodes/
+/nodes/x.json
+/roles/
+/roles/x.json
+/users/
+/users/x.json
+EOM
+      end
+    end
+
+    context 'DELETE /TYPE/NAME' do
+      it 'knife delete -z /clients/x.json works' do
+        knife('delete -z /clients/x.json').should_succeed "Deleted /clients/x.json\n"
+        knife('list -z -Rfp /clients').should_succeed ''
+      end
+
+      it 'knife delete -z -r /cookbooks/x works' do
+        knife('delete -z -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
+        knife('list -z -Rfp /cookbooks').should_succeed ''
+      end
+
+      it 'knife delete -z -r /data_bags/x works' do
+        knife('delete -z -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
+        knife('list -z -Rfp /data_bags').should_succeed ''
+      end
+
+      it 'knife delete -z /data_bags/x/y.json works' do
+        knife('delete -z /data_bags/x/y.json').should_succeed "Deleted /data_bags/x/y.json\n"
+        knife('list -z -Rfp /data_bags').should_succeed "/data_bags/x/\n"
+      end
+
+      it 'knife delete -z /environments/x.json works' do
+        knife('delete -z /environments/x.json').should_succeed "Deleted /environments/x.json\n"
+        knife('list -z -Rfp /environments').should_succeed ''
+      end
+
+      it 'knife delete -z /nodes/x.json works' do
+        knife('delete -z /nodes/x.json').should_succeed "Deleted /nodes/x.json\n"
+        knife('list -z -Rfp /nodes').should_succeed ''
+      end
+
+      it 'knife delete -z /roles/x.json works' do
+        knife('delete -z /roles/x.json').should_succeed "Deleted /roles/x.json\n"
+        knife('list -z -Rfp /roles').should_succeed ''
+      end
+
+      it 'knife delete -z /users/x.json works' do
+        knife('delete -z /users/x.json').should_succeed "Deleted /users/x.json\n"
+        knife('list -z -Rfp /users').should_succeed ''
+      end
+    end
+
+    context 'GET /TYPE/NAME' do
+      it 'knife show -z /clients/x.json works' do
+        knife('show -z /clients/x.json').should_succeed /"x"/
+      end
+
+      it 'knife show -z /cookbooks/x/metadata.rb works' do
+        knife('show -z /cookbooks/x/metadata.rb').should_succeed "/cookbooks/x/metadata.rb:\nversion \"1.0.0\"\n"
+      end
+
+      it 'knife show -z /data_bags/x/y.json works' do
+        knife('show -z /data_bags/x/y.json').should_succeed /"y"/
+      end
+
+      it 'knife show -z /environments/x.json works' do
+        knife('show -z /environments/x.json').should_succeed /"x"/
+      end
+
+      it 'knife show -z /nodes/x.json works' do
+        knife('show -z /nodes/x.json').should_succeed /"x"/
+      end
+
+      it 'knife show -z /roles/x.json works' do
+        knife('show -z /roles/x.json').should_succeed /"x"/
+      end
+
+      it 'knife show -z /users/x.json works' do
+        knife('show -z /users/x.json').should_succeed /"x"/
+      end
+    end
+
+    context 'PUT /TYPE/NAME' do
+      file 'empty.json', {}
+      file 'rolestuff.json', '{"description":"hi there","name":"x"}'
+      file 'cookbooks_to_upload/x/metadata.rb', "version '1.0.0'\n\n"
+
+      it 'knife raw -z -i empty.json -m PUT /clients/x' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /clients/x").should_succeed /"x"/
+        knife('list --local /clients').should_succeed "/clients/x.json\n"
+      end
+
+      it 'knife cookbook upload works' do
+        knife("cookbook upload -z --cookbook-path #{path_to('cookbooks_to_upload')} x").should_succeed <<EOM
+Uploading x              [1.0.0]
+Uploaded 1 cookbook.
+EOM
+        knife('list --local -Rfp /cookbooks').should_succeed "/cookbooks/x/\n/cookbooks/x/metadata.rb\n"
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /data/x/y' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /data/x/y").should_succeed /"y"/
+        knife('list --local -Rfp /data_bags').should_succeed "/data_bags/x/\n/data_bags/x/y.json\n"
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /environments/x' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /environments/x").should_succeed /"x"/
+        knife('list --local /environments').should_succeed "/environments/x.json\n"
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /nodes/x' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /nodes/x").should_succeed /"x"/
+        knife('list --local /nodes').should_succeed "/nodes/x.json\n"
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /roles/x' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /roles/x").should_succeed /"x"/
+        knife('list --local /roles').should_succeed "/roles/x.json\n"
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /users/x' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /users/x").should_succeed /"x"/
+        knife('list --local /users').should_succeed "/users/x.json\n"
+      end
+
+      it 'After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty', :pending => (RUBY_VERSION < "1.9") do
+        knife("raw -z -i #{path_to('rolestuff.json')} -m PUT /roles/x").should_succeed /"x"/
+        IO.read(path_to('roles/x.json')).should == <<EOM.strip
+{
+  "name": "x",
+  "description": "hi there"
+}
+EOM
+      end
+    end
+  end
+
+  when_the_repository 'is empty' do
+    context 'POST /TYPE/NAME' do
+      file 'empty.json', { 'name' => 'z' }
+      file 'empty_id.json', { 'id' => 'z' }
+      file 'rolestuff.json', '{"description":"hi there","name":"x"}'
+      file 'cookbooks_to_upload/z/metadata.rb', "version '1.0.0'"
+
+      it 'knife raw -z -i empty.json -m POST /clients' do
+        knife("raw -z -i #{path_to('empty.json')} -m POST /clients").should_succeed /uri/
+        knife('list --local /clients').should_succeed "/clients/z.json\n"
+      end
+
+      it 'knife cookbook upload works' do
+        knife("cookbook upload -z --cookbook-path #{path_to('cookbooks_to_upload')} z").should_succeed <<EOM
+Uploading z            [1.0.0]
+Uploaded 1 cookbook.
+EOM
+        knife('list --local -Rfp /cookbooks').should_succeed "/cookbooks/z/\n/cookbooks/z/metadata.rb\n"
+      end
+
+      it 'knife raw -z -i empty.json -m POST /data' do
+        knife("raw -z -i #{path_to('empty.json')} -m POST /data").should_succeed /uri/
+        knife('list --local -Rfp /data_bags').should_succeed "/data_bags/z/\n"
+      end
+
+      it 'knife raw -z -i empty.json -m POST /data/x' do
+        knife("raw -z -i #{path_to('empty_id.json')} -m POST /data/x").should_succeed /"z"/
+        knife('list --local -Rfp /data_bags').should_succeed "/data_bags/x/\n/data_bags/x/z.json\n"
+      end
+
+      it 'knife raw -z -i empty.json -m POST /environments' do
+        knife("raw -z -i #{path_to('empty.json')} -m POST /environments").should_succeed /uri/
+        knife('list --local /environments').should_succeed "/environments/z.json\n"
+      end
+
+      it 'knife raw -z -i empty.json -m POST /nodes' do
+        knife("raw -z -i #{path_to('empty.json')} -m POST /nodes").should_succeed /uri/
+        knife('list --local /nodes').should_succeed "/nodes/z.json\n"
+      end
+
+      it 'knife raw -z -i empty.json -m POST /roles' do
+        knife("raw -z -i #{path_to('empty.json')} -m POST /roles").should_succeed /uri/
+        knife('list --local /roles').should_succeed "/roles/z.json\n"
+      end
+
+      it 'knife raw -z -i empty.json -m POST /users' do
+        knife("raw -z -i #{path_to('empty.json')} -m POST /users").should_succeed /uri/
+        knife('list --local /users').should_succeed "/users/z.json\n"
+      end
+
+      it 'After knife raw -z -i rolestuff.json -m POST /roles, the output is pretty', :pending => (RUBY_VERSION < "1.9") do
+        knife("raw -z -i #{path_to('rolestuff.json')} -m POST /roles").should_succeed /uri/
+        IO.read(path_to('roles/x.json')).should == <<EOM.strip
+{
+  "name": "x",
+  "description": "hi there"
+}
+EOM
+      end
+    end
+
+    it 'knife list -z -R returns nothing' do
+      knife('list -z -Rfp /').should_succeed <<EOM
+/clients/
+/cookbooks/
+/data_bags/
+/environments/
+/nodes/
+/roles/
+/users/
+EOM
+    end
+
+    context 'DELETE /TYPE/NAME' do
+      it 'knife delete -z /clients/x.json fails with an error' do
+        knife('delete -z /clients/x.json').should_fail "ERROR: /clients/x.json: No such file or directory\n"
+      end
+
+      it 'knife delete -z -r /cookbooks/x fails with an error' do
+        knife('delete -z -r /cookbooks/x').should_fail "ERROR: /cookbooks/x: No such file or directory\n"
+      end
+
+      it 'knife delete -z -r /data_bags/x fails with an error' do
+        knife('delete -z -r /data_bags/x').should_fail "ERROR: /data_bags/x: No such file or directory\n"
+      end
+
+      it 'knife delete -z /data_bags/x/y.json fails with an error' do
+        knife('delete -z /data_bags/x/y.json').should_fail "ERROR: /data_bags/x/y.json: No such file or directory\n"
+      end
+
+      it 'knife delete -z /environments/x.json fails with an error' do
+        knife('delete -z /environments/x.json').should_fail "ERROR: /environments/x.json: No such file or directory\n"
+      end
+
+      it 'knife delete -z /nodes/x.json fails with an error' do
+        knife('delete -z /nodes/x.json').should_fail "ERROR: /nodes/x.json: No such file or directory\n"
+      end
+
+      it 'knife delete -z /roles/x.json fails with an error' do
+        knife('delete -z /roles/x.json').should_fail "ERROR: /roles/x.json: No such file or directory\n"
+      end
+
+      it 'knife delete -z /users/x.json fails with an error' do
+        knife('delete -z /users/x.json').should_fail "ERROR: /users/x.json: No such file or directory\n"
+      end
+    end
+
+    context 'GET /TYPE/NAME' do
+      it 'knife show -z /clients/x.json fails with an error' do
+        knife('show -z /clients/x.json').should_fail "ERROR: /clients/x.json: No such file or directory\n"
+      end
+
+      it 'knife show -z /cookbooks/x/metadata.rb fails with an error' do
+        knife('show -z /cookbooks/x/metadata.rb').should_fail "ERROR: /cookbooks/x/metadata.rb: No such file or directory\n"
+      end
+
+      it 'knife show -z /data_bags/x/y.json fails with an error' do
+        knife('show -z /data_bags/x/y.json').should_fail "ERROR: /data_bags/x/y.json: No such file or directory\n"
+      end
+
+      it 'knife show -z /environments/x.json fails with an error' do
+        knife('show -z /environments/x.json').should_fail "ERROR: /environments/x.json: No such file or directory\n"
+      end
+
+      it 'knife show -z /nodes/x.json fails with an error' do
+        knife('show -z /nodes/x.json').should_fail "ERROR: /nodes/x.json: No such file or directory\n"
+      end
+
+      it 'knife show -z /roles/x.json fails with an error' do
+        knife('show -z /roles/x.json').should_fail "ERROR: /roles/x.json: No such file or directory\n"
+      end
+
+      it 'knife show -z /users/x.json fails with an error' do
+        knife('show -z /users/x.json').should_fail "ERROR: /users/x.json: No such file or directory\n"
+      end
+    end
+
+    context 'PUT /TYPE/NAME' do
+      file 'empty.json', {}
+
+      it 'knife raw -z -i empty.json -m PUT /clients/x fails with 404' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /clients/x").should_fail /404/
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /data/x/y fails with 404' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /data/x/y").should_fail /404/
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /environments/x fails with 404' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /environments/x").should_fail /404/
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /nodes/x fails with 404' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /nodes/x").should_fail /404/
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /roles/x fails with 404' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /roles/x").should_fail /404/
+      end
+
+      it 'knife raw -z -i empty.json -m PUT /users/x fails with 404' do
+        knife("raw -z -i #{path_to('empty.json')} -m PUT /users/x").should_fail /404/
+      end
+    end
+  end
+end