chef 14.0.190-universal-mingw32 → 14.0.202-universal-mingw32

data/spec/integration/knife/redirection_spec.rb

@@ -1,52 +1,52 @@
-#
-# 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");
-# 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 "support/shared/context/config"
-require "chef/knife/list"
-
-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", {} }
-
-    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"] ]
-        end
-        @redirector_server, @redirector_server_thread = start_app_server(app, 9018)
-      end
-
-      after :each do
-        @redirector_server.shutdown if @redirector_server
-        @redirector_thread.kill if @redirector_thread
-      end
-
-      it "knife list /roles returns the role" do
-        knife("list /roles").should_succeed "/roles/x.json\n"
-      end
-    end
-  end
-end
+#
+# 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");
+# 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 "support/shared/context/config"
+require "chef/knife/list"
+
+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", {} }
+
+    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"] ]
+        end
+        @redirector_server, @redirector_server_thread = start_app_server(app, 9018)
+      end
+
+      after :each do
+        @redirector_server.shutdown if @redirector_server
+        @redirector_thread.kill if @redirector_thread
+      end
+
+      it "knife list /roles returns the role" do
+        knife("list /roles").should_succeed "/roles/x.json\n"
+      end
+    end
+  end
+end

data/spec/integration/knife/role_bulk_delete_spec.rb

@@ -1,51 +1,51 @@
-#
-# Copyright:: Copyright 2013-2016, Chef Software 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 "support/shared/context/config"
-
-describe "knife role bulk delete", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  when_the_chef_server "has some roles" do
-    before do
-      role "cons", {}
-      role "car", {}
-      role "cdr", {}
-      role "cat", {}
-    end
-
-    it "deletes all matching roles" do
-      knife("role bulk delete ^ca.*", input: "Y").should_succeed <<EOM
-The following roles will be deleted:
-
-car  cat
-
-Are you sure you want to delete these roles? (Y/N) Deleted role car
-Deleted role cat
-EOM
-
-      knife("role list").should_succeed <<EOM
-cdr
-cons
-EOM
-    end
-
-  end
-end
+#
+# Copyright:: Copyright 2013-2016, Chef Software 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 "support/shared/context/config"
+
+describe "knife role bulk delete", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  when_the_chef_server "has some roles" do
+    before do
+      role "cons", {}
+      role "car", {}
+      role "cdr", {}
+      role "cat", {}
+    end
+
+    it "deletes all matching roles" do
+      knife("role bulk delete ^ca.*", input: "Y").should_succeed <<EOM
+The following roles will be deleted:
+
+car  cat
+
+Are you sure you want to delete these roles? (Y/N) Deleted role car
+Deleted role cat
+EOM
+
+      knife("role list").should_succeed <<EOM
+cdr
+cons
+EOM
+    end
+
+  end
+end

data/spec/integration/knife/role_create_spec.rb

@@ -1,40 +1,40 @@
-#
-# Copyright:: Copyright 2013-2016, Chef Software 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 "support/shared/context/config"
-
-describe "knife role create", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  let(:out) { "Created role[bah]\n" }
-
-  when_the_chef_server "is empty" do
-    it "creates a new role" do
-      knife("role create bah").should_succeed out
-    end
-
-    it "refuses to add an existing role" do
-      pending "Knife role create must not blindly overwrite an existing role"
-      knife("role create bah").should_succeed out
-      expect { knife("role create bah") }.to raise_error(Net::HTTPServerException)
-    end
-
-  end
-end
+#
+# Copyright:: Copyright 2013-2016, Chef Software 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 "support/shared/context/config"
+
+describe "knife role create", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  let(:out) { "Created role[bah]\n" }
+
+  when_the_chef_server "is empty" do
+    it "creates a new role" do
+      knife("role create bah").should_succeed out
+    end
+
+    it "refuses to add an existing role" do
+      pending "Knife role create must not blindly overwrite an existing role"
+      knife("role create bah").should_succeed out
+      expect { knife("role create bah") }.to raise_error(Net::HTTPServerException)
+    end
+
+  end
+end

data/spec/integration/knife/role_delete_spec.rb

