chef 10.34.6 → 11.0.0.beta.0

data/spec/unit/knife/knife_help.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.
@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Knife::Help do
   before(:each) do
     # Perilously use the build in list even though it is dynamic so we don't get warnings about the constant
-    # HELP_TOPICS = [ "foo", "bar", "knife-kittens", "ceiling-cat", "shef" ]
+    # HELP_TOPICS = [ "foo", "bar", "knife-kittens", "ceiling-cat", "shell" ]
     @knife = Chef::Knife::Help.new
   end
 
@@ -30,8 +30,8 @@ describe Chef::Knife::Help do
   end
 
   it "should run man for you" do
-    @knife.name_args = [ "shef" ]
-    @knife.should_receive(:exec).with(/^man \/.*\/shef.1$/)
+    @knife.name_args = [ "shell" ]
+    @knife.should_receive(:exec).with(/^man \/.*\/shell.1$/)
     @knife.run
   end
 
@@ -47,9 +47,9 @@ describe Chef::Knife::Help do
 
   describe "find_manpage_path" do
     it "should find the man page in the gem" do
-      @knife.find_manpage_path("shef").should =~ /distro\/common\/man\/man1\/shef.1$/
+      @knife.find_manpage_path("shell").should =~ /distro\/common\/man\/man1\/chef-shell.1$/
     end
-  
+
     it "should provide the man page name if not in the gem" do
       @knife.find_manpage_path("foo").should == "foo"
     end

data/spec/unit/knife/node_edit_spec.rb

@@ -20,12 +20,6 @@ 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
@@ -55,7 +49,7 @@ describe Chef::Knife::NodeEdit do
     end
 
     it "creates a view of the node without attributes from roles or ohai" do
-      actual = deserialized_json_view
+      actual = Chef::JSONCompat.from_json(@knife.node_editor.view)
       actual.should_not have_key("automatic")
       actual.should_not have_key("override")
       actual.should_not have_key("default")
@@ -67,7 +61,7 @@ describe Chef::Knife::NodeEdit do
     it "shows the extra attributes when given the --all option" do
       @knife.config[:all_attributes] = true
 
-      actual = deserialized_json_view
+      actual = Chef::JSONCompat.from_json(@knife.node_editor.view)
       actual["automatic"].should == {"go" => "away"}
       actual["override"].should == {"dont" => "show"}
       actual["default"].should == {"hide" => "me"}
@@ -77,39 +71,18 @@ describe Chef::Knife::NodeEdit do
     end
 
     it "does not consider unedited data updated" do
-      view = deserialized_json_view
-      @knife.node_editor.send(:apply_updates, view)
+      view = Chef::JSONCompat.from_json( @knife.node_editor.view )
+      @knife.node_editor.apply_updates(view)
       @knife.node_editor.should_not be_updated
     end
 
     it "considers edited data updated" do
-      view = deserialized_json_view
+      view = Chef::JSONCompat.from_json( @knife.node_editor.view )
       view["run_list"] << "role[fuuu]"
-      @knife.node_editor.send(:apply_updates, view)
+      @knife.node_editor.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_run_list_remove_spec.rb

@@ -25,6 +25,7 @@ describe Chef::Knife::NodeRunListRemove do
     @knife.config[:print_after] = nil
     @knife.name_args = [ "adam", "role[monkey]" ]
     @node = Chef::Node.new()
+    @node.name("knifetest-node")
     @node.run_list << "role[monkey]"
     @node.stub!(:save).and_return(true)
 
@@ -52,7 +53,7 @@ describe Chef::Knife::NodeRunListRemove do
 
     it "should print the run list" do
       @knife.config[:print_after] = true
-      @knife.ui.should_receive(:output).with({ 'run_list' => [] })
+      @knife.ui.should_receive(:output).with({ "knifetest-node" => { 'run_list' => [] } })
       @knife.run
     end
 

data/spec/unit/knife/ssh_spec.rb

@@ -34,14 +34,14 @@ describe Chef::Knife::Ssh do
 
   before do
     @knife = Chef::Knife::Ssh.new
-    @knife.config = {}
+    @knife.merge_configs
     @knife.config[:attribute] = "fqdn"
