microwave 1.0.4 → 11.400.2

data/spec/unit/environment_spec.rb

@@ -235,107 +235,6 @@ describe Chef::Environment do
     end
   end
 
-  describe "when listing the available cookbooks filtered by policy" do
-    before(:each) do
-      @environment.name "prod"
-      @environment.cookbook_versions({
-        "apt" => "= 1.0.0",
-        "apache2" => "= 2.0.0"
-      })
-      Chef::Environment.stub!(:cdb_load).and_return @environment
-
-      @all_cookbooks = []
-      @all_cookbooks << begin
-        cv = Chef::CookbookVersion.new("apt")
-        cv.version = "1.0.0"
-        cv.recipe_filenames = ["default.rb", "only-in-1-0.rb"]
-        cv
-      end
-      @all_cookbooks << begin
-        cv = Chef::CookbookVersion.new("apt")
-        cv.version = "1.1.0"
-        cv.recipe_filenames = ["default.rb", "only-in-1-1.rb"]
-        cv
-      end
-      @all_cookbooks << begin
-        cv = Chef::CookbookVersion.new("apache2")
-        cv.version = "2.0.0"
-        cv.recipe_filenames = ["default.rb", "mod_ssl.rb"]
-        cv
-      end
-      @all_cookbooks << begin
-        cv = Chef::CookbookVersion.new("god")
-        cv.version = "4.2.0"
-        cv.recipe_filenames = ["default.rb"]
-        cv
-      end
-      Chef::CookbookVersion.stub!(:cdb_list).and_return @all_cookbooks
-    end
-
-    it "should load the environment" do
-      Chef::Environment.should_receive(:cdb_load).with("prod", nil)
-      Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
-    end
-
-    it "should handle cookbooks with no available version" do
-      @environment.cookbook_versions({
-                                       "apt" => "> 999.0.0",
-                                       "apache2" => "= 2.0.0"
-                                     })
-      Chef::Environment.should_receive(:cdb_load).with("prod", nil)
-      recipes = Chef::Environment.cdb_load_filtered_recipe_list("prod")
-      # order doesn't matter
-      recipes.should =~ ["god", "apache2", "apache2::mod_ssl"]
-    end
-
-    
-    it "should load all the cookbook versions" do
-      Chef::CookbookVersion.should_receive(:cdb_list)
-      Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
-      recipes = Chef::Environment.cdb_load_filtered_recipe_list("prod")
-      recipes.should =~ ["apache2", "apache2::mod_ssl", "apt",
-                         "apt::only-in-1-0", "god"]
-    end
-
-    it "should load all the cookbook versions with no policy" do
-      @environment.cookbook_versions({})
-      Chef::CookbookVersion.should_receive(:cdb_list)
-      Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
-      recipes = Chef::Environment.cdb_load_filtered_recipe_list("prod")
-      recipes.should =~ ["apache2", "apache2::mod_ssl", "apt",
-                         "apt::only-in-1-1", "god"]
-    end
-
-    it "should restrict the cookbook versions, as specified in the environment" do
-      res = Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
-      res["apt"].detect {|cb| cb.version == "1.0.0"}.should_not == nil
-      res["apache2"].detect {|cb| cb.version == "2.0.0"}.should_not == nil
-      res["god"].detect {|cb| cb.version == "4.2.0"}.should_not == nil
-    end
-
-    it "should produce correct results, regardless of the cookbook order in couch" do
-      # a bug present before the environments feature defaulted to the last CookbookVersion
-      # object for a cookbook as returned from couchdb when fetching cookbooks for a node
-      # this is a regression test
-      @all_cookbooks << begin
-        cv = Chef::CookbookVersion.new("god")
-        cv.version = "0.0.1"
-        cv
-      end
-      res = Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
-      res["apt"].detect {|cb| cb.version == "1.0.0"}.should_not == nil
-      res["apache2"].detect {|cb| cb.version == "2.0.0"}.should_not == nil
-      res["god"].detect {|cb| cb.version == "4.2.0"}.should_not == nil
-    end
-
-    it "should return all versions of a cookbook that meet the version requirement" do
-      @environment.cookbook "apt", ">= 1.0.0"
-      res = Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
-      res["apt"].detect {|cb| cb.version == "1.0.0"}.should_not == nil
-      res["apt"].detect {|cb| cb.version == "1.1.0"}.should_not == nil
-    end
-  end
-
   describe "self.validate_cookbook_versions" do
     before(:each) do
       @cookbook_versions = {
@@ -376,35 +275,6 @@ describe Chef::Environment do
     end
   end
 
-  describe "self.create_default_environment" do
-    it "should check if the '_default' environment exists" do
-      @couchdb = Chef::CouchDB.new
-      Chef::CouchDB.stub!(:new).and_return @couchdb
-      Chef::Environment.should_receive(:cdb_load).with('_default', Chef::CouchDB.new)
-      Chef::Environment.create_default_environment
-    end
-
-    it "should not re-create the environment if it exists" do
-      @couchdb = Chef::CouchDB.new
-      Chef::CouchDB.stub!(:new).and_return @couchdb
-      Chef::Environment.should_receive(:cdb_load).with('_default', Chef::CouchDB.new).and_return true
-      Chef::Environment.should_not_receive(:new)
-      Chef::Environment.create_default_environment
-    end
-
-    it "should create the environment if it doesn't exist" do
-      @env = Chef::Environment.new
-      @env.stub!(:cdb_save).and_return true
-      @couchdb = Chef::CouchDB.new
-      Chef::Environment.stub!(:new).and_return @env
-      Chef::CouchDB.stub!(:new).and_return @couchdb
-
-      Chef::Environment.should_receive(:cdb_load).with('_default', Chef::CouchDB.new).and_raise(Chef::Exceptions::CouchDBNotFound)
-      Chef::Environment.should_receive(:new)
-      Chef::Environment.create_default_environment
-    end
-  end
-
   describe "when updating from a parameter hash" do
     before do
       @environment = Chef::Environment.new

data/spec/unit/exceptions_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.
@@ -40,7 +40,6 @@ describe Chef::Exceptions do
     Chef::Exceptions::Group => RuntimeError,
     Chef::Exceptions::Link => RuntimeError,
     Chef::Exceptions::Mount => RuntimeError,
-    Chef::Exceptions::CouchDBNotFound => RuntimeError,
     Chef::Exceptions::PrivateKeyMissing => RuntimeError,
     Chef::Exceptions::CannotWritePrivateKey => RuntimeError,
     Chef::Exceptions::RoleNotFound => RuntimeError,

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -19,12 +19,12 @@
 require 'spec_helper'
 
 describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
-  include Chef::Mixin::RecipeDefinitionDSLCore
+  include Chef::DSL::Recipe
 
   def run_context
     node = Chef::Node.new
-    node[:platform] = "ubuntu"
-    node[:platform_version] = "10.04"
+    node.automatic_attrs[:platform] = "ubuntu"
+    node.automatic_attrs[:platform_version] = "10.04"
     Chef::RunContext.new(node, {}, nil)
   end
 
@@ -112,6 +112,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         # fake code to run through #recipe_snippet
         source_file = [ "if true", "var = non_existant", "end" ]
         IO.stub!(:readlines).and_return(source_file)
+        File.stub!(:exists?).and_return(true)
       end
 
       it "parses a Windows path" do
@@ -127,6 +128,25 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
         @inspector.recipe_snippet.should match(/^# In \/home\/btm/)
       end
+      
+      context "when the recipe file does not exist" do
+        before do
+          File.stub!(:exists?).and_return(false)
+          IO.stub!(:readlines).and_raise(Errno::ENOENT)
+        end
+
+        it "does not try to parse a recipe in chef-shell/irb (CHEF-3411)" do
+          @resource.source_line = "(irb#1):1:in `irb_binding'"
+          @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
+          @inspector.recipe_snippet.should be_nil
+        end
+  
+        it "does not raise an exception trying to load a non-existant file (CHEF-3411)" do
+          @resource.source_line = "/somewhere/in/space"
+          @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
+          lambda { @inspector.recipe_snippet }.should_not raise_error
+        end
+      end
     end
 
     describe "when examining a resource that confuses the parser" do

data/spec/unit/json_compat_spec.rb

@@ -0,0 +1,69 @@
+#
+# Author:: Juanje Ojeda (<juanje.ojeda@gmail.com>)
+# Copyright:: Copyright (c) 2012 Opscode, 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 File.expand_path('../../spec_helper', __FILE__)
+require 'chef/json_compat'
+
+describe Chef::JSONCompat do
+
+  describe "with JSON containing an existing class" do
+    let(:json){'{"json_class": "Chef::Role"}'}
+    it "returns an instance of the class instead of a Hash" do
+      Chef::JSONCompat.from_json(json).class.should eq Chef::Role
+    end
+  end
+
+  describe 'with JSON containing "Chef::Sandbox" as a json_class value' do
+    require 'chef/sandbox' # Only needed for this test
+    let(:json){'{"json_class": "Chef::Sandbox", "arbitrary": "data"}'}
+    it "returns a Hash, because Chef::Sandbox is a dummy class" do
+      Chef::JSONCompat.from_json(json).should eq({"json_class" => "Chef::Sandbox", "arbitrary" => "data"})
+    end
+  end
+
+  describe "with a file with 300 or less nested entries" do
+    before(:all) do
+      @json = IO.read(File.join(CHEF_SPEC_DATA, 'big_json.json'))
+      @hash = Chef::JSONCompat.from_json(@json)
+    end
+
+    describe "when a big json file is loaded" do
+      it "should create a Hash from the file" do
+        @hash.should be_kind_of(Hash)
+      end
+      it "should has 'test' as a 300th nested value" do
+        @hash['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key'].should == 'test'
+      end
+    end
+  end
+  describe "with a file with more than 300 nested entries" do
+    before(:all) do
+      @json = IO.read(File.join(CHEF_SPEC_DATA, 'big_json_plus_one.json'))
+      @hash = Chef::JSONCompat.from_json(@json, {:max_nesting => 301})
+    end
+
+    describe "when a big json file is loaded" do
+      it "should create a Hash from the file" do
+        @hash.should be_kind_of(Hash)
+      end
+      it "should has 'test' as a 301st nested value" do
+        @hash['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key']['key'].should == 'test'
+      end
+    end
+  end
+end

data/spec/unit/knife/bootstrap_spec.rb

@@ -22,9 +22,21 @@ Chef::Knife::Bootstrap.load_deps
 require 'net/ssh'
 
 describe Chef::Knife::Bootstrap do
+  before(:all) do
+    @original_config = Chef::Config.hash_dup
+    @original_knife_config = Chef::Config[:knife].dup
+  end
+
+  after(:all) do
+    Chef::Config.configuration = @original_config
+    Chef::Config[:knife] = @original_knife_config
+  end
+
   before(:each) do
     Chef::Log.logger = Logger.new(StringIO.new)
     @knife = Chef::Knife::Bootstrap.new
+    # Merge default settings in.
+    @knife.merge_configs
     @knife.config[:template_file] = File.expand_path(File.join(CHEF_SPEC_DATA, "bootstrap", "test.erb"))
     @stdout = StringIO.new
     @knife.ui.stub!(:stdout).and_return(@stdout)
@@ -122,36 +134,77 @@ describe Chef::Knife::Bootstrap do
     @knife.name_args.first.should == "barf"
   end
 
-  describe "when configuring the underlying knife ssh command" do
-    before do
-      @knife.name_args = ["foo.example.com"]
-      @knife.config[:ssh_user]      = "rooty"
-      @knife.config[:ssh_password]  = "open_sesame"
-      Chef::Config[:knife][:ssh_port] = "4001"
-      @knife.config[:identity_file] = "~/.ssh/me.rsa"
-      @knife.stub!(:read_template).and_return("")
-      @knife_ssh = @knife.knife_ssh
+  describe "when configuring the underlying knife ssh command"
+    context "from the command line" do
+      before do
+        @knife.name_args = ["foo.example.com"]
+        @knife.config[:ssh_user]      = "rooty"
+        @knife.config[:ssh_port]      = "4001"
+        @knife.config[:ssh_password]  = "open_sesame"
+        Chef::Config[:knife][:ssh_user] = nil
+        Chef::Config[:knife][:ssh_port] = nil
+        @knife.config[:identity_file] = "~/.ssh/me.rsa"
+        @knife.stub!(:read_template).and_return("")
+        @knife_ssh = @knife.knife_ssh
+      end
+  
+      it "configures the hostname" do
+        @knife_ssh.name_args.first.should == "foo.example.com"
+      end
+  
+      it "configures the ssh user" do
+        @knife_ssh.config[:ssh_user].should == 'rooty'
+      end
+  
+      it "configures the ssh password" do
+        @knife_ssh.config[:ssh_password].should == 'open_sesame'
+      end
+  
+      it "configures the ssh port" do
+        @knife_ssh.config[:ssh_port].should == '4001'
+      end
+  
+      it "configures the ssh identity file" do
+        @knife_ssh.config[:identity_file].should == '~/.ssh/me.rsa'
+      end
     end
 
-    it "configures the hostname" do
-      @knife_ssh.name_args.first.should == "foo.example.com"
-    end
-
-    it "configures the ssh user" do
-      @knife_ssh.config[:ssh_user].should == 'rooty'
-    end
-
-    it "configures the ssh password" do
-      @knife_ssh.config[:ssh_password].should == 'open_sesame'
-    end
-
-    it "configures the ssh port" do
-      @knife_ssh.config[:ssh_port].should == '4001'
-    end
-
-    it "configures the ssh identity file" do
-      @knife_ssh.config[:identity_file].should == '~/.ssh/me.rsa'
-    end
+    context "from the knife config file" do
+      before do
+        @knife.name_args = ["config.example.com"]
+        @knife.config[:ssh_user] = nil
+        @knife.config[:ssh_port] = nil
+        @knife.config[:ssh_gateway] = nil
+        @knife.config[:identity_file] = nil
+        @knife.config[:host_key_verify] = nil
+        Chef::Config[:knife][:ssh_user] = "curiosity"
+        Chef::Config[:knife][:ssh_port] = "2430"
+        Chef::Config[:knife][:identity_file] = "~/.ssh/you.rsa"
+        Chef::Config[:knife][:ssh_gateway] = "towel.blinkenlights.nl"
+        Chef::Config[:knife][:host_key_verify] = true
+        @knife.stub!(:read_template).and_return("")
+        @knife_ssh = @knife.knife_ssh
+      end
+  
+      it "configures the ssh user" do
+        @knife_ssh.config[:ssh_user].should == 'curiosity'
+      end
+  
+      it "configures the ssh port" do
+        @knife_ssh.config[:ssh_port].should == '2430'
+      end
+  
+      it "configures the ssh identity file" do
+        @knife_ssh.config[:identity_file].should == '~/.ssh/you.rsa'
+      end
+  
+      it "configures the ssh gateway" do
+        @knife_ssh.config[:ssh_gateway].should == 'towel.blinkenlights.nl'
+      end
+
+      it "configures the host key verify mode" do
+        @knife_ssh.config[:host_key_verify].should == true
+      end
   end
 
   describe "when falling back to password auth when host key auth fails" do

data/spec/unit/knife/client_reregister_spec.rb

@@ -22,40 +22,41 @@ describe Chef::Knife::ClientReregister do
   before(:each) do
     @knife = Chef::Knife::ClientReregister.new
     @knife.name_args = [ 'adam' ]
-    @client_mock = mock('client_mock')
-    @client_mock.stub!(:save).and_return({ 'private_key' => 'foo_key' })
-    Chef::ApiClient.stub!(:load).and_return(@client_mock)
+    @client_mock = mock('client_mock', :private_key => "foo_key")
     @stdout = StringIO.new
     @knife.ui.stub!(:stdout).and_return(@stdout)
   end
 
-  describe 'run' do
-    it 'should load and save the client' do
-      Chef::ApiClient.should_receive(:load).with('adam').and_return(@client_mock)
-      @client_mock.should_receive(:save).with(true).and_return({'private_key' => 'foo_key'})
-      @knife.run
-    end
-
-    it 'should output the private key' do
-      @knife.run
-      @stdout.string.should match /foo_key/
+  context "when no client name is given on the command line" do
+    before do
+      @knife.name_args = []
     end
 
     it 'should print usage and exit when a client name is not provided' do
-      @knife.name_args = []
       @knife.should_receive(:show_usage)
       @knife.ui.should_receive(:fatal)
       lambda { @knife.run }.should raise_error(SystemExit)
     end
+  end
+
+  context 'when not configured for file output' do
+    it 'reregisters the client and prints the key' do
+      Chef::ApiClient.should_receive(:reregister).with('adam').and_return(@client_mock)
+      @knife.run
+      @stdout.string.should match( /foo_key/ )
+    end
+  end
 
-    describe 'with -f or --file' do
-      it 'should write the private key to a file' do
-        @knife.config[:file] = '/tmp/monkeypants'
-        filehandle = mock('Filehandle')
-        filehandle.should_receive(:print).with('foo_key')
-        File.should_receive(:open).with('/tmp/monkeypants', 'w').and_yield(filehandle)
-        @knife.run
-      end
+  context 'when configured for file output' do
+    it 'should write the private key to a file' do
+      Chef::ApiClient.should_receive(:reregister).with('adam').and_return(@client_mock)
+
+      @knife.config[:file] = '/tmp/monkeypants'
+      filehandle = StringIO.new
+      File.should_receive(:open).with('/tmp/monkeypants', 'w').and_yield(filehandle)
+      @knife.run
+      filehandle.string.should == "foo_key"
     end
   end
+
 end