knife 18.2.7 → 18.3.0

data/spec/integration/environment_compare_spec.rb

@@ -1,75 +1,75 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-
-describe "knife environment compare", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  when_the_chef_server "has some environments" do
-    before do
-      cookbook "blah", "1.0.1"
-      cookbook "blah", "1.1.1"
-      cookbook "krad", "1.1.1"
-      environment "x", {
-        "cookbook_versions" => {
-          "blah" => "= 1.0.0",
-          "krad" => ">= 1.0.0",
-        },
-      }
-      environment "y", {
-        "cookbook_versions" => {
-          "blah" => "= 1.1.0",
-          "krad" => ">= 1.0.0",
-        },
-      }
-    end
-
-    # rubocop:disable Layout/TrailingWhitespace
-    it "displays the cookbooks for a single environment" do
-      knife("environment compare x").should_succeed <<~EOM
-              x       
-        blah  = 1.0.0 
-        krad  >= 1.0.0
-        
-      EOM
-    end
-
-    it "compares the cookbooks for two environments" do
-      knife("environment compare x y").should_succeed <<~EOM
-              x         y       
-        blah  = 1.0.0   = 1.1.0 
-        krad  >= 1.0.0  >= 1.0.0
-        
-      EOM
-    end
-
-    it "compares the cookbooks for all environments" do
-      knife("environment compare --all").should_succeed <<~EOM
-              x         y       
-        blah  = 1.0.0   = 1.1.0 
-        krad  >= 1.0.0  >= 1.0.0
-        
-      EOM
-    end
-    # rubocop:enable Layout/TrailingWhitespace
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+
+describe "knife environment compare", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  when_the_chef_server "has some environments" do
+    before do
+      cookbook "blah", "1.0.1"
+      cookbook "blah", "1.1.1"
+      cookbook "krad", "1.1.1"
+      environment "x", {
+        "cookbook_versions" => {
+          "blah" => "= 1.0.0",
+          "krad" => ">= 1.0.0",
+        },
+      }
+      environment "y", {
+        "cookbook_versions" => {
+          "blah" => "= 1.1.0",
+          "krad" => ">= 1.0.0",
+        },
+      }
+    end
+
+    # rubocop:disable Layout/TrailingWhitespace
+    it "displays the cookbooks for a single environment" do
+      knife("environment compare x").should_succeed <<~EOM
+              x       
+        blah  = 1.0.0 
+        krad  >= 1.0.0
+        
+      EOM
+    end
+
+    it "compares the cookbooks for two environments" do
+      knife("environment compare x y").should_succeed <<~EOM
+              x         y       
+        blah  = 1.0.0   = 1.1.0 
+        krad  >= 1.0.0  >= 1.0.0
+        
+      EOM
+    end
+
+    it "compares the cookbooks for all environments" do
+      knife("environment compare --all").should_succeed <<~EOM
+              x         y       
+        blah  = 1.0.0   = 1.1.0 
+        krad  >= 1.0.0  >= 1.0.0
+        
+      EOM
+    end
+    # rubocop:enable Layout/TrailingWhitespace
+  end
+end

data/spec/integration/environment_create_spec.rb

@@ -1,41 +1,41 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-
-describe "knife environment create", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  let(:out) { "Created bah\n" }
-
-  when_the_chef_server "is empty" do
-    it "creates a new environment" do
-      knife("environment create bah").should_succeed out
-    end
-
-    it "refuses to add an existing environment" do
-      pending "Knife environment create must not blindly overwrite an existing environment"
-      knife("environment create bah").should_succeed out
-      expect { knife("environment create bah") }.to raise_error(Net::HTTPClientException)
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+
+describe "knife environment create", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  let(:out) { "Created bah\n" }
+
+  when_the_chef_server "is empty" do
+    it "creates a new environment" do
+      knife("environment create bah").should_succeed out
+    end
+
+    it "refuses to add an existing environment" do
+      pending "Knife environment create must not blindly overwrite an existing environment"
+      knife("environment create bah").should_succeed out
+      expect { knife("environment create bah") }.to raise_error(Net::HTTPClientException)
+    end
+
+  end
+end

data/spec/integration/environment_delete_spec.rb

@@ -1,37 +1,37 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-
-describe "knife environment delete", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  when_the_chef_server "has an environment" do
-    before do
-      environment "y", {}
-    end
-
-    it "deletes an environment" do
-      knife("environment delete y", input: "y").should_succeed "Do you really want to delete y? (Y/N) Deleted y\n"
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+
+describe "knife environment delete", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  when_the_chef_server "has an environment" do
+    before do
+      environment "y", {}
+    end
+
+    it "deletes an environment" do
+      knife("environment delete y", input: "y").should_succeed "Do you really want to delete y? (Y/N) Deleted y\n"
+    end
+
+  end
+end

data/spec/integration/environment_from_file_spec.rb