@@ -1,47 +1,47 @@
-#
-# Copyright:: Copyright 2013-2016, Chef Software 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 "support/shared/context/config"
-
-describe "knife role delete", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  when_the_chef_server "has some roles" do
-    before do
-      role "cons", {}
-      role "car", {}
-      role "cdr", {}
-      role "cat", {}
-    end
-
-    it "deletes a role" do
-      knife("role delete car", input: "Y").should_succeed <<EOM
-Do you really want to delete car? (Y/N) Deleted role[car]
-EOM
-
-      knife("role list").should_succeed <<EOM
-cat
-cdr
-cons
-EOM
-    end
-
-  end
-end
+#
+# Copyright:: Copyright 2013-2016, Chef Software 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 "support/shared/context/config"
+
+describe "knife role delete", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  when_the_chef_server "has some roles" do
+    before do
+      role "cons", {}
+      role "car", {}
+      role "cdr", {}
+      role "cat", {}
+    end
+
+    it "deletes a role" do
+      knife("role delete car", input: "Y").should_succeed <<EOM
+Do you really want to delete car? (Y/N) Deleted role[car]
+EOM
+
+      knife("role list").should_succeed <<EOM
+cat
+cdr
+cons
+EOM
+    end
+
+  end
+end

data/spec/integration/knife/role_from_file_spec.rb

@@ -1,95 +1,95 @@
-#
-# Copyright:: Copyright 2013-2016, Chef Software 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 "support/shared/context/config"
-
-describe "knife role from file", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  # include_context "default config options"
-
-  let (:role_dir) { "#{@repository_dir}/roles" }
-
-  when_the_chef_server "is empty" do
-    when_the_repository "has some roles" do
-      before do
-
-        file "roles/cons.json", <<EOM
-{
-  "name": "cons",
-  "description": "An role",
-  "json_class": "Chef::role",
-  "chef_type": "role",
-  "default_attributes": {
-    "hola": "Amigos!"
-  },
-  "override_attributes": {
-
-  }
-}
-EOM
-
-        file "roles/car.json", <<EOM
-{
-  "name": "car",
-  "description": "A role for list nodes",
-  "json_class": "Chef::Role",
-  "chef_type": "role",
-  "default_attributes": {
-    "hola": "Amigos!"
-  },
-  "override_attributes": {
-
-  }
-}
-EOM
-
-        file "roles/cdr.json", <<EOM
-{
-  "name": "cdr",
-  "description": "A role for last nodes",
-  "json_class": "Chef::Role",
-  "chef_type": "role",
-  "default_attributes": {
-    "hola": "Amigos!"
-  },
-  "override_attributes": {
-
-  }
-}
-EOM
-
-      end
-
-      it "uploads a single file" do
-        knife("role from file #{role_dir}/cons.json").should_succeed stderr: <<EOM
-Updated Role cons
-EOM
-      end
-
-      it "uploads many files" do
-        knife("role from file #{role_dir}/cons.json #{role_dir}/car.json #{role_dir}/cdr.json").should_succeed stderr: <<EOM
-Updated Role cons
-Updated Role car
-Updated Role cdr
-EOM
-      end
-
-    end
-  end
-end
+#
+# Copyright:: Copyright 2013-2016, Chef Software 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 "support/shared/context/config"
+
+describe "knife role from file", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  # include_context "default config options"
+
+  let (:role_dir) { "#{@repository_dir}/roles" }
+
+  when_the_chef_server "is empty" do
+    when_the_repository "has some roles" do
+      before do
+
+        file "roles/cons.json", <<EOM
+{
+  "name": "cons",
+  "description": "An role",
+  "json_class": "Chef::role",
+  "chef_type": "role",
+  "default_attributes": {
+    "hola": "Amigos!"
+  },
+  "override_attributes": {
+
+  }
+}
+EOM
+
+        file "roles/car.json", <<EOM
+{
+  "name": "car",
+  "description": "A role for list nodes",
+  "json_class": "Chef::Role",
+  "chef_type": "role",
+  "default_attributes": {
+    "hola": "Amigos!"
+  },
+  "override_attributes": {
+
+  }
+}
+EOM
+
+        file "roles/cdr.json", <<EOM
+{
+  "name": "cdr",
+  "description": "A role for last nodes",
+  "json_class": "Chef::Role",
+  "chef_type": "role",
+  "default_attributes": {
+    "hola": "Amigos!"
+  },
+  "override_attributes": {
+
+  }
+}
+EOM
+
+      end
+
+      it "uploads a single file" do
+        knife("role from file #{role_dir}/cons.json").should_succeed stderr: <<EOM
+Updated Role cons
+EOM
+      end
+
+      it "uploads many files" do
+        knife("role from file #{role_dir}/cons.json #{role_dir}/car.json #{role_dir}/cdr.json").should_succeed stderr: <<EOM
+Updated Role cons
+Updated Role car
+Updated Role cdr
+EOM
+      end
+
+    end
+  end
+end