chef 12.0.0.alpha.1 → 12.0.0.alpha.2

data/spec/support/shared/integration/chef_zero_support.rb

@@ -1,130 +0,0 @@
-require 'tempfile'
-require 'chef_zero/server'
-require 'chef_zero/rest_request'
-
-# This is a copy of chef_zero/rspec, modified to implement contextual
-# helpers as instance_methods rather than class methods. This makes it
-# possible to use them with let bindings and other RSpec code reuse
-# mechanisms.
-#
-# Unfortunately, at the time of this writing, chef-zero master doesn't
-# work for our rspec tests, so in the interests of making forward
-# progress, we're using a modified version of the chef_zero/rspec code
-# here.
-#
-# This file should be entirely replaced by chef_zero/rspec once these
-# issues are fixed.
-module ChefZeroSupport
-  module Server
-
-    def self.server
-      @server
-    end
-    def self.server=(value)
-      @server = value
-    end
-    def self.client_key
-      @client_key
-    end
-    def self.client_key=(value)
-      @client_key = value
-    end
-    def self.request_log
-      @request_log ||= []
-    end
-    def self.clear_request_log
-      @request_log = []
-    end
-
-  end
-
-  def client(name, client)
-    ChefZeroSupport::Server.server.load_data({ 'clients' => { name => client }})
-  end
-
-  def cookbook(name, version, cookbook = {}, options = {})
-
-    auto_metadata = "name '#{name}'; version '#{version}'"
-
-    cookbook["metadata.rb"] ||= auto_metadata
-
-    ChefZeroSupport::Server.server.load_data({ 'cookbooks' => { "#{name}-#{version}" => cookbook.merge(options) }})
-  end
-
-  def data_bag(name, data_bag)
-    ChefZeroSupport::Server.server.load_data({ 'data' => { name => data_bag }})
-  end
-
-  def environment(name, environment)
-    ChefZeroSupport::Server.server.load_data({ 'environments' => { name => environment }})
-  end
-
-  def node(name, node)
-    ChefZeroSupport::Server.server.load_data({ 'nodes' => { name => node }})
-  end
-
-  def role(name, role)
-    ChefZeroSupport::Server.server.load_data({ 'roles' => { name => role }})
-  end
-
-  def user(name, user)
-    ChefZeroSupport::Server.server.load_data({ 'users' => { name => user }})
-  end
-
-  RSpec.shared_context "With chef-zero running" do
-    before :each do
-
-      default_opts = {:port => 8900, :signals => false, :log_requests => true}
-      server_opts = if self.respond_to?(:chef_zero_opts)
-        default_opts.merge(chef_zero_opts)
-      else
-        default_opts
-      end
-
-      if ChefZeroSupport::Server.server && server_opts.any? { |opt, value| ChefZeroSupport::Server.server.options[opt] != value }
-        ChefZeroSupport::Server.server.stop
-        ChefZeroSupport::Server.server = nil
-      end
-
-      unless ChefZeroSupport::Server.server
-        # TODO: can this be logged easily?
-        # pp :zero_opts => server_opts
-
-        # Set up configuration so that clients will point to the server
-        ChefZeroSupport::Server.server = ChefZero::Server.new(server_opts)
-        ChefZeroSupport::Server.client_key = Tempfile.new(['chef_zero_client_key', '.pem'])
-        ChefZeroSupport::Server.client_key.write(ChefZero::PRIVATE_KEY)
-        ChefZeroSupport::Server.client_key.close
-        # Start the server
-        ChefZeroSupport::Server.server.start_background
-        ChefZeroSupport::Server.server.on_response do |request, response|
-          ChefZeroSupport::Server.request_log << [ request, response ]
-        end
-      else
-        ChefZeroSupport::Server.server.clear_data
-      end
-      ChefZeroSupport::Server.clear_request_log
-
-      if defined?(Chef::Config)
-        @old_chef_server_url = Chef::Config.chef_server_url
-        @old_node_name = Chef::Config.node_name
-        @old_client_key = Chef::Config.client_key
-        Chef::Config.chef_server_url = ChefZeroSupport::Server.server.url
-        Chef::Config.node_name = 'admin'
-        Chef::Config.client_key = ChefZeroSupport::Server.client_key.path
-        Chef::Config.http_retry_count = 0
-      end
-    end
-
-    if defined?(Chef::Config)
-      after :each do
-        Chef::Config.chef_server_url = @old_chef_server_url
-        Chef::Config.node_name = @old_node_name
-        Chef::Config.client_key = @old_client_key
-      end
-    end
-
-  end
-
-end
-

