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

data/spec/unit/knife/configure_spec.rb

@@ -4,8 +4,6 @@ describe Chef::Knife::Configure do
   before do
     Chef::Log.logger = Logger.new(StringIO.new)
 
-    @original_config = Chef::Config.configuration.dup
-
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::Configure.new
     @rest_client = mock("null rest client", :post_rest => { :result => :true })
@@ -24,10 +22,6 @@ describe Chef::Knife::Configure do
     Ohai::System.stub!(:new).and_return(ohai)
   end
 
-  after do
-    Chef::Config.configuration.replace(@original_config)
-  end
-
 
   let(:fqdn) { "foo.example.org" }
 

data/spec/unit/knife/cookbook_create_spec.rb

@@ -245,15 +245,8 @@ describe Chef::Knife::CookbookCreate do
       @knife.run
     end
 
-    it "should create a CHANGELOG file" do
-      @dir = Dir.tmpdir
-      @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
-      @knife.run
-    end
-
-    context "when the cookbooks path is not specified in the config file nor supplied via parameter" do
+    context "when the cookbooks path is set to nil" do
       before do
-        @old_cookbook_path = Chef::Config[:cookbook_path]
         Chef::Config[:cookbook_path] = nil
       end
 
@@ -261,10 +254,6 @@ describe Chef::Knife::CookbookCreate do
         @dir = Dir.tmpdir
         lambda{@knife.run}.should raise_error(ArgumentError)
       end
-
-      after do
-        Chef::Config[:cookbook_path] = @old_cookbook_path
-      end
     end
 
   end

data/spec/unit/knife/cookbook_metadata_from_file_spec.rb

@@ -8,9 +8,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/unit/knife/cookbook_show_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.
@@ -171,7 +171,7 @@ describe Chef::Knife::CookbookShow do
 
         @response = "Example recipe text"
       end
-      
+
       describe "with --fqdn" do
         it "should pass the fqdn" do
           @knife.config[:platform] = "example_platform"

data/spec/unit/knife/cookbook_site_install_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Knife::CookbookSiteInstall do
     @knife.config = {}
     if Chef::Platform.windows?
       @install_path = 'C:/tmp/chef'
-    else 
+    else
       @install_path = '/var/tmp/chef'
     end
     @knife.config[:cookbook_path] = [ @install_path ]

data/spec/unit/knife/core/bootstrap_context_spec.rb

@@ -118,14 +118,22 @@ EXPECTED
 
   describe "when an encrypted_data_bag_secret is provided" do
     context "via config[:secret]" do
-      let(:config){ {:secret => "supersekret" }}
+      let(:chef_config) do
+        {
+          :knife => {:secret => "supersekret" }
+        }
+      end
       it "reads the encrypted_data_bag_secret" do
         bootstrap_context.encrypted_data_bag_secret.should eq "supersekret"
       end
     end
 
     context "via config[:secret_file]" do
-      let(:config){ {:secret_file =>  secret_file}}
+      let(:chef_config) do
+        {
+          :knife => {:secret_file =>  secret_file}
+        }
+      end
       it "reads the encrypted_data_bag_secret" do
         bootstrap_context.encrypted_data_bag_secret.should eq IO.read(secret_file)
       end

data/spec/unit/knife/core/ui_spec.rb

@@ -28,6 +28,124 @@ describe Chef::Knife::UI do
     @ui = Chef::Knife::UI.new(@out, @err, @in, @config)
   end
 