-    @node_foo = Chef::Node.new('foo')
-    @node_foo[:fqdn] = "foo.example.org"
-    @node_foo[:ipaddress] = "10.0.0.1"
-    @node_bar = Chef::Node.new('bar')
-    @node_bar[:fqdn] = "bar.example.org"
-    @node_bar[:ipaddress] = "10.0.0.2"
+    @node_foo = Chef::Node.new
+    @node_foo.automatic_attrs[:fqdn] = "foo.example.org"
+    @node_foo.automatic_attrs[:ipaddress] = "10.0.0.1"
+    @node_bar = Chef::Node.new
+    @node_bar.automatic_attrs[:fqdn] = "bar.example.org"
+    @node_bar.automatic_attrs[:ipaddress] = "10.0.0.2"
   end
 
   describe "#configure_session" do
@@ -64,7 +64,7 @@ describe Chef::Knife::Ssh do
           @knife.should_receive(:session_from_list).with(['10.0.0.1', '10.0.0.2'])
           @knife.configure_session
         end
-        
+
         it "returns an array of the attributes specified on the command line even when a config value is set" do
           @knife.config[:attribute] = "config_file" # this value will be the config file
           @knife.config[:override_attribute] = "ipaddress" # this is the value of the command line via #configure_attribute
@@ -84,10 +84,8 @@ describe Chef::Knife::Ssh do
 
       context "when cloud hostnames are available" do
         before do
-          @node_foo[:cloud] = Mash.new
-          @node_bar[:cloud] = Mash.new
-          @node_foo[:cloud][:public_hostname] = "ec2-10-0-0-1.compute-1.amazonaws.com"
-          @node_bar[:cloud][:public_hostname] = "ec2-10-0-0-2.compute-1.amazonaws.com"
+          @node_foo.automatic_attrs[:cloud][:public_hostname] = "ec2-10-0-0-1.compute-1.amazonaws.com"
+          @node_bar.automatic_attrs[:cloud][:public_hostname] = "ec2-10-0-0-2.compute-1.amazonaws.com"
         end
 
         it "returns an array of cloud public hostnames" do
@@ -109,8 +107,8 @@ describe Chef::Knife::Ssh do
       context "when there are some hosts found but they do not have an attribute to connect with" do
         before do
           @query.stub!(:search).and_return([[@node_foo, @node_bar]])
-          @node_foo[:fqdn] = nil
-          @node_bar[:fqdn] = nil
+          @node_foo.automatic_attrs[:fqdn] = nil
+          @node_bar.automatic_attrs[:fqdn] = nil
           Chef::Search::Query.stub!(:new).and_return(@query)
         end
 
@@ -269,7 +267,6 @@ describe Chef::Knife::Ssh do
       Chef::Search::Query.stub!(:new).and_return(@query)
       @knife.stub(:ssh_command).and_return(exit_code)
       @knife.name_args = ['*:*', 'false']
-      @knife.config[:manual] = false
     end
 
     context "with an error" do

data/spec/unit/knife/status_spec.rb

@@ -22,8 +22,8 @@ require 'highline'
 describe Chef::Knife::Status do
   before(:each) do
     node = Chef::Node.new.tap do |n|
-      n["fqdn"] = "foobar"
-      n["ohai_time"] = 1343845969
+      n.automatic_attrs["fqdn"] = "foobar"
+      n.automatic_attrs["ohai_time"] = 1343845969
     end
     query = mock("Chef::Search::Query")
     query.stub!(:search).and_yield(node)

data/spec/unit/knife_spec.rb

@@ -40,6 +40,29 @@ describe Chef::Knife do
     @stdout = StringIO.new
   end
 
+  describe "selecting a config file" do
+    context "when the current working dir is inside a symlinked directory" do
+      before do
+        Chef::Knife.reset_config_path!
+        # pwd according to your shell is /home/someuser/prod/chef-repo, but
+        # chef-repo is a symlink to /home/someuser/codes/chef-repo
+        ENV.stub!(:[]).with("PWD").and_return("/home/someuser/prod/chef-repo")
+        Dir.stub!(:pwd).and_return("/home/someuser/codes/chef-repo")
+      end
+
+      after do
+        Chef::Knife.reset_config_path!
+      end
+
+      it "loads the config from the non-dereferenced directory path" do
+        File.should_receive(:exist?).with("/home/someuser/prod/chef-repo/.chef").and_return(false)
+        File.should_receive(:exist?).with("/home/someuser/prod/.chef").and_return(true)
+        File.should_receive(:directory?).with("/home/someuser/prod/.chef").and_return(true)
+        Chef::Knife.chef_config_dir.should == "/home/someuser/prod/.chef"
+      end
+    end
+  end
+
   describe "after loading a subcommand" do
     before do
       Chef::Knife.reset_subcommands!
