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

data/spec/integration/knife/raw_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'support/shared/integration/integration_helper'
-require 'support/shared/context/config'
-require 'chef/knife/raw'
-require 'chef/knife/show'
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+require "chef/knife/raw"
+require "chef/knife/show"
 
-describe 'knife raw', :workstation do
+describe "knife raw", :workstation do
   include IntegrationSupport
   include KnifeSupport
   include AppServerSupport
@@ -29,17 +29,17 @@ describe 'knife raw', :workstation do
 
   when_the_chef_server "has one of each thing" do
     before do
-      client 'x', '{}'
-      cookbook 'x', '1.0.0'
-      data_bag 'x', { 'y' => '{}' }
-      environment 'x', '{}'
-      node 'x', '{}'
-      role 'x', '{}'
-      user 'x', '{}'
+      client "x", "{}"
+      cookbook "x", "1.0.0"
+      data_bag "x", { "y" => "{}" }
+      environment "x", "{}"
+      node "x", "{}"
+      role "x", "{}"
+      user "x", "{}"
     end
 
-    it 'knife raw /nodes/x returns the node', :skip => (RUBY_VERSION < "1.9") do
-      knife('raw /nodes/x').should_succeed <<EOM
+    it "knife raw /nodes/x returns the node", :skip => (RUBY_VERSION < "1.9") do
+      knife("raw /nodes/x").should_succeed <<EOM
 {
   "name": "x",
   "json_class": "Chef::Node",
@@ -64,12 +64,12 @@ describe 'knife raw', :workstation do
 EOM
     end
 
-    it 'knife raw /blarghle returns 404' do
-      knife('raw /blarghle').should_fail(/ERROR: Server responded with error 404 "Not Found\s*"/)
+    it "knife raw /blarghle returns 404" do
+      knife("raw /blarghle").should_fail(/ERROR: Server responded with error 404 "Not Found\s*"/)
     end
 
-    it 'knife raw -m DELETE /roles/x succeeds', :skip => (RUBY_VERSION < "1.9") do
-      knife('raw -m DELETE /roles/x').should_succeed <<EOM
+    it "knife raw -m DELETE /roles/x succeeds", :skip => (RUBY_VERSION < "1.9") do
+      knife("raw -m DELETE /roles/x").should_succeed <<EOM
 {
   "name": "x",
   "description": "",
@@ -89,11 +89,11 @@ EOM
   }
 }
 EOM
-      knife('show /roles/x.json').should_fail "ERROR: /roles/x.json: No such file or directory\n"
+      knife("show /roles/x.json").should_fail "ERROR: /roles/x.json: No such file or directory\n"
     end
 
-    it 'knife raw -m PUT -i blah.txt /roles/x succeeds', :skip => (RUBY_VERSION < "1.9") do
-      Tempfile.open('raw_put_input') do |file|
+    it "knife raw -m PUT -i blah.txt /roles/x succeeds", :skip => (RUBY_VERSION < "1.9") do
+      Tempfile.open("raw_put_input") do |file|
         file.write <<EOM
 {
   "name": "x",
@@ -136,7 +136,7 @@ EOM
   }
 }
 EOM