+  describe "edit" do
+    ruby_for_json = { 'foo' => 'bar' }
+    json_from_ruby = "{\n  \"foo\": \"bar\"\n}"
+    json_from_editor = "{\n  \"bar\": \"foo\"\n}"
+    ruby_from_editor = { 'bar' => 'foo' }
+    my_editor = "veeeye"
+    temp_path = "/tmp/bar/baz"
+
+    let(:subject) { @ui.edit_data(ruby_for_json, parse_output) }
+    let(:parse_output) { false }
+
+    context "when editing is disabled" do
+      before do
+        @ui.config[:disable_editing] = true
+        stub_const("Tempfile", double)  # Tempfiles should never be invoked
+      end
+      context "when parse_output is false" do
+        it "returns pretty json string" do
+          expect(subject).to eql(json_from_ruby)
+        end
+      end
+      context "when parse_output is true" do
+        let(:parse_output) { true }
+        it "returns a ruby object" do
+          expect(subject).to eql(ruby_for_json)
+        end
+      end
+
+    end
+
+    context "when editing is enabled" do
+      before do
+        @ui.config[:disable_editing] = false
+        @ui.config[:editor] = my_editor
+        @mock = mock('Tempfile')
+        @mock.should_receive(:sync=).with(true)
+        @mock.should_receive(:puts).with(json_from_ruby)
+        @mock.should_receive(:close)
+        @mock.should_receive(:path).at_least(:once).and_return(temp_path)
+        Tempfile.should_receive(:open).with([ 'knife-edit-', '.json' ]).and_yield(@mock)
+      end
+      context "and the editor works" do
+        before do
+          @ui.should_receive(:system).with("#{my_editor} #{temp_path}").and_return(true)
+          IO.should_receive(:read).with(temp_path).and_return(json_from_editor)
+        end
+
+        context "when parse_output is false" do
+          it "returns an edited pretty json string" do
+            expect(subject).to eql(json_from_editor)
+          end
+        end
+        context "when parse_output is true" do
+          let(:parse_output) { true }
+          it "returns an edited ruby object" do
+            expect(subject).to eql(ruby_from_editor)
+          end
+        end
+      end
+      context "when running the editor fails with nil" do
+        before do
+          @ui.should_receive(:system).with("#{my_editor} #{temp_path}").and_return(nil)
+          IO.should_not_receive(:read)
+        end
+        it "throws an exception" do
+          expect{ subject }.to raise_error(RuntimeError)
+        end
+      end
+      context "when running the editor fails with false" do
+        before do
+          @ui.should_receive(:system).with("#{my_editor} #{temp_path}").and_return(false)
+          IO.should_not_receive(:read)
+        end
+        it "throws an exception" do
+          expect{ subject }.to raise_error(RuntimeError)
+        end
+      end
+    end
+    context "when editing and not stubbing Tempfile (semi-functional test)" do
+      before do
+        @ui.config[:disable_editing] = false
+        @ui.config[:editor] = my_editor
+        @tempfile = Tempfile.new([ 'knife-edit-', '.json' ])
+        Tempfile.should_receive(:open).with([ 'knife-edit-', '.json' ]).and_yield(@tempfile)
+      end
+
+      context "and the editor works" do
+        before do
+          @ui.should_receive(:system).with("#{my_editor} #{@tempfile.path}").and_return(true)
+          IO.should_receive(:read).with(@tempfile.path).and_return(json_from_editor)
+        end
+
+        context "when parse_output is false" do
+          it "returns an edited pretty json string" do
+            expect(subject).to eql(json_from_editor)
+          end
+          it "the tempfile should have mode 0600", :unix_only do
+            # XXX: this looks odd because we're really testing Tempfile.new here
+            expect(File.stat(@tempfile.path).mode & 0777).to eql(0600)
+            expect(subject).to eql(json_from_editor)
+          end
+        end
+
+        context "when parse_output is true" do
+          let(:parse_output) { true }
+          it "returns an edited ruby object" do
+            expect(subject).to eql(ruby_from_editor)
+          end
+          it "the tempfile should have mode 0600", :unix_only do
+            # XXX: this looks odd because we're really testing Tempfile.new here
+            expect(File.stat(@tempfile.path).mode & 0777).to eql(0600)
+            expect(subject).to eql(ruby_from_editor)
+          end
+        end
+      end
+    end
+  end
+
   describe "format_list_for_display" do
     it "should print the full hash if --with-uri is true" do
       @ui.config[:with_uri] = true

data/spec/unit/knife/data_bag_show_spec.rb

@@ -7,9 +7,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/unit/knife/environment_from_file_spec.rb

@@ -49,13 +49,13 @@ describe Chef::Knife::EnvironmentFromFile do
         @env_apple.name("apple")
         @knife.loader.stub!(:load_from).with("apple.rb").and_return @env_apple
       end
-  
+
       it "loads multiple environments if given" do
         @knife.name_args = [ "spec.rb", "apple.rb" ]
         @environment.should_receive(:save).twice
         @knife.run
       end
-  
+
       it "loads all environments with -a" do
         File.stub!(:expand_path).with("./environments/*.{json,rb}").and_return("/tmp/environments")
         Dir.stub!(:glob).with("/tmp/environments").and_return(["spec.rb", "apple.rb"])

data/spec/unit/knife/index_rebuild_spec.rb

@@ -91,7 +91,7 @@ describe Chef::Knife::IndexRebuild do
 
     context "against a Chef 11 server" do
       let(:api_info) do
