microwave 1.0.4 → 11.400.2

data/spec/unit/knife/configure_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe Chef::Knife::Configure do
   before do
-    @original_config = Chef::Config.configuration.dup
-
     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 })
@@ -41,7 +41,7 @@ describe Chef::Knife::Configure do
     @knife.config[:initial] = true
     Etc.stub!(:getlogin).and_return("a-new-user")
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter a clientname for the new client: [a-new-user]"))
+    @out.string.should match(Regexp.escape("Please enter a name for the new user: [a-new-user]"))
     @knife.new_client_name.should == Etc.getlogin
   end
 
@@ -50,7 +50,7 @@ describe Chef::Knife::Configure do
     @knife.config[:node_name] = 'testnode'
     Etc.stub!(:getlogin).and_return("a-new-user")
     @knife.ask_user_for_config
-    @out.string.should_not match(Regexp.escape("Please enter a clientname for the new client"))
+    @out.string.should_not match(Regexp.escape("Please enter a name for the new user"))
     @knife.new_client_name.should == 'testnode'
   end
 
@@ -64,32 +64,32 @@ describe Chef::Knife::Configure do
   it "asks the user for the existing admin client's name if -i is specified" do
     @knife.config[:initial] = true
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter the existing admin clientname: [chef-webui]"))
-    @knife.admin_client_name.should == 'chef-webui'
+    @out.string.should match(Regexp.escape("Please enter the existing admin name: [admin]"))
+    @knife.admin_client_name.should == 'admin'
   end
 
   it "should not ask the user for the existing admin client's name if -i and --admin-client_name are specified" do
     @knife.config[:initial] = true
     @knife.config[:admin_client_name] = 'my-webui'
     @knife.ask_user_for_config
-    @out.string.should_not match(Regexp.escape("Please enter the existing admin clientname:"))
+    @out.string.should_not match(Regexp.escape("Please enter the existing admin:"))
     @knife.admin_client_name.should == 'my-webui'
   end
 
   it "should not ask the user for the existing admin client's name if -i is not specified" do
     @knife.ask_user_for_config
-    @out.string.should_not match(Regexp.escape("Please enter the existing admin clientname: [chef-webui]"))
-    @knife.admin_client_name.should_not == 'chef-webui'
+    @out.string.should_not match(Regexp.escape("Please enter the existing admin: [admin]"))
+    @knife.admin_client_name.should_not == 'admin'
   end
 
   it "asks the user for the location of the existing admin key if -i is specified" do
     @knife.config[:initial] = true
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter the location of the existing admin client's private key: [/etc/chef/webui.pem]"))
+    @out.string.should match(Regexp.escape("Please enter the location of the existing admin's private key: [/etc/chef/admin.pem]"))
     if windows?
-      @knife.admin_client_key.should == 'C:/etc/chef/webui.pem'
+      @knife.admin_client_key.should == 'C:/etc/chef/admin.pem'
     else
-      @knife.admin_client_key.should == '/etc/chef/webui.pem'
+      @knife.admin_client_key.should == '/etc/chef/admin.pem'
     end
   end
 
@@ -111,7 +111,7 @@ describe Chef::Knife::Configure do
     if windows?
       @knife.admin_client_key.should_not == 'C:/etc//chef/webui.pem'
     else
-      @knife.admin_client_key.should_not == '/etc/chef/webui.pem' 
+      @knife.admin_client_key.should_not == '/etc/chef/webui.pem'
     end
   end
 
@@ -140,7 +140,7 @@ describe Chef::Knife::Configure do
     if windows?
       @knife.validation_key.should == 'C:/etc/chef/validation.pem'
     else
-      @knife.validation_key.should == '/etc/chef/validation.pem' 
+      @knife.validation_key.should == '/etc/chef/validation.pem'
     end
   end
 
@@ -205,25 +205,28 @@ describe Chef::Knife::Configure do
   end
 
   it "creates a new client when given the --initial option" do
