microwave 1.0.4 → 11.400.2

data/spec/data/nodes/default.rb

@@ -6,10 +6,10 @@ name "test.example.com-default"
 ##
 # Nodes can set arbitrary arguments
 ##
-sunshine "in"
-something "else"
+default[:sunshine] = "in"
+default[:something] = "else"
 
 ##
 # Nodes should have recipes
 ##
-recipes "operations-master", "operations-monitoring"
+run_list "operations-master", "operations-monitoring"

data/spec/data/nodes/test.example.com.rb

@@ -6,12 +6,12 @@ name "test.example.com"
 ##
 # Nodes can set arbitrary arguments
 ##
-sunshine "in"
-something "else"
+normal[:sunshine] = "in"
+normal[:something] = "else"
 
 ##
 # Nodes should have recipes
 ##
-recipes "operations-master", "operations-monitoring"
+run_list "operations-master", "operations-monitoring"
 
 chef_environment "dev"

data/spec/data/nodes/test.rb

@@ -6,10 +6,10 @@ name "test.example.com-short"
 ##
 # Nodes can set arbitrary arguments
 ##
-sunshine "in"
-something "else"
+default[:sunshine] = "in"
+default[:something] = "else"
 
 ##
 # Nodes should have recipes
 ##
-recipes "operations-master", "operations-monitoring"
+run_list "operations-master", "operations-monitoring"

data/spec/data/partial_one.erb

@@ -0,0 +1 @@
+partial one <%= render 'test.erb', :cookbook => 'openldap' %> calling home

data/spec/data/run_context/cookbooks/circular-dep1/attributes/default.rb

@@ -0,0 +1,4 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "circular-dep1::default"
+
+

data/spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('circular-dep1-definition')

data/spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb

@@ -0,0 +1,2 @@
+LibraryLoadOrder.record("circular-dep1")
+

data/spec/data/run_context/cookbooks/circular-dep1/metadata.rb

@@ -0,0 +1,2 @@
+name "circular-dep1"
+depends "circular-dep2"

data/spec/data/run_context/cookbooks/circular-dep1/providers/provider.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('circular-dep1-provider')

data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('circular-dep1-resource')

data/spec/data/run_context/cookbooks/circular-dep2/attributes/default.rb

@@ -0,0 +1,3 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "circular-dep2::default"
+

data/spec/data/run_context/cookbooks/circular-dep2/definitions/circular_dep2_res.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('circular-dep2-definition')

data/spec/data/run_context/cookbooks/circular-dep2/libraries/lib.rb

@@ -0,0 +1,2 @@
+LibraryLoadOrder.record("circular-dep2")
+

data/spec/data/run_context/cookbooks/circular-dep2/metadata.rb

@@ -0,0 +1,2 @@
+name "circular-dep2"
+depends "circular-dep1"

data/spec/data/run_context/cookbooks/circular-dep2/providers/provider.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('circular-dep2-provider')

data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('circular-dep2-resource')

data/spec/data/run_context/cookbooks/dependency1/attributes/aa_first.rb

@@ -0,0 +1,2 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "dependency1::aa_first"

data/spec/data/run_context/cookbooks/dependency1/attributes/default.rb

@@ -0,0 +1,2 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "dependency1::default"

data/spec/data/run_context/cookbooks/dependency1/attributes/zz_last.rb

@@ -0,0 +1,3 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "dependency1::zz_last"
+

data/spec/data/run_context/cookbooks/dependency1/definitions/dependency1_res.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('dependency1-definition')

data/spec/data/run_context/cookbooks/dependency1/libraries/lib.rb

@@ -0,0 +1,2 @@
+LibraryLoadOrder.record("dependency1")
+

data/spec/data/run_context/cookbooks/dependency1/providers/provider.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('dependency1-provider')

data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('dependency1-resource')

data/spec/data/run_context/cookbooks/dependency2/attributes/default.rb

@@ -0,0 +1,3 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "dependency2::default"
+