@@ -157,6 +180,36 @@ describe Chef::Knife do
       lambda {Chef::Knife.run(%w{fuuu uuuu fuuuu})}.should raise_error(SystemExit) { |e| e.status.should_not == 0 }
     end
 
+    describe "merging configuration options" do
+      before do
+        KnifeSpecs::TestYourself.option(:opt_with_default,
+                                        :short => "-D VALUE",
+                                        :default => "default-value")
+        Chef::Config[:knife] = {}
+      end
+
+      it "prefers the default value if no config or command line value is present" do
+        knife_command = KnifeSpecs::TestYourself.new([]) #empty argv
+        knife_command.configure_chef
+        knife_command.config[:opt_with_default].should == "default-value"
+      end
+
+      it "prefers a value in Chef::Config[:knife] to the default" do
+        Chef::Config[:knife][:opt_with_default] = "from-knife-config"
+        knife_command = KnifeSpecs::TestYourself.new([]) #empty argv
+        knife_command.configure_chef
+        knife_command.config[:opt_with_default].should == "from-knife-config"
+      end
+
+      it "prefers a value from command line over Chef::Config and the default" do
+        Chef::Config[:knife][:opt_with_default] = "from-knife-config"
+        knife_command = KnifeSpecs::TestYourself.new(["-D", "from-cli"])
+        knife_command.configure_chef
+        knife_command.config[:opt_with_default].should == "from-cli"
+      end
+    end
+
+
   end
 
   describe "when first created" do

data/spec/unit/lwrp_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.
@@ -18,9 +18,6 @@
 
 require 'spec_helper'
 
-module LwrpConstScopingConflict
-end
-
 describe "override logging" do
   before :each do
     $stderr.stub!(:write)
@@ -28,48 +25,26 @@ describe "override logging" do
 
   it "should log if attempting to load resource of same name" do
     Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources", "*"))].each do |file|
-      Chef::Resource.build_from_file("lwrp", file, nil)
+      Chef::Resource::LWRPBase.build_from_file("lwrp", file, nil)
     end
 
     Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp_override", "resources", "*"))].each do |file|
       Chef::Log.should_receive(:info).with(/overriding/)
-      Chef::Resource.build_from_file("lwrp", file, nil)
+      Chef::Resource::LWRPBase.build_from_file("lwrp", file, nil)
     end
   end
 
   it "should log if attempting to load provider of same name" do
     Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "providers", "*"))].each do |file|
-      Chef::Provider.build_from_file("lwrp", file, nil)
+      Chef::Provider::LWRPBase.build_from_file("lwrp", file, nil)
     end
 
     Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp_override", "providers", "*"))].each do |file|
       Chef::Log.should_receive(:info).with(/overriding/)
-      Chef::Provider.build_from_file("lwrp", file, nil)
-    end
-  end
-
-  it "removes the old LRWP resource class from the list of resource subclasses [CHEF-3432]" do
-    # CHEF-3432 regression test:
-    # Chef::Resource keeps a list of all subclasses to assist class inflation
-    # for json parsing (see Chef::JSONCompat). When replacing LWRP resources,
-    # we need to ensure the old resource class is remove from that list.
-    Dir[File.expand_path( "lwrp/resources/*", CHEF_SPEC_DATA)].each do |file|
-      Chef::Resource.build_from_file("lwrp", file, nil)
-    end
-    first_lwr_foo_class = Chef::Resource::LwrpFoo
-    Chef::Resource.resource_classes.should include(first_lwr_foo_class)
-    Dir[File.expand_path( "lwrp/resources/*", CHEF_SPEC_DATA)].each do |file|
-      Chef::Resource.build_from_file("lwrp", file, nil)
+      Chef::Provider::LWRPBase.build_from_file("lwrp", file, nil)
     end
-    Chef::Resource.resource_classes.should_not include(first_lwr_foo_class)
   end
 
-   it "does not attempt to remove classes from higher up namespaces [CHEF-4117]" do
-     conflicting_lwrp_file = File.expand_path( "lwrp_const_scoping/resources/conflict.rb", CHEF_SPEC_DATA)
-     # The test is that this should not raise an error:
-     Chef::Resource.build_from_file("lwrp_const_scoping", conflicting_lwrp_file, nil)
-   end
-
 end
 
 describe "LWRP" do