-        knife('show /roles/x.json').should_succeed <<EOM
+        knife("show /roles/x.json").should_succeed <<EOM
 /roles/x.json:
 {
   "name": "x",
@@ -146,8 +146,8 @@ EOM
       end
     end
 
-    it 'knife raw -m POST -i blah.txt /roles succeeds', :skip => (RUBY_VERSION < "1.9") do
-      Tempfile.open('raw_put_input') do |file|
+    it "knife raw -m POST -i blah.txt /roles succeeds", :skip => (RUBY_VERSION < "1.9") do
+      Tempfile.open("raw_put_input") do |file|
         file.write <<EOM
 {
   "name": "y",
@@ -172,7 +172,7 @@ EOM
   "uri": "#{Chef::Config.chef_server_url}/roles/y"
 }
 EOM
-        knife('show /roles/y.json').should_succeed <<EOM
+        knife("show /roles/y.json").should_succeed <<EOM
 /roles/y.json:
 {
   "name": "y",
@@ -182,11 +182,11 @@ EOM
       end
     end
 
-    context 'When a server returns raw json' do
+    context "When a server returns raw json" do
       before :each do
         Chef::Config.chef_server_url = "http://localhost:9018"
         app = lambda do |env|
-          [200, {'Content-Type' => 'application/json' }, ['{ "x": "y", "a": "b" }'] ]
+          [200, { "Content-Type" => "application/json" }, ['{ "x": "y", "a": "b" }'] ]
         end
         @raw_server, @raw_server_thread = start_app_server(app, 9018)
       end
@@ -196,8 +196,8 @@ EOM
         @raw_server_thread.kill if @raw_server_thread
       end
 
-      it 'knife raw /blah returns the prettified json', :skip => (RUBY_VERSION < "1.9") do
-        knife('raw /blah').should_succeed <<EOM
+      it "knife raw /blah returns the prettified json", :skip => (RUBY_VERSION < "1.9") do
+        knife("raw /blah").should_succeed <<EOM
 {
   "x": "y",
   "a": "b"
@@ -205,18 +205,18 @@ EOM
 EOM
       end
 
-      it 'knife raw --no-pretty /blah returns the raw json' do
-        knife('raw --no-pretty /blah').should_succeed <<EOM
+      it "knife raw --no-pretty /blah returns the raw json" do
+        knife("raw --no-pretty /blah").should_succeed <<EOM
 { "x": "y", "a": "b" }
 EOM
       end
     end
 
-    context 'When a server returns text' do
+    context "When a server returns text" do
       before :each do
         Chef::Config.chef_server_url = "http://localhost:9018"
         app = lambda do |env|
-          [200, {'Content-Type' => 'text' }, ['{ "x": "y", "a": "b" }'] ]
+          [200, { "Content-Type" => "text" }, ['{ "x": "y", "a": "b" }'] ]
         end
         @raw_server, @raw_server_thread = start_app_server(app, 9018)
       end
@@ -226,14 +226,14 @@ EOM
         @raw_server_thread.kill if @raw_server_thread
       end
 
-      it 'knife raw /blah returns the raw text' do
-        knife('raw /blah').should_succeed(<<EOM)
+      it "knife raw /blah returns the raw text" do
+        knife("raw /blah").should_succeed(<<EOM)
 { "x": "y", "a": "b" }
 EOM
       end
 
-      it 'knife raw --no-pretty /blah returns the raw text' do
-        knife('raw --no-pretty /blah').should_succeed(<<EOM)
+      it "knife raw --no-pretty /blah returns the raw text" do
+        knife("raw --no-pretty /blah").should_succeed(<<EOM)
 { "x": "y", "a": "b" }
 EOM
       end

data/spec/integration/knife/redirection_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,26 +15,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'support/shared/integration/integration_helper'
-require 'support/shared/context/config'
-require 'chef/knife/list'
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+require "chef/knife/list"
 
-describe 'redirection', :workstation do
+describe "redirection", :workstation do
   include IntegrationSupport
   include KnifeSupport
   include AppServerSupport
 
   include_context "default config options"
 
-  when_the_chef_server 'has a role' do
-    before { role 'x', {} }
+  when_the_chef_server "has a role" do
+    before { role "x", {} }
 
-    context 'and another server redirects to it with 302' do
+    context "and another server redirects to it with 302" do
       before :each do
         real_chef_server_url = Chef::Config.chef_server_url
         Chef::Config.chef_server_url = "http://localhost:9018"
         app = lambda do |env|
-          [302, {'Content-Type' => 'text','Location' => "#{real_chef_server_url}#{env['PATH_INFO']}" }, ['302 found'] ]
+          [302, { "Content-Type" => "text", "Location" => "#{real_chef_server_url}#{env['PATH_INFO']}" }, ["302 found"] ]
         end
         @redirector_server, @redirector_server_thread = start_app_server(app, 9018)
       end
@@ -44,8 +44,8 @@ describe 'redirection', :workstation do
         @redirector_thread.kill if @redirector_thread
       end
 
-      it 'knife list /roles returns the role' do
-        knife('list /roles').should_succeed "/roles/x.json\n"
+      it "knife list /roles returns the role" do
+        knife("list /roles").should_succeed "/roles/x.json\n"
       end
     end
   end

data/spec/integration/knife/serve_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,34 +15,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'support/shared/integration/integration_helper'
-require 'chef/knife/serve'
-require 'chef/server_api'
+require "support/shared/integration/integration_helper"
+require "chef/knife/serve"
+require "chef/server_api"
 
-describe 'knife serve', :workstation do
+describe "knife serve", :workstation do
   include IntegrationSupport
   include KnifeSupport
   include AppServerSupport
 
-  when_the_repository 'also has one of each thing' do
-    before { file 'nodes/x.json', { 'foo' => 'bar' } }
+  when_the_repository "also has one of each thing" do
+    before { file "nodes/x.json", { "foo" => "bar" } }
 
-    it 'knife serve serves up /nodes/x' do
+    it "knife serve serves up /nodes/x" do
       exception = nil
       t = Thread.new do
         begin
-          knife('serve --chef-zero-port=8890')
+          knife("serve --chef-zero-port=8890")
         rescue
           exception = $!
         end
       end
       begin
         Chef::Config.log_level = :debug
-        Chef::Config.chef_server_url = 'http://localhost:8890'
+        Chef::Config.chef_server_url = "http://localhost:8890"
         Chef::Config.node_name = nil
         Chef::Config.client_key = nil
         api = Chef::ServerAPI.new
-        expect(api.get('nodes/x')['name']).to eq('x')
+        expect(api.get("nodes/x")["name"]).to eq("x")
       rescue
         if exception
           raise exception

data/spec/integration/knife/show_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'support/shared/integration/integration_helper'
-require 'support/shared/context/config'
-require 'chef/knife/show'
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+require "chef/knife/show"
 
-describe 'knife show', :workstation do
+describe "knife show", :workstation do
   include IntegrationSupport
   include KnifeSupport
 
@@ -27,81 +27,81 @@ describe 'knife show', :workstation do
 
   when_the_chef_server "has one of each thing" do
     before do
-      client 'x', '{}'
-      cookbook 'x', '1.0.0'
-      data_bag 'x', { 'y' => '{}' }
-      environment 'x', '{}'
-      node 'x', '{}'
-      role 'x', '{}'
-      user 'x', '{}'
+      client "x", "{}"
+      cookbook "x", "1.0.0"
+      data_bag "x", { "y" => "{}" }
+      environment "x", "{}"
+      node "x", "{}"
+      role "x", "{}"
+      user "x", "{}"
     end
 
-    when_the_repository 'also has one of each thing' do
+    when_the_repository "also has one of each thing" do
       before do
-        file 'clients/x.json', { 'foo' => 'bar' }
-        file 'cookbooks/x/metadata.rb', cb_metadata('x', '1.0.0')
-        file 'data_bags/x/y.json', { 'foo' => 'bar' }
-        file 'environments/_default.json', { 'foo' => 'bar' }
-        file 'environments/x.json', { 'foo' => 'bar' }
-        file 'nodes/x.json', { 'foo' => 'bar' }
-        file 'roles/x.json', { 'foo' => 'bar' }
-        file 'users/x.json', { 'foo' => 'bar' }
+        file "clients/x.json", { "foo" => "bar" }
+        file "cookbooks/x/metadata.rb", cb_metadata("x", "1.0.0")
+        file "data_bags/x/y.json", { "foo" => "bar" }
+        file "environments/_default.json", { "foo" => "bar" }
+        file "environments/x.json", { "foo" => "bar" }
+        file "nodes/x.json", { "foo" => "bar" }
+        file "roles/x.json", { "foo" => "bar" }
+        file "users/x.json", { "foo" => "bar" }
       end
 
-      it 'knife show /cookbooks/x/metadata.rb shows the remote version' do
-        knife('show /cookbooks/x/metadata.rb').should_succeed <<EOM
+      it "knife show /cookbooks/x/metadata.rb shows the remote version" do
+        knife("show /cookbooks/x/metadata.rb").should_succeed <<EOM
 /cookbooks/x/metadata.rb:
 name "x"; version "1.0.0"
 EOM
       end
-      it 'knife show --local /cookbooks/x/metadata.rb shows the local version' do
-        knife('show --local /cookbooks/x/metadata.rb').should_succeed <<EOM
+      it "knife show --local /cookbooks/x/metadata.rb shows the local version" do
+        knife("show --local /cookbooks/x/metadata.rb").should_succeed <<EOM
 /cookbooks/x/metadata.rb:
 name "x"; version "1.0.0"
 EOM
       end
-      it 'knife show /data_bags/x/y.json shows the remote version' do
-        knife('show /data_bags/x/y.json').should_succeed <<EOM
+      it "knife show /data_bags/x/y.json shows the remote version" do
+        knife("show /data_bags/x/y.json").should_succeed <<EOM
 /data_bags/x/y.json:
 {
   "id": "y"
 }
 EOM
       end
-      it 'knife show --local /data_bags/x/y.json shows the local version' do
-        knife('show --local /data_bags/x/y.json').should_succeed <<EOM
+      it "knife show --local /data_bags/x/y.json shows the local version" do
+        knife("show --local /data_bags/x/y.json").should_succeed <<EOM
 /data_bags/x/y.json:
 {
   "foo": "bar"
 }
 EOM
       end
-      it 'knife show /environments/x.json shows the remote version', :skip => (RUBY_VERSION < "1.9") do
-        knife('show /environments/x.json').should_succeed <<EOM
+      it "knife show /environments/x.json shows the remote version", :skip => (RUBY_VERSION < "1.9") do
+        knife("show /environments/x.json").should_succeed <<EOM
 /environments/x.json:
 {
   "name": "x"
 }
 EOM
       end
-      it 'knife show --local /environments/x.json shows the local version' do
-        knife('show --local /environments/x.json').should_succeed <<EOM
+      it "knife show --local /environments/x.json shows the local version" do
+        knife("show --local /environments/x.json").should_succeed <<EOM
 /environments/x.json:
 {
   "foo": "bar"
 }
 EOM
       end
-      it 'knife show /roles/x.json shows the remote version', :skip => (RUBY_VERSION < "1.9") do
-        knife('show /roles/x.json').should_succeed <<EOM
+      it "knife show /roles/x.json shows the remote version", :skip => (RUBY_VERSION < "1.9") do
+        knife("show /roles/x.json").should_succeed <<EOM
 /roles/x.json:
 {
   "name": "x"
 }
 EOM
       end
-      it 'knife show --local /roles/x.json shows the local version' do
-        knife('show --local /roles/x.json').should_succeed <<EOM
+      it "knife show --local /roles/x.json shows the local version" do
+        knife("show --local /roles/x.json").should_succeed <<EOM
 /roles/x.json:
 {
   "foo": "bar"
@@ -109,34 +109,34 @@ EOM
 EOM
       end
       # show directory
-      it 'knife show /data_bags/x fails' do
-        knife('show /data_bags/x').should_fail "ERROR: /data_bags/x: is a directory\n"
+      it "knife show /data_bags/x fails" do
+        knife("show /data_bags/x").should_fail "ERROR: /data_bags/x: is a directory\n"
       end
-      it 'knife show --local /data_bags/x fails' do
-        knife('show --local /data_bags/x').should_fail "ERROR: /data_bags/x: is a directory\n"
+      it "knife show --local /data_bags/x fails" do
+        knife("show --local /data_bags/x").should_fail "ERROR: /data_bags/x: is a directory\n"
       end
       # show nonexistent file
-      it 'knife show /environments/nonexistent.json fails' do
-        knife('show /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+      it "knife show /environments/nonexistent.json fails" do
+        knife("show /environments/nonexistent.json").should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
       end
-      it 'knife show --local /environments/nonexistent.json fails' do
-        knife('show --local /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
+      it "knife show --local /environments/nonexistent.json fails" do
+        knife("show --local /environments/nonexistent.json").should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
       end
     end
   end
 
-  when_the_chef_server 'has a hash with multiple keys' do
+  when_the_chef_server "has a hash with multiple keys" do
     before do
-      environment 'x', {
-        'default_attributes' => { 'foo' => 'bar' },
-        'cookbook_versions' => { 'blah' => '= 1.0.0'},
-        'override_attributes' => { 'x' => 'y' },
-        'description' => 'woo',
-        'name' => 'x'
+      environment "x", {
+        "default_attributes" => { "foo" => "bar" },
+        "cookbook_versions" => { "blah" => "= 1.0.0" },
+        "override_attributes" => { "x" => "y" },
+        "description" => "woo",
+        "name" => "x",
       }
     end
-    it 'knife show shows the attributes in a predetermined order', :skip => (RUBY_VERSION < "1.9") do
-      knife('show /environments/x.json').should_succeed <<EOM
+    it "knife show shows the attributes in a predetermined order", :skip => (RUBY_VERSION < "1.9") do
+      knife("show /environments/x.json").should_succeed <<EOM
 /environments/x.json:
 {
   "name": "x",
@@ -155,10 +155,10 @@ EOM
     end
   end
 
-  when_the_repository 'has an environment with bad JSON' do
-    before { file 'environments/x.json', '{' }
-    it 'knife show succeeds' do
-      knife('show --local /environments/x.json').should_succeed <<EOM
+  when_the_repository "has an environment with bad JSON" do
+    before { file "environments/x.json", "{" }
+    it "knife show succeeds" do
+      knife("show --local /environments/x.json").should_succeed <<EOM
 /environments/x.json:
 {
 EOM