data/spec/data/run_context/cookbooks/dependency2/definitions/dependency2_res.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('dependency2-definition')

data/spec/data/run_context/cookbooks/dependency2/libraries/lib.rb

@@ -0,0 +1,2 @@
+LibraryLoadOrder.record("dependency2")
+

data/spec/data/run_context/cookbooks/dependency2/providers/provider.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('dependency2-provider')

data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('dependency2-resource')

data/spec/data/run_context/cookbooks/no-default-attr/attributes/server.rb

@@ -0,0 +1,3 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "no-default-attr::server"
+

data/spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('no-default-attr-definition')

data/spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('no-default-attr-provider')

data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('no-default-attr-resource')

data/spec/data/run_context/cookbooks/test-with-circular-deps/attributes/default.rb

@@ -0,0 +1,3 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "test-with-circular-deps::default"
+

data/spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-with-circular-deps-definition')

data/spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb

@@ -0,0 +1,2 @@
+LibraryLoadOrder.record("test-with-circular-deps")
+

data/spec/data/run_context/cookbooks/test-with-circular-deps/metadata.rb

@@ -0,0 +1,2 @@
+name "test-with-circular-deps"
+depends "circular-dep1"

data/spec/data/run_context/cookbooks/test-with-circular-deps/providers/provider.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-with-circular-deps-provider')

data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-with-circular-deps-resource')

data/spec/data/run_context/cookbooks/test-with-deps/attributes/default.rb

@@ -0,0 +1,3 @@
+set_unless[:attr_load_order] = []
+set[:attr_load_order] << "test-with-deps::default"
+

data/spec/data/run_context/cookbooks/test-with-deps/definitions/test_with-deps_res.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-with-deps-definition')

data/spec/data/run_context/cookbooks/test-with-deps/libraries/lib.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record("test-with-deps")

data/spec/data/run_context/cookbooks/test-with-deps/metadata.rb

@@ -0,0 +1,3 @@
+name "test-with-deps"
+depends "dependency1"
+depends "dependency2"

data/spec/data/run_context/cookbooks/test-with-deps/providers/provider.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-with-deps-provider')

data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-with-deps-resource')

data/spec/data/run_context/cookbooks/test/attributes/george.rb

@@ -1 +1 @@
-george "washington"
+default[:george] = "washington"

data/spec/data/run_context/cookbooks/test/definitions/test_res.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-definition')

data/spec/data/run_context/cookbooks/test/providers/provider.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-provider')

data/spec/data/run_context/cookbooks/test/resources/resource.rb

@@ -0,0 +1 @@
+LibraryLoadOrder.record('test-resource')

data/spec/data/shef-config.rb

@@ -0,0 +1,10 @@
+Ohai::Config[:disabled_plugins] << 'darwin::system_profiler' << 'darwin::kernel' << 'darwin::ssh_host_key' << 'network_listeners' 
+Ohai::Config[:disabled_plugins] <<  "virtualization" << "darwin::virtualization"
+Ohai::Config[:disabled_plugins] << 'darwin::uptime' << 'darwin::filesystem' << 'dmi' << 'lanuages' << 'perl' << 'python' << 'java' 
+Ohai::Config[:disabled_plugins] << "linux::block_device" << "linux::kernel" << "linux::ssh_host_key" << "linux::virtualization"
+Ohai::Config[:disabled_plugins] << "linux::cpu" << "linux::memory" << "ec2" << "rackspace" << "eucalyptus" << "ip_scopes"
+Ohai::Config[:disabled_plugins] << "solaris2::cpu" << "solaris2::dmi" << "solaris2::filesystem" << "solaris2::kernel"
+Ohai::Config[:disabled_plugins] << "solaris2::virtualization" << "solaris2::zpools"
+Ohai::Config[:disabled_plugins] << 'c' << 'php' << 'mono' << 'groovy' << 'lua' << 'erlang'
+Ohai::Config[:disabled_plugins] << "kernel" << "linux::filesystem" << "ruby"
+