@@ -86,11 +61,11 @@ describe "LWRP" do
 
     before do
       Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources", "*"))].each do |file|
-        Chef::Resource.build_from_file("lwrp", file, nil)
+        Chef::Resource::LWRPBase.build_from_file("lwrp", file, nil)
       end
 
       Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp_override", "resources", "*"))].each do |file|
-        Chef::Resource.build_from_file("lwrp", file, nil)
+        Chef::Resource::LWRPBase.build_from_file("lwrp", file, nil)
       end
     end
 
@@ -119,12 +94,12 @@ describe "LWRP" do
     end
 
     it "should have access to the run context and node during class definition" do
-      node = Chef::Node.new(nil)
-      node[:penguin_name] = "jackass"
+      node = Chef::Node.new
+      node.normal[:penguin_name] = "jackass"
       run_context = Chef::RunContext.new(node, Chef::CookbookCollection.new, @events)
 
       Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
-        Chef::Resource.build_from_file("lwrp", file, run_context)
+        Chef::Resource::LWRPBase.build_from_file("lwrp", file, run_context)
       end
 
       cls = Chef::Resource.const_get("LwrpNodeattr")
@@ -138,8 +113,8 @@ describe "LWRP" do
   describe "Lightweight Chef::Provider" do
     before do
       @node = Chef::Node.new
-      @node.platform(:ubuntu)
-      @node.platform_version('8.10')
+      @node.automatic[:platform] = :ubuntu
+      @node.automatic[:platform_version] = '8.10'
       @events = Chef::EventDispatch::Dispatcher.new
       @run_context = Chef::RunContext.new(@node, Chef::CookbookCollection.new({}), @events)
       @runner = Chef::Runner.new(@run_context)
@@ -147,19 +122,19 @@ describe "LWRP" do
 
     before(:each) do
       Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources", "*"))].each do |file|
-        Chef::Resource.build_from_file("lwrp", file, @run_context)
+        Chef::Resource::LWRPBase.build_from_file("lwrp", file, @run_context)
       end
 
       Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp_override", "resources", "*"))].each do |file|
-        Chef::Resource.build_from_file("lwrp", file, @run_context)
+        Chef::Resource::LWRPBase.build_from_file("lwrp", file, @run_context)
       end
 
       Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "providers", "*"))].each do |file|
-        Chef::Provider.build_from_file("lwrp", file, @run_context)
+        Chef::Provider::LWRPBase.build_from_file("lwrp", file, @run_context)
       end
 
       Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp_override", "providers", "*"))].each do |file|
-        Chef::Provider.build_from_file("lwrp", file, @run_context)
+        Chef::Provider::LWRPBase.build_from_file("lwrp", file, @run_context)
       end
 
     end
@@ -251,6 +226,48 @@ describe "LWRP" do
       provider.enclosed_resource.monkey.should == 'bob, the monkey'
     end
 
+    describe "when using inline compilation" do
+      before do
+        # Behavior in these examples depends on implementation of fixture provider.
+        # See spec/data/lwrp/providers/inline_compiler
+
+        # Side effect of lwrp_inline_compiler provider for testing notifications.
+        $interior_ruby_block_2 = nil
+        # resource type doesn't matter, so make an existing resource type work with provider.
+        @resource = Chef::Resource::LwrpFoo.new("morpheus", @run_context)
+        @resource.allowed_actions << :test
+        @resource.action(:test)
+        @resource.provider(:lwrp_inline_compiler)
+      end
+
+      it "does not add interior resources to the exterior resource collection" do
+        @resource.run_action(:test)
+        @run_context.resource_collection.should be_empty
+      end
+
+      context "when interior resources are updated" do
+        it "processes notifications within the LWRP provider's action" do
+          @resource.run_action(:test)
+          $interior_ruby_block_2.should == "executed"
+        end
+
+        it "marks the parent resource updated" do
+          @resource.run_action(:test)
+          @resource.should be_updated
+          @resource.should be_updated_by_last_action
+        end
+      end
+
+      context "when interior resources are not updated" do
+        it "does not mark the parent resource updated" do
+          @resource.run_action(:no_updates)
+          @resource.should_not be_updated
+          @resource.should_not be_updated_by_last_action
+        end
+      end
+
+    end
+
   end
 
 end