-    File.stub!(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
-    File.stub!(:expand_path).with("/home/you/.chef/a-new-user.pem").and_return("/home/you/.chef/a-new-user.pem")
-    File.stub!(:expand_path).with("/etc/chef/validation.pem").and_return("/etc/chef/validation.pem")
-    File.stub!(:expand_path).with("/etc/chef/webui.pem").and_return("/etc/chef/webui.pem")
+    File.should_receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
+    File.should_receive(:expand_path).with("/home/you/.chef/a-new-user.pem").and_return("/home/you/.chef/a-new-user.pem")
+    File.should_receive(:expand_path).with("/etc/chef/validation.pem").and_return("/etc/chef/validation.pem")
+    File.should_receive(:expand_path).with("/etc/chef/admin.pem").and_return("/etc/chef/admin.pem")
     Chef::Config[:node_name]  = "webmonkey.example.com"
-    client_command = Chef::Knife::ClientCreate.new
-    client_command.should_receive(:run)
+
+    user_command = Chef::Knife::UserCreate.new
+    user_command.should_receive(:run)
 
     Etc.stub!(:getlogin).and_return("a-new-user")
 
-    Chef::Knife::ClientCreate.stub!(:new).and_return(client_command)
+    Chef::Knife::UserCreate.stub!(:new).and_return(user_command)
     FileUtils.should_receive(:mkdir_p).with("/home/you/.chef")
     ::File.should_receive(:open).with("/home/you/.chef/knife.rb", "w")
     @knife.config[:initial] = true
+    @knife.config[:user_password] = "blah"
     @knife.run
-    client_command.name_args.should == Array("a-new-user")
-    client_command.config[:admin].should be_true
-    client_command.config[:file].should == "/home/you/.chef/a-new-user.pem"
-    client_command.config[:yes].should be_true
-    client_command.config[:disable_editing].should be_true
+    user_command.name_args.should == Array("a-new-user")
+    user_command.config[:user_password].should == "blah"
+    user_command.config[:admin].should be_true
+    user_command.config[:file].should == "/home/you/.chef/a-new-user.pem"
+    user_command.config[:yes].should be_true
+    user_command.config[:disable_editing].should be_true
   end
 end

data/spec/unit/knife/cookbook_metadata_spec.rb

@@ -51,22 +51,29 @@ describe Chef::Knife::CookbookMetadata do
     describe 'with -a or --all' do
       before(:each) do
         @knife.config[:all] = true
+        @foo = Chef::CookbookVersion.new('foo')
+        @foo.version = '1.0.0'
+        @bar = Chef::CookbookVersion.new('bar')
+        @bar.version = '2.0.0'
+        @cookbook_loader = {
+          "foo" => @foo,
+          "bar" => @bar
+        }
+        @cookbook_loader.should_receive(:load_cookbooks).and_return(@cookbook_loader)
         @knife.should_receive(:generate_metadata).with('foo')
         @knife.should_receive(:generate_metadata).with('bar')
       end
 
       it 'should generate the metadata for each cookbook' do
         Chef::Config[:cookbook_path] = @cookbook_dir
-        Chef::CookbookLoader.should_receive(:new).with(@cookbook_dir).
-                                                  and_return({'foo' => '1.0.0', 'bar' => '2.0.0'})
+        Chef::CookbookLoader.should_receive(:new).with(@cookbook_dir).and_return(@cookbook_loader)
         @knife.run
       end
 
       describe 'and with -o or --cookbook-path' do
         it 'should look in the provided path and generate cookbook metadata' do
           @knife.config[:cookbook_path] = '/opt/chef/cookbooks'
-          Chef::CookbookLoader.should_receive(:new).with('/opt/chef/cookbooks').
-                                                    and_return({'foo' => '1.0.0', 'bar' => '2.0.0'})
+          Chef::CookbookLoader.should_receive(:new).with('/opt/chef/cookbooks').and_return(@cookbook_loader)
           @knife.run
         end
       end

data/spec/unit/knife/cookbook_site_install_spec.rb

@@ -60,7 +60,6 @@ describe Chef::Knife::CookbookSiteInstall do
 
 
   describe "run" do
-
     it "should return an error if a cookbook name is not provided" do
       @knife.name_args = []
       @knife.ui.should_receive(:error).with("Please specify a cookbook to download and install.")
@@ -91,7 +90,6 @@ describe Chef::Knife::CookbookSiteInstall do
       lambda { @knife.run }.should raise_error(SystemExit)
     end
 
-
     it "should install the specified version if second argument is a three-digit version" do
       @knife.name_args = ["getting-started", "0.1.0"]
       @knife.config[:no_deps] = true
@@ -134,5 +132,17 @@ describe Chef::Knife::CookbookSiteInstall do
       @repo.should_not_receive(:reset_to_default_state)
       @knife.run
     end
+
+    it "should not raise an error if cookbook_path is a string" do
+      @knife.config[:cookbook_path] = @install_path
+      @knife.config[:no_deps] = true
+      @knife.name_args = ["getting-started"]
+      upstream_file = File.join(@install_path, "getting-started.tar.gz")
+      @knife.should_receive(:download_cookbook_to).with(upstream_file)
+      @knife.should_receive(:extract_cookbook).with(upstream_file, "0.3.0")
+      @knife.should_receive(:clear_existing_files).with(File.join(@install_path, "getting-started"))
+      @repo.should_receive(:merge_updates_from).with("getting-started", "0.3.0")
+      lambda { @knife.run }.should_not raise_error
+    end
   end
 end

data/spec/unit/knife/cookbook_test_spec.rb

@@ -68,6 +68,7 @@ describe Chef::Knife::CookbookTest do
         @knife.stub!(:test_cookbook).and_return(true)
         @knife.config[:all] = true
         @loader = {}
+        @loader.stub!(:load_cookbooks).and_return(@loader)
         @cookbooks.each do |cookbook|
           @loader[cookbook.name] = cookbook
         end

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -32,6 +32,7 @@ describe Chef::Knife::CookbookUpload do
     @cookbook_loader = {}
     @cookbook_loader.stub!(:[]).and_return(@cookbook)
     @cookbook_loader.stub!(:merged_cookbooks).and_return([])
+    @cookbook_loader.stub!(:load_cookbooks).and_return(@cookbook_loader)
     Chef::CookbookLoader.stub!(:new).and_return(@cookbook_loader)
 
     @output = StringIO.new
@@ -65,6 +66,44 @@ describe Chef::Knife::CookbookUpload do
       end
     end
 
+    describe 'when specifying the same cookbook name twice' do
+      it 'should upload the cookbook only once' do
+        @knife.name_args = ['test_cookbook', 'test_cookbook']
+        @knife.should_receive(:upload).once
+        @knife.run
+      end
+    end
+
+    describe 'when specifying a cookbook name among many' do
+      before(:each) do
+        @knife.name_args = ['test_cookbook1']
+        @cookbooks = {
+          'test_cookbook1' => Chef::CookbookVersion.new('test_cookbook1'),
+          'test_cookbook2' => Chef::CookbookVersion.new('test_cookbook2'),
+          'test_cookbook3' => Chef::CookbookVersion.new('test_cookbook3')
+        }
+        @cookbook_loader = {}
+        @cookbook_loader.stub!(:merged_cookbooks).and_return([])
+        @cookbook_loader.stub(:[]) { |ckbk| @cookbooks[ckbk] }
+        Chef::CookbookLoader.stub!(:new).and_return(@cookbook_loader)
+      end
+
+      it "should read only one cookbook" do
+        @cookbook_loader.should_receive(:[]).once.with('test_cookbook1')
+        @knife.run
+      end
+
+      it "should not read all cookbooks" do
+        @cookbook_loader.should_not_receive(:load_cookbooks)
+        @knife.run
+      end
+
+      it "should upload only one cookbook" do
+        @knife.should_receive(:upload).exactly(1).times
+        @knife.run
+      end
+    end
+
     # This is testing too much.  We should break it up.
     describe 'when specifying a cookbook name with dependencies' do
       it "should upload all dependencies once" do
@@ -140,5 +179,5 @@ describe Chef::Knife::CookbookUpload do
         lambda { @knife.run }.should raise_error(SystemExit)
       end
     end
-  end
-end # run
+  end # run
+end # Chef::Knife::CookbookUpload

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

@@ -56,9 +56,16 @@ describe Chef::Knife::Core::BootstrapContext do
     @context.validation_key.should == IO.read(File.join(CHEF_SPEC_DATA, 'ssl', 'private_key.pem'))
   end
 
+  it "reads the validation key when it contains a ~" do
+    IO.should_receive(:read).with(File.expand_path("my.key", ENV['HOME']))
+    @chef_config = {:validation_key => '~/my.key'}
+    @context = Chef::Knife::Core::BootstrapContext.new(@config, @run_list, @chef_config)
+    @context.validation_key
+  end
+
   it "generates the config file data" do
     expected=<<-EXPECTED
-log_level        :info
+log_level        :auto
 log_location     STDOUT
 chef_server_url  "http://chef.example.com:4444"
 validation_client_name "chef-validator-testing"

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

@@ -2,7 +2,8 @@
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Tim Hinderliter (<tim@opscode.com>)
 # Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2011 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2011, 2012 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,6 +40,153 @@ describe Chef::Knife::UI do
     end
   end
 
+  describe "output" do
+    it "formats strings appropriately" do
+      @ui.output("hi")
+      @out.string.should == "hi\n"
+    end
+
+    it "formats hashes appropriately" do
+      @ui.output({'hi' => 'a', 'lo' => 'b' })
+      @out.string.should == <<EOM
+hi: a
+lo: b
+EOM
+    end
+
+    it "formats empty hashes appropriately" do
+      @ui.output({})
+      @out.string.should == "\n"
+    end
+
+    it "formats arrays appropriately" do
+      @ui.output([ 'a', 'b' ])
+      @out.string.should == <<EOM
+a
+b
+EOM
+    end
+
+    it "formats empty arrays appropriately" do
+      @ui.output([ ])
+      @out.string.should == "\n"
+    end
+
+    it "formats single-member arrays appropriately" do
+      @ui.output([ 'a' ])
+      @out.string.should == "a\n"
+    end
+
+    it "formats nested single-member arrays appropriately" do
+      @ui.output([ [ 'a' ] ])
+      @out.string.should == "a\n"
+    end
+
+    it "formats nested arrays appropriately" do
+      @ui.output([ [ 'a', 'b' ], [ 'c', 'd' ]])
+      @out.string.should == <<EOM
+a
+b
+
+c
+d
+EOM
+    end
+
+    it "formats nested arrays with single- and empty subarrays appropriately" do
+      @ui.output([ [ 'a', 'b' ], [ 'c' ], [], [ 'd', 'e' ]])
+      @out.string.should == <<EOM
+a
+b
+
+c
+
+
+d
+e
+EOM
+    end
+
+    it "formats arrays of hashes with extra lines in between for readability" do
+      @ui.output([ { 'a' => 'b', 'c' => 'd' }, { 'x' => 'y' }, { 'm' => 'n', 'o' => 'p' }])
+      @out.string.should == <<EOM
+a: b
+c: d
+
+x: y
+
+m: n
+o: p
+EOM
+    end
+
+    it "formats hashes with empty array members appropriately" do
+      @ui.output({ 'a' => [], 'b' => 'c' })
+      @out.string.should == <<EOM
+a:
+b: c
+EOM
+    end
+
+    it "formats hashes with single-member array values appropriately" do
+      @ui.output({ 'a' => [ 'foo' ], 'b' => 'c' })
+      @out.string.should == <<EOM
+a: foo
+b: c
+EOM
+    end
+
+    it "formats hashes with array members appropriately" do
+      @ui.output({ 'a' => [ 'foo', 'bar' ], 'b' => 'c' })
+      @out.string.should == <<EOM
+a:
+  foo
+  bar
+b: c
+EOM
+    end
+
+    it "formats hashes with single-member nested array values appropriately" do
+      @ui.output({ 'a' => [ [ 'foo' ] ], 'b' => 'c' })
+      @out.string.should == <<EOM
+a:
+  foo
+b: c
+EOM
+    end
+
+    it "formats hashes with nested array values appropriately" do
+      @ui.output({ 'a' => [ [ 'foo', 'bar' ], [ 'baz', 'bjork' ] ], 'b' => 'c' })
+      @out.string.should == <<EOM
+a:
+  foo
+  bar
+  
+  baz
+  bjork
+b: c
+EOM
+    end
+
+    it "formats hashes with hash values appropriately" do
+      @ui.output({ 'a' => { 'aa' => 'bb', 'cc' => 'dd' }, 'b' => 'c' })
+      @out.string.should == <<EOM
+a:
+  aa: bb
+  cc: dd
+b: c
+EOM
+    end
+
+    it "formats hashes with empty hash values appropriately" do
+      @ui.output({ 'a' => { }, 'b' => 'c' })
+      @out.string.should == <<EOM
+a:
+b: c
+EOM
+    end
+  end
+
   describe "format_for_display" do
     it "should return the raw data" do
       input = { :gi => :go }
@@ -47,20 +195,21 @@ describe Chef::Knife::UI do
 
     describe "with --attribute passed" do
       it "should return the deeply nested attribute" do
-        input = { "gi" => { "go" => "ge" } }
+        input = { "gi" => { "go" => "ge" }, "id" => "sample-data-bag-item" }
         @ui.config[:attribute] = "gi.go"
-        @ui.format_for_display(input).should == { "gi.go" => "ge" }
+        @ui.format_for_display(input).should == { "sample-data-bag-item" => { "gi.go" => "ge" } }
       end
     end
 
     describe "with --run-list passed" do
       it "should return the run list" do
         input = Chef::Node.new
+        input.name("sample-node")
         input.run_list("role[monkey]", "role[churchmouse]")
         @ui.config[:run_list] = true
         response = @ui.format_for_display(input)
-        response["run_list"][0].should == "role[monkey]"
-        response["run_list"][1].should == "role[churchmouse]"
+        response["sample-node"]["run_list"][0].should == "role[monkey]"
+        response["sample-node"]["run_list"][1].should == "role[churchmouse]"
       end
     end
   end
@@ -89,8 +238,8 @@ describe Chef::Knife::UI do
       it "should return the URIs" do
         response = {
           "cookbook_name"=>{
-            "1.0.0" => "http://url/cookbooks/1.0.0", 
-            "2.0.0" => "http://url/cookbooks/2.0.0", 
+            "1.0.0" => "http://url/cookbooks/1.0.0",
+            "2.0.0" => "http://url/cookbooks/2.0.0",
             "3.0.0" => "http://url/cookbooks/3.0.0"}
         }
         @ui.config[:with_uri] = true