data/spec/functional/dsl/registry_helper_spec.rb

@@ -0,0 +1,63 @@
+#
+# Author:: Prajakta Purohit (<prajakta@opscode.com>)
+# Copyright:: Copyright (c) 2011 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 "chef/dsl/registry_helper"
+require "spec_helper"
+
+describe Chef::Resource::RegistryKey, :windows_only do
+
+  before (:all) do
+    ::Win32::Registry::HKEY_CURRENT_USER.create "Software\\Root"
+    ::Win32::Registry::HKEY_CURRENT_USER.create "Software\\Root\\Branch"
+    ::Win32::Registry::HKEY_CURRENT_USER.open('Software\\Root', Win32::Registry::KEY_ALL_ACCESS) do |reg|
+      reg['RootType1', Win32::Registry::REG_SZ] = 'fibrous'
+      reg.write('Roots', Win32::Registry::REG_MULTI_SZ, ["strong roots", "healthy tree"])
+    end
+
+    events = Chef::EventDispatch::Dispatcher.new
+    node = Chef::Node.new
+    ohai = Ohai::System.new
+    ohai.all_plugins
+    node.consume_external_attrs(ohai.data,{})
+    run_context = Chef::RunContext.new(node, {}, events)
+    @resource = Chef::Resource.new("foo", run_context)
+  end
+
+  context "tests registry dsl" do
+    it "returns true if registry_key_exists" do
+      @resource.registry_key_exists?("HKCU\\Software\\Root").should == true
+    end
+    it "returns true if registry has specified value" do
+      values = @resource.registry_get_values("HKCU\\Software\\Root")
+      values.include?({:name=>"RootType1",:type=>:string,:data=>"fibrous"}).should == true
+    end
+    it "returns true if specified registry_has_subkey" do
+      @resource.registry_has_subkeys?("HKCU\\Software\\Root").should == true
+    end
+    it "returns true if specified key has specified subkey" do
+      subkeys = @resource.registry_get_subkeys("HKCU\\Software\\Root")
+      subkeys.include?("Branch").should == true
+    end
+    it "returns true if registry_value_exists" do
+      @resource.registry_value_exists?("HKCU\\Software\\Root", {:name=>"RootType1", :type=>:string, :data=>"fibrous"}).should == true
+    end
+    it "returns true if data_value_exists" do
+      @resource.registry_data_exists?("HKCU\\Software\\Root", {:name=>"RootType1", :type=>:string, :data=>"fibrous"}).should == true
+    end
+  end
+end

data/spec/functional/knife/cookbook_delete_spec.rb

@@ -23,8 +23,6 @@ describe Chef::Knife::CookbookDelete do
   before(:all) do
     @original_config = Chef::Config.hash_dup
 
-    Thin::Logging.silent = true
-
     @server = TinyServer::Manager.new
     @server.start
   end

data/spec/functional/knife/exec_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.
@@ -23,8 +23,6 @@ describe Chef::Knife::Exec do
   before(:all) do
     @original_config = Chef::Config.hash_dup
 
-    Thin::Logging.silent = false
-
     @server = TinyServer::Manager.new#(:debug => true)
     @server.start
   end
@@ -46,9 +44,9 @@ describe Chef::Knife::Exec do
     @server.stop
   end
 
-  pending "executes a script in the context of the shef main context", :ruby_18_only
+  pending "executes a script in the context of the chef-shell main context", :ruby_18_only
 
-  it "executes a script in the context of the shef main context", :ruby_19_only do
+  it "executes a script in the context of the chef-shell main context", :ruby_19_only do
     @node = Chef::Node.new
     @node.name("ohai-world")
     response = {"rows" => [@node],"start" => 0,"total" => 1}

data/spec/functional/knife/smoke_test.rb