-        {"flavor" => "osc", 
+        {"flavor" => "osc",
           "version" => "11.0.0",
           "erchef" => "1.2.3"
         }

data/spec/unit/knife/node_delete_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.
@@ -28,7 +28,7 @@ describe Chef::Knife::NodeDelete do
     @knife.name_args = [ "adam" ]
     @knife.stub!(:output).and_return(true)
     @knife.stub!(:confirm).and_return(true)
-    @node = Chef::Node.new() 
+    @node = Chef::Node.new()
     @node.stub!(:destroy).and_return(true)
     Chef::Node.stub!(:load).and_return(@node)
     @stdout = StringIO.new

data/spec/unit/knife/node_edit_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.
@@ -20,6 +20,12 @@ require 'spec_helper'
 Chef::Knife::NodeEdit.load_deps
 
 describe Chef::Knife::NodeEdit do
+
+  # helper to convert the view from Chef objects into Ruby objects representing JSON
+  def deserialized_json_view
+    actual = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json_pretty(@knife.node_editor.send(:view)))
+  end
+
   before(:each) do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::NodeEdit.new
@@ -49,7 +55,7 @@ describe Chef::Knife::NodeEdit do
     end
 
     it "creates a view of the node without attributes from roles or ohai" do
-      actual = Chef::JSONCompat.from_json(@knife.node_editor.view)
+      actual = deserialized_json_view
       actual.should_not have_key("automatic")
       actual.should_not have_key("override")
       actual.should_not have_key("default")
@@ -61,7 +67,7 @@ describe Chef::Knife::NodeEdit do
     it "shows the extra attributes when given the --all option" do
       @knife.config[:all_attributes] = true
 
-      actual = Chef::JSONCompat.from_json(@knife.node_editor.view)
+      actual = deserialized_json_view
       actual["automatic"].should == {"go" => "away"}
       actual["override"].should == {"dont" => "show"}
       actual["default"].should == {"hide" => "me"}
@@ -71,18 +77,39 @@ describe Chef::Knife::NodeEdit do
     end
 
     it "does not consider unedited data updated" do
-      view = Chef::JSONCompat.from_json( @knife.node_editor.view )
-      @knife.node_editor.apply_updates(view)
+      view = deserialized_json_view
+      @knife.node_editor.send(:apply_updates, view)
       @knife.node_editor.should_not be_updated
     end
 
     it "considers edited data updated" do
-      view = Chef::JSONCompat.from_json( @knife.node_editor.view )
+      view = deserialized_json_view
       view["run_list"] << "role[fuuu]"
-      @knife.node_editor.apply_updates(view)
+      @knife.node_editor.send(:apply_updates, view)
       @knife.node_editor.should be_updated
     end
 
   end
+
+  describe "edit_node" do
+
+    before do
+      @knife.stub!(:node).and_return(@node)
+    end
+
+    let(:subject) { @knife.node_editor.edit_node }
+
+    it "raises an exception when editing is disabled" do
+      @knife.config[:disable_editing] = true
+      expect{ subject }.to raise_error(SystemExit)
+    end
+
+    it "raises an exception when the editor is not set" do
+      @knife.config[:editor] = nil
+      expect{ subject }.to raise_error(SystemExit)
+    end
+
+  end
+
 end
 

data/spec/unit/knife/node_list_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.
@@ -49,7 +49,7 @@ describe Chef::Knife::NodeList do
       Chef::Node.should_receive(:list_by_environment).with("prod").and_return(@list)
       @knife.run
     end
-    
+
     describe "with -w or --with-uri" do
       it "should pretty print the hash" do
         @knife.config[:with_uri] = true

data/spec/unit/knife/node_run_list_add_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.
@@ -27,7 +27,7 @@ describe Chef::Knife::NodeRunListAdd do
     }
     @knife.name_args = [ "adam", "role[monkey]" ]
     @knife.stub!(:output).and_return(true)
-    @node = Chef::Node.new() 
+    @node = Chef::Node.new()
     @node.stub!(:save).and_return(true)
     Chef::Node.stub!(:load).and_return(@node)
   end

data/spec/unit/knife/node_show_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.
@@ -29,7 +29,7 @@ describe Chef::Knife::NodeShow do
     }
     @knife.name_args = [ "adam" ]
     @knife.stub!(:output).and_return(true)
-    @node = Chef::Node.new() 
+    @node = Chef::Node.new()
     Chef::Node.stub!(:load).and_return(@node)
   end