data/spec/unit/knife/config_file_selection_spec.rb

@@ -1,135 +0,0 @@
-#
-# Author:: Nicolas Vinot (<aeris@imirhil.fr>)
-# 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 File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require 'tmpdir'
-
-describe Chef::Knife do
-
-  let(:missing_config_fetcher) do
-    double(Chef::ConfigFetcher, :config_missing? => true)
-  end
-
-  let(:available_config_fetcher) do
-    double(Chef::ConfigFetcher, :config_missing? => false,
-                                :read_config => "")
-  end
-
-  def have_config_file(path)
-    Chef::ConfigFetcher.should_receive(:new).at_least(1).times.with(path, nil).and_return(available_config_fetcher)
-  end
-
-  before do
-    # Make sure tests can run when HOME is not set...
-    @original_home = ENV["HOME"]
-    ENV["HOME"] = Dir.tmpdir
-  end
-
-  after do
-    ENV["HOME"] = @original_home
-  end
-
-  before :each do
-    Chef::Config.stub(:from_file).and_return(true)
-    Chef::ConfigFetcher.stub(:new).and_return(missing_config_fetcher)
-  end
-
-  it "configure knife from KNIFE_HOME env variable" do
-    env_config = File.expand_path(File.join(Dir.tmpdir, 'knife.rb'))
-    have_config_file(env_config)
-
-    ENV['KNIFE_HOME'] = Dir.tmpdir
-    @knife = Chef::Knife.new
-    @knife.configure_chef
-    @knife.config[:config_file].should == env_config
-  end
-
-   it "configure knife from PWD" do
-    pwd_config = "#{Dir.pwd}/knife.rb"
-    have_config_file(pwd_config)
-
-    @knife = Chef::Knife.new
-    @knife.configure_chef
-    @knife.config[:config_file].should == pwd_config
-  end
-
-  it "configure knife from UPWARD" do
-    upward_dir = File.expand_path "#{Dir.pwd}/.chef"
-    upward_config = File.expand_path "#{upward_dir}/knife.rb"
-    have_config_file(upward_config)
-    Chef::Knife.stub(:chef_config_dir).and_return(upward_dir)
-
-    @knife = Chef::Knife.new
-    @knife.configure_chef
-    @knife.config[:config_file].should == upward_config
-  end
-
-  it "configure knife from HOME" do
-    home_config = File.expand_path(File.join("#{ENV['HOME']}", "/.chef/knife.rb"))
-    have_config_file(home_config)
-
-    @knife = Chef::Knife.new
-    @knife.configure_chef
-    @knife.config[:config_file].should == home_config
-  end
-
-  it "configure knife from nothing" do
-    ::File.stub(:exist?).and_return(false)
-    @knife = Chef::Knife.new
-    @knife.ui.should_receive(:warn).with("No knife configuration file found")
-    @knife.configure_chef
-    @knife.config[:config_file].should be_nil
-  end
-
-  it "configure knife precedence" do
-    env_config = File.join(Dir.tmpdir, 'knife.rb')
-    pwd_config = "#{Dir.pwd}/knife.rb"
-    upward_dir = File.expand_path "#{Dir.pwd}/.chef"
-    upward_config = File.expand_path "#{upward_dir}/knife.rb"
-    home_config = File.expand_path(File.join("#{ENV['HOME']}", "/.chef/knife.rb"))
-    configs = [ env_config, pwd_config, upward_config, home_config ]
-
-    Chef::Knife.stub(:chef_config_dir).and_return(upward_dir)
-    ENV['KNIFE_HOME'] = Dir.tmpdir
-
-    @knife = Chef::Knife.new
-
-    @knife.configure_chef
-    @knife.config[:config_file].should be_nil
-
-    have_config_file(home_config)
-    @knife = Chef::Knife.new
-    @knife.configure_chef
-    @knife.config[:config_file].should == home_config
-
-    have_config_file(upward_config)
-    @knife = Chef::Knife.new
-    @knife.configure_chef
-    @knife.config[:config_file].should == upward_config
-
-    have_config_file(pwd_config)
-    @knife = Chef::Knife.new
-    @knife.configure_chef
-    @knife.config[:config_file].should == pwd_config
-
-    have_config_file(env_config)
-    @knife = Chef::Knife.new
-    @knife.configure_chef
-    @knife.config[:config_file].should == env_config
-  end
-end