@@ -1,116 +1,116 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-
-describe "knife environment from file", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  # include_context "default config options"
-
-  let(:env_dir) { "#{@repository_dir}/environments" }
-
-  when_the_chef_server "is empty" do
-    when_the_repository "has some environments" do
-      before do
-
-        file "environments/cons.json", <<~EOM
-          {
-            "name": "cons",
-            "description": "An environment",
-            "cookbook_versions": {
-
-            },
-            "json_class": "Chef::Environment",
-            "chef_type": "environment",
-            "default_attributes": {
-              "hola": "Amigos!"
-            },
-            "override_attributes": {
-
-            }
-          }
-        EOM
-
-        file "environments/car.json", <<~EOM
-          {
-            "name": "car",
-            "description": "An environment for list nodes",
-            "cookbook_versions": {
-
-            },
-            "json_class": "Chef::Environment",
-            "chef_type": "environment",
-            "default_attributes": {
-              "hola": "Amigos!"
-            },
-            "override_attributes": {
-
-            }
-          }
-        EOM
-
-        file "environments/cdr.json", <<~EOM
-          {
-            "name": "cdr",
-            "description": "An environment for last nodes",
-            "cookbook_versions": {
-
-            },
-            "json_class": "Chef::Environment",
-            "chef_type": "environment",
-            "default_attributes": {
-              "hola": "Amigos!"
-            },
-            "override_attributes": {
-
-            }
-          }
-        EOM
-
-      end
-
-      it "uploads a single file" do
-        knife("environment from file #{env_dir}/cons.json").should_succeed stderr: <<~EOM
-          Updated Environment cons
-        EOM
-      end
-
-      it "uploads many files" do
-        knife("environment from file #{env_dir}/cons.json #{env_dir}/car.json #{env_dir}/cdr.json").should_succeed stderr: <<~EOM
-          Updated Environment cons
-          Updated Environment car
-          Updated Environment cdr
-        EOM
-      end
-
-      it "uploads all environments in the repository" do
-        cwd(".")
-        knife("environment from file --all")
-        knife("environment list").should_succeed <<~EOM
-          _default
-          car
-          cdr
-          cons
-        EOM
-      end
-
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+
+describe "knife environment from file", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  # include_context "default config options"
+
+  let(:env_dir) { "#{@repository_dir}/environments" }
+
+  when_the_chef_server "is empty" do
+    when_the_repository "has some environments" do
+      before do
+
+        file "environments/cons.json", <<~EOM
+          {
+            "name": "cons",
+            "description": "An environment",
+            "cookbook_versions": {
+
+            },
+            "json_class": "Chef::Environment",
+            "chef_type": "environment",
+            "default_attributes": {
+              "hola": "Amigos!"
+            },
+            "override_attributes": {
+
+            }
+          }
+        EOM
+
+        file "environments/car.json", <<~EOM
+          {
+            "name": "car",
+            "description": "An environment for list nodes",
+            "cookbook_versions": {
+
+            },
+            "json_class": "Chef::Environment",
+            "chef_type": "environment",
+            "default_attributes": {
+              "hola": "Amigos!"
+            },
+            "override_attributes": {
+
+            }
+          }
+        EOM
+
+        file "environments/cdr.json", <<~EOM
+          {
+            "name": "cdr",
+            "description": "An environment for last nodes",
+            "cookbook_versions": {
+
+            },
+            "json_class": "Chef::Environment",
+            "chef_type": "environment",
+            "default_attributes": {
+              "hola": "Amigos!"
+            },
+            "override_attributes": {
+
+            }
+          }
+        EOM
+
+      end
+
+      it "uploads a single file" do
+        knife("environment from file #{env_dir}/cons.json").should_succeed stderr: <<~EOM
+          Updated Environment cons
+        EOM
+      end
+
+      it "uploads many files" do
+        knife("environment from file #{env_dir}/cons.json #{env_dir}/car.json #{env_dir}/cdr.json").should_succeed stderr: <<~EOM
+          Updated Environment cons
+          Updated Environment car
+          Updated Environment cdr
+        EOM
+      end
+
+      it "uploads all environments in the repository" do
+        cwd(".")
+        knife("environment from file --all")
+        knife("environment list").should_succeed <<~EOM
+          _default
+          car
+          cdr
+          cons
+        EOM
+      end
+
+    end
+  end
+end

data/spec/integration/environment_list_spec.rb

@@ -1,42 +1,42 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-
-describe "knife environment list", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  when_the_chef_server "has some environments" do
-    before do
-      environment "b", {}
-      environment "y", {}
-    end
-
-    it "lists all the environments" do
-      knife("environment list").should_succeed <<~EOM
-        _default
-        b
-        y
-      EOM
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+
+describe "knife environment list", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  when_the_chef_server "has some environments" do
+    before do
+      environment "b", {}
+      environment "y", {}
+    end
+
+    it "lists all the environments" do
+      knife("environment list").should_succeed <<~EOM
+        _default
+        b
+        y
+      EOM
+    end
+
+  end
+end