@@ -0,0 +1,34 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 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 'spec_helper'
+
+describe "knife smoke tests" do
+
+  # Since our specs load all code, there could be a case where knife does not
+  # run correctly b/c of a missing require, but is not caught by other tests.
+  #
+  # We run `knife -v` to verify that knife at least loads all its code.
+  it "can run and print its version" do
+    knife_path = File.expand_path("../../bin/knife", CHEF_SPEC_DATA)
+    knife_cmd = Mixlib::ShellOut.new("#{knife_path} -v")
+    knife_cmd.run_command
+    knife_cmd.error!
+    knife_cmd.stdout.should include(Chef::VERSION)
+  end
+end

data/spec/functional/knife/ssh_spec.rb

@@ -23,14 +23,15 @@ describe Chef::Knife::Ssh do
 
   before(:all) do
     @original_config = Chef::Config.hash_dup
+    @original_knife_config = Chef::Config[:knife].dup
     Chef::Knife::Ssh.load_deps
-    Thin::Logging.silent = true
     @server = TinyServer::Manager.new
     @server.start
   end
 
   after(:all) do
     Chef::Config.configuration = @original_config
+    Chef::Config[:knife] = @original_knife_config
     @server.stop
   end
 
@@ -90,6 +91,19 @@ describe Chef::Knife::Ssh do
     end
   end
 
+  describe "port" do
+    context "when -p 31337 is provided" do
+      before do
+        setup_knife(['-p 31337', '*:*', 'uptime'])
+      end
+
+      it "uses the ssh_port" do
+        @knife.run
+        @knife.config[:ssh_port].should == "31337"
+      end
+    end
+  end
+
   describe "user" do
     context "when knife[:ssh_user] is set" do
       before do
@@ -141,7 +155,7 @@ describe Chef::Knife::Ssh do
 
       it "uses the default" do
         @knife.run
-        @knife.config[:ssh_user].should == nil
+        @knife.config[:ssh_user].should == "root"
       end
     end
   end
@@ -193,9 +207,56 @@ describe Chef::Knife::Ssh do
     end
   end
 
+  describe "gateway" do
+    context "when knife[:ssh_gateway] is set" do
+      before do
+        setup_knife(['*:*', 'uptime'])
+        Chef::Config[:knife][:ssh_gateway] = "user@ec2.public_hostname"
+      end
+
+      it "uses the ssh_gateway" do
+        @knife.session.should_receive(:via).with("ec2.public_hostname", "user", {})
+        @knife.run
+        @knife.config[:ssh_gateway].should == "user@ec2.public_hostname"
+      end
+    end
+
+    context "when -G user@ec2.public_hostname is provided" do
+      before do
+        setup_knife(['-G user@ec2.public_hostname', '*:*', 'uptime'])
+        Chef::Config[:knife][:ssh_gateway] = nil
+      end
+
+      it "uses the ssh_gateway" do
+        @knife.session.should_receive(:via).with("ec2.public_hostname", "user", {})
+        @knife.run
+        @knife.config[:ssh_gateway].should == "user@ec2.public_hostname"
+      end
+    end
+
+    context "when the gateway requires a password" do
+      before do
+        setup_knife(['-G user@ec2.public_hostname', '*:*', 'uptime'])
+        Chef::Config[:knife][:ssh_gateway] = nil
+        @knife.session.stub(:via) do |host, user, options|
+          raise Net::SSH::AuthenticationFailed unless options[:password]
+        end
+      end
+
+      it "should prompt the user for a password" do
+        @knife.ui.should_receive(:ask).with("Enter the password for user@ec2.public_hostname: ").and_return("password")
+        @knife.run
+      end
+    end
+  end
+
   def setup_knife(params=[])
     @knife = Chef::Knife::Ssh.new(params)
-    @knife.stub!(:ssh_command).and_return { [] }
+    # We explicitly avoid running #configure_chef, which would read a knife.rb
+    # if available, but #merge_configs (which is called by #configure_chef) is
+    # necessary to have default options merged in.
+    @knife.merge_configs
+    @knife.stub!(:ssh_command).and_return { 0 }
     @api = TinyServer::API.instance
     @api.clear