chef-server-slice/app/controllers/cookbook_segment.rb chef/distro/debian/etc/init.d/chef-client chef/distro/debian/etc/init.d/chef-indexer chef/distro/debian/etc/init.d/chef-server chef/distro/debian/man/man1/chef-indexer.1 chef/distro/debian/man/man1/chef-server.1 chef/distro/debian/man/man8/chef-client.8 chef/distro/debian/man/man8/chef-solo.8 chef/distro/redhat/etc/chef/client.rb chef/distro/redhat/etc/chef/indexer.rb chef/distro/redhat/etc/chef/server.rb chef/distro/redhat/etc/init.d/chef-client chef/distro/redhat/etc/init.d/chef-indexer chef/distro/redhat/etc/init.d/chef-server chef/lib/chef/mixin/convert_to_class_name.rb chef/lib/chef/mixin/recipe_definition_dsl_core.rb chef/lib/chef/provider/deploy.rb chef/lib/chef/provider/deploy/revision.rb chef/lib/chef/provider/deploy/timestamped.rb chef/lib/chef/provider/git.rb chef/lib/chef/provider/group/gpasswd.rb chef/lib/chef/provider/group/usermod.rb chef/lib/chef/provider/subversion.rb chef/lib/chef/resource/deploy.rb chef/lib/chef/resource/deploy_revision.rb chef/lib/chef/resource/git.rb chef/lib/chef/resource/scm.rb chef/lib/chef/resource/subversion.rb chef/lib/chef/resource/timestamped_deploy.rb chef/spec/data/lwrp/providers/buck_passer.rb chef/spec/data/lwrp/providers/buck_passer_2.rb chef/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb chef/spec/data/lwrp/providers/monkey_name_printer.rb chef/spec/data/lwrp/providers/paint_drying_watcher.rb chef/spec/data/lwrp/providers/thumb_twiddler.rb chef/spec/data/lwrp/resources/bar.rb chef/spec/data/lwrp/resources/foo.rb chef/spec/unit/lwrp_spec.rb chef/spec/unit/mixin/find_preferred_file_spec.rb chef/spec/unit/provider/deploy/revision_spec.rb chef/spec/unit/provider/deploy/timestamped_spec.rb chef/spec/unit/provider/deploy_spec.rb chef/spec/unit/provider/git_spec.rb chef/spec/unit/provider/group/gpasswd_spec.rb chef/spec/unit/provider/group/usermod_spec.rb chef/spec/unit/provider/subversion_spec.rb chef/spec/unit/resource/deploy_revision_spec.rb chef/spec/unit/resource/deploy_spec.rb chef/spec/unit/resource/git_spec.rb chef/spec/unit/resource/scm_spec.rb chef/spec/unit/resource/subversion_spec.rb chef/spec/unit/resource/timestamped_deploy_spec.rb features/cookbooks/lightweight_resources_and_providers.feature features/data/cookbooks/deploy/recipes/callbacks.rb features/data/cookbooks/deploy/recipes/default.rb features/data/cookbooks/deploy/recipes/embedded_recipe_callbacks.rb features/data/cookbooks/deploy/recipes/revision_deploy.rb features/data/cookbooks/deploy/recipes/rollback.rb features/data/cookbooks/deploy/templates/default/app_config.yml.erb features/data/cookbooks/deploy/templates/default/database.yml.erb features/data/cookbooks/deploy/templates/default/embedded_recipe_before_symlink.rb.erb features/data/cookbooks/deploy/templates/default/sneaky_after_restart_hook.rb.erb features/data/cookbooks/deploy/templates/default/sneaky_before_migrate_hook.rb.erb features/data/cookbooks/deploy/templates/default/sneaky_before_restart_hook.rb.erb features/data/cookbooks/deploy/templates/default/sneaky_before_symlink_hook.rb.erb features/data/cookbooks/lwrp/providers/default.rb features/data/cookbooks/lwrp/providers/lwp_non_default.rb features/data/cookbooks/lwrp/providers/lwp_overridden_load_current_resource.rb features/data/cookbooks/lwrp/recipes/default_everything.rb features/data/cookbooks/lwrp/recipes/non_default_provider.rb features/data/cookbooks/lwrp/recipes/non_default_resource.rb features/data/cookbooks/lwrp/recipes/overridden_provider_load_current_resource.rb features/data/cookbooks/lwrp/recipes/overridden_resource_initialize.rb features/data/cookbooks/lwrp/recipes/provider_invokes_resource.rb features/data/cookbooks/lwrp/recipes/provider_is_a_class.rb features/data/cookbooks/lwrp/recipes/provider_is_a_string.rb features/data/cookbooks/lwrp/recipes/provider_is_a_symbol.rb features/data/cookbooks/lwrp/resources/default.rb features/data/cookbooks/lwrp/resources/lwr_non_default.rb features/data/cookbooks/lwrp/resources/lwr_overridden_initialize.rb features/data/cookbooks/scm/metadata.rb features/data/cookbooks/scm/recipes/git.rb features/data/typo.bundle features/provider/deploy/deploy.feature features/provider/scm/git.feature features/steps/deploy_steps.rb @@ -169,7 +169,11 @@ namespace :features do t.profile = "recipe_inclusion" end end - + + Cucumber::Rake::Task.new(:lwrp) do |t| + t.profile = "lwrp" + end + namespace :provider do Cucumber::Rake::Task.new(:template) do |t| t.profile = "provider_template" @@ -179,6 +183,10 @@ namespace :features do t.profile = "provider_remote_file" end + Cucumber::Rake::Task.new(:git) do |t| + t.profile = "provider_git" + end + namespace :package do Cucumber::Rake::Task.new(:macports) do |t| t.profile = "provider_package_macports" Rakefile @@ -9,7 +9,7 @@ rescue LoadError end GEM_NAME = "chef-server-slice" -CHEF_SERVER_VERSION="0.7.11" +CHEF_SERVER_VERSION="0.7.12" AUTHOR = "Opscode" EMAIL = "chef@opscode.com" HOMEPAGE = "http://wiki.opscode.com/display/chef" chef-server-slice/Rakefile @@ -156,8 +156,12 @@ class ChefServerSlice::Application < Merb::Controller files_list = cookbook.definition_files when :libraries files_list = cookbook.lib_files + when :providers + files_list = cookbook.provider_files + when :resources + files_list = cookbook.resource_files else - raise ArgumentError, "segment must be one of :attributes, :recipes, :definitions or :libraries" + raise ArgumentError, "segment must be one of :attributes, :recipes, :definitions, :libraries, :providers, or :resources" end files_list end chef-server-slice/app/controllers/application.rb @@ -1,6 +1,7 @@ # # Author:: Adam Jacob (<adam@opscode.com>) # Author:: Christopher Brown (<cb@opscode.com>) +# Author:: Christopher Walters (<cw@opscode.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -22,7 +23,7 @@ require 'chef' / 'cookbook_loader' class ChefServerSlice::Cookbooks < ChefServerSlice::Application provides :html, :json - before :login_required + before :login_required def index @cl = Chef::CookbookLoader.new @@ -36,28 +37,8 @@ class ChefServerSlice::Cookbooks < ChefServerSlice::Application display @cookbook end - def recipe_files - node = params.has_key?('node') ? params[:node] : nil - @recipe_files = load_all_files(:recipes, node) - display @recipe_files - end - - def attribute_files - node = params.has_key?('node') ? params[:node] : nil - @attribute_files = load_all_files(:attributes, node) - display @attribute_files - end - - def definition_files - node = params.has_key?('node') ? params[:node] : nil - @definition_files = load_all_files(:definitions, node) - display @definition_files - end - - def library_files - node = params.has_key?('node') ? params[:node] : nil - @lib_files = load_all_files(:libraries, node) - display @lib_files + def files + display load_all_files(params[:type], params[:node]) end end chef-server-slice/app/controllers/cookbooks.rb @@ -31,10 +31,25 @@ .code %h4.head= link_to File.basename(f), "#" %pre.ruby= syntax_highlight(f) + - unless @cookbook.resource_files.empty? + %h2.head= link_to "Resource Files", "#" + .files + - @cookbook.resource_files.each do |f| + .code + %h4.head= link_to File.basename(f), "#" + %pre.ruby= syntax_highlight(f) + - unless @cookbook.provider_files.empty? + %h2.head= link_to "Provider Files", "#" + .files + - @cookbook.provider_files.each do |f| + .code + %h4.head= link_to File.basename(f), "#" + %pre.ruby= syntax_highlight(f) - unless @cookbook.template_files.empty? %h2.head= link_to "Template Files", "#" .files - @cookbook.template_files.each do |f| + - rel = f.split('templates/',2)[1] .code - %h4.head= link_to File.basename(f), "#" + %h4.head= link_to rel, "#" %pre.ruby= syntax_highlight(f) chef-server-slice/app/views/cookbooks/show.html.haml @@ -94,16 +94,20 @@ if defined?(Merb::Plugins) scope.match("/search/:search_id/entries/:id", :method => 'post').to(:controller => "search_entries", :action => "update") scope.match("/search/:search_id/entries/:id", :method => 'delete').to(:controller => "search_entries", :action => "destroy") - scope.match("/cookbooks/_attribute_files").to(:controller => "cookbooks", :action => "attribute_files") - scope.match("/cookbooks/_recipe_files").to(:controller => "cookbooks", :action => "recipe_files") - scope.match("/cookbooks/_definition_files").to(:controller => "cookbooks", :action => "definition_files") - scope.match("/cookbooks/_library_files").to(:controller => "cookbooks", :action => "library_files") + scope.match("/cookbooks/_attribute_files").to(:controller => "cookbooks", :action => "files", :type => :attributes) + scope.match("/cookbooks/_recipe_files").to(:controller => "cookbooks", :action => "files", :type => :recipes) + scope.match("/cookbooks/_definition_files").to(:controller => "cookbooks", :action => "files", :type => :definitions) + scope.match("/cookbooks/_library_files").to(:controller => "cookbooks", :action => "files", :type => :libraries) + scope.match("/cookbooks/_provider_files").to(:controller => "cookbooks", :action => "files", :type => :providers) + scope.match("/cookbooks/_resource_files").to(:controller => "cookbooks", :action => "files", :type => :resources) scope.match("/cookbooks/:cookbook_id/templates", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_templates", :action => "index") - scope.match("/cookbooks/:cookbook_id/libraries", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_libraries", :action => "index") - scope.match("/cookbooks/:cookbook_id/definitions", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_definitions", :action => "index") - scope.match("/cookbooks/:cookbook_id/recipes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_recipes", :action => "index") - scope.match("/cookbooks/:cookbook_id/attributes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_attributes", :action => "index") + scope.match("/cookbooks/:cookbook_id/libraries", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :libraries) + scope.match("/cookbooks/:cookbook_id/definitions", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :definitions) + scope.match("/cookbooks/:cookbook_id/providers", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :providers) + scope.match("/cookbooks/:cookbook_id/resources", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :resources) + scope.match("/cookbooks/:cookbook_id/recipes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :recipes) + scope.match("/cookbooks/:cookbook_id/attributes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :attributes) scope.match("/cookbooks/:cookbook_id/files", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_files", :action => "index") scope.resources :cookbooks chef-server-slice/lib/chef-server-slice.rb chef-server-slice/public/facebox/closelabel.gif chef-server-slice/public/facebox/loading.gif chef-server-slice/public/images/treeBuilderImages/Thumbs.db chef-server-slice/public/images/treeBuilderImages/doc.gif chef-server-slice/public/images/treeBuilderImages/docNode.gif chef-server-slice/public/images/treeBuilderImages/docNodeLast.gif chef-server-slice/public/images/treeBuilderImages/docNodeLastFirst.gif chef-server-slice/public/images/treeBuilderImages/folder.gif chef-server-slice/public/images/treeBuilderImages/folderNode.gif chef-server-slice/public/images/treeBuilderImages/folderNodeFirst.gif chef-server-slice/public/images/treeBuilderImages/folderNodeLast.gif chef-server-slice/public/images/treeBuilderImages/folderNodeLastFirst.gif chef-server-slice/public/images/treeBuilderImages/folderNodeOpen.gif chef-server-slice/public/images/treeBuilderImages/folderNodeOpenFirst.gif chef-server-slice/public/images/treeBuilderImages/folderNodeOpenLast.gif chef-server-slice/public/images/treeBuilderImages/folderNodeOpenLastFirst.gif chef-server-slice/public/images/treeBuilderImages/folderOpen.gif chef-server-slice/public/images/treeBuilderImages/vertLine.gif chef-server-slice/public/javascripts/JSONeditor.js chef-server-slice/public/javascripts/jquery-1.3.2.min.js chef-server-slice/public/javascripts/jquery-ui-1.7.1.custom.min.js chef-server-slice/public/stylesheets/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png chef-server-slice/public/stylesheets/images/ui-bg_diagonals-thick_15_444444_40x40.png chef-server-slice/public/stylesheets/images/ui-bg_glass_100_f0f0f0_1x400.png chef-server-slice/public/stylesheets/images/ui-bg_glass_50_99c2ff_1x400.png chef-server-slice/public/stylesheets/images/ui-bg_glass_55_fbf5d0_1x400.png chef-server-slice/public/stylesheets/images/ui-bg_glass_80_e6e6e6_1x400.png chef-server-slice/public/stylesheets/images/ui-bg_glass_95_fef1ec_1x400.png chef-server-slice/public/stylesheets/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png chef-server-slice/public/stylesheets/images/ui-bg_highlight-soft_100_e7eef3_1x100.png chef-server-slice/public/stylesheets/images/ui-icons_222222_256x240.png chef-server-slice/public/stylesheets/images/ui-icons_2694e8_256x240.png chef-server-slice/public/stylesheets/images/ui-icons_2e83ff_256x240.png chef-server-slice/public/stylesheets/images/ui-icons_72a7cf_256x240.png chef-server-slice/public/stylesheets/images/ui-icons_888888_256x240.png chef-server-slice/public/stylesheets/images/ui-icons_cd0a0a_256x240.png chef-server-slice/public/stylesheets/images/ui-icons_ffffff_256x240.png chef-server-slice/public/stylesheets/jquery-ui-1.7.1.custom.css @@ -18,7 +18,7 @@ require 'chef' unless defined?(Chef) include FileUtils GEM = "chef-server" -CHEF_SERVER_VERSION = "0.7.11" +CHEF_SERVER_VERSION = "0.7.12" AUTHOR = "Opscode" EMAIL = "chef@opscode.com" HOMEPAGE = "http://wiki.opscode.com/display/chef" chef-server/Rakefile @@ -4,7 +4,7 @@ require 'rake/rdoctask' require './tasks/rspec.rb' GEM = "chef" -CHEF_VERSION = "0.7.11" +CHEF_VERSION = "0.7.12" AUTHOR = "Adam Jacob" EMAIL = "adam@opscode.com" HOMEPAGE = "http://wiki.opscode.com/display/chef" @@ -23,14 +23,15 @@ spec = Gem::Specification.new do |s| s.homepage = HOMEPAGE s.add_dependency "mixlib-config", ">= 1.0.12" + s.add_dependency "ohai", ">= 0.3.4" %w{mixlib-cli mixlib-log ruby-openid json erubis extlib - stomp ohai}.each { |gem| s.add_dependency gem } + stomp}.each { |gem| s.add_dependency gem } s.bindir = "bin" s.executables = %w( chef-client chef-solo ) s.require_path = 'lib' - s.files = %w(LICENSE README.rdoc) + Dir.glob("lib/**/*") + s.files = %w(LICENSE README.rdoc) + Dir.glob("{distro,lib}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| chef/Rakefile @@ -27,7 +27,7 @@ require 'chef/config' Dir[File.join(File.dirname(__FILE__), 'chef/mixin/**/*.rb')].sort.each { |lib| require lib } class Chef - VERSION = '0.7.11' + VERSION = '0.7.12' end # Adds a Dir.glob to Ruby 1.8.5, for compat chef/lib/chef.rb @@ -1,5 +1,6 @@ # # Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Christopher Walters (<cw@opscode.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -56,6 +57,10 @@ class Chef # * build_node - Get the last known state, merge with local changes # * register - Make sure we have an openid # * authenticate - Authenticate with our openid + # * sync_library_files - Populate the local cache with all the library files + # * sync_provider_files - Populate the local cache with all the provider files + # * sync_resource_files - Populate the local cache with all the resource files + # * sync_attribute_files - Populate the local cache with all the attribute files # * sync_definitions - Populate the local cache with all the definitions # * sync_recipes - Populate the local cache with all the recipes # * do_attribute_files - Populate the local cache with all attributes, and execute them @@ -75,6 +80,8 @@ class Chef build_node(@node_name) save_node sync_library_files + sync_provider_files + sync_resource_files sync_attribute_files sync_definitions sync_recipes @@ -97,7 +104,7 @@ class Chef def run_solo start_time = Time.now Chef::Log.info("Starting Chef Solo Run") - + determine_node_name build_node(@node_name, true) converge(true) @@ -117,7 +124,7 @@ class Chef def determine_node_name run_ohai - unless @safe_name && @node_name + unless safe_name && node_name @node_name ||= @ohai[:fqdn] ? @ohai[:fqdn] : @ohai[:hostname] @safe_name = @node_name.gsub(/\./, '_') end @@ -324,7 +331,29 @@ class Chef update_file_cache("libraries", @rest.get_rest("cookbooks/_library_files?node=#{@node.name}")) true end + + # Gets all the provider files included in all the cookbooks available on the server, + # and loads them. + # + # === Returns + # true:: Always returns true + def sync_provider_files + Chef::Log.debug("Synchronizing providers") + update_file_cache("providers", @rest.get_rest("cookbooks/_provider_files?node=#{@node.name}")) + true + end + # Gets all the resource files included in all the cookbooks available on the server, + # and loads them. + # + # === Returns + # true:: Always returns true + def sync_resource_files + Chef::Log.debug("Synchronizing resources") + update_file_cache("resources", @rest.get_rest("cookbooks/_resource_files?node=#{@node.name}")) + true + end + # Gets all the definition files included in all the cookbooks available on the server, # and loads them. # @@ -372,13 +401,9 @@ class Chef Chef::Config[:cookbook_path] = File.join(Chef::Config[:file_cache_path], "cookbooks") end compile = Chef::Compile.new(@node) - compile.load_libraries - compile.load_attributes - compile.load_definitions - compile.load_recipes - + Chef::Log.debug("Converging node #{@safe_name}") - cr = Chef::Runner.new(@node, compile.collection) + cr = Chef::Runner.new(@node, compile.collection, compile.definitions, compile.cookbook_loader) cr.converge true end chef/lib/chef/client.rb @@ -1,5 +1,6 @@ # # Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Christopher Walters (<cw@opscode.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -27,8 +28,8 @@ class Chef attr_accessor :node, :cookbook_loader, :collection, :definitions - # Creates a new Chef::Compile object. This object gets used by the Chef Server to generate - # a fully compiled recipe list for a node. + # Creates a new Chef::Compile object and populates its fields. This object gets + # used by the Chef Server to generate a fully compiled recipe list for a node. # # === Returns # object<Chef::Compile>:: Duh. :) @@ -40,6 +41,13 @@ class Chef @recipes = Array.new @default_attributes = Array.new @override_attributes = Array.new + + load_libraries + load_providers + load_resources + load_attributes + load_definitions + load_recipes end # Looks up the node via the "name" argument, first from CouchDB, then by calling @@ -97,6 +105,30 @@ class Chef end true end + + # Load all the providers, from every cookbook, so they are available when we process + # the recipes. + # + # === Returns + # true:: Always returns true + def load_providers() + @cookbook_loader.each do |cookbook| + cookbook.load_providers + end + true + end + + # Load all the resources, from every cookbook, so they are available when we process + # the recipes. + # + # === Returns + # true:: Always returns true + def load_resources() + @cookbook_loader.each do |cookbook| + cookbook.load_resources + end + true + end # Load all the recipes specified in the node data (loaded via load_node, above.) # chef/lib/chef/compile.rb @@ -1,5 +1,6 @@ # # Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Christopher Walters (<cw@opscode.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -19,12 +20,14 @@ require 'chef/log' require 'chef/node' require 'chef/resource_definition' require 'chef/recipe' +require 'chef/mixin/convert_to_class_name' class Chef class Cookbook + include Chef::Mixin::ConvertToClassName attr_accessor :attribute_files, :definition_files, :template_files, :remote_files, - :lib_files, :name + :lib_files, :resource_files, :provider_files, :name attr_reader :recipe_files # Creates a new Chef::Cookbook object. @@ -40,6 +43,8 @@ class Chef @recipe_files = Array.new @recipe_names = Hash.new @lib_files = Array.new + @resource_files = Array.new + @provider_files = Array.new end # Loads all the library files in this cookbook via require. @@ -89,6 +94,28 @@ class Chef end results end + + # Loads all the resources in this cookbook. + # + # === Returns + # true:: Always returns true + def load_resources + @resource_files.each do |file| + Chef::Log.debug("Loading cookbook #{name}'s resources from #{file}") + Chef::Resource.build_from_file(name, file) + end + end + + # Loads all the providers in this cookbook. + # + # === Returns + # true:: Always returns true + def load_providers + @provider_files.each do |file| + Chef::Log.debug("Loading cookbook #{name}'s providers from #{file}") + Chef::Provider.build_from_file(name, file) + end + end def recipe_files=(*args) @recipe_files = args.flatten @@ -141,4 +168,4 @@ class Chef end end -end \ No newline at end of file +end chef/lib/chef/cookbook.rb @@ -1,6 +1,9 @@ # # Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Christopher Walters (<cw@opscode.com>) +# Author:: Daniel DeLeo (<dan@kallistec.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2009 Daniel DeLeo # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,74 +32,86 @@ class Chef def initialize() @cookbook = Hash.new @metadata = Hash.new + @ignore_regexes = Hash.new { |hsh, key| hsh[key] = Array.new } load_cookbooks end def load_cookbooks cookbook_settings = Hash.new - Chef::Config.cookbook_path.each do |cb_path| + [Chef::Config.cookbook_path].flatten.reverse.each do |cb_path| Dir[File.join(cb_path, "*")].each do |cookbook| next unless File.directory?(cookbook) cookbook_name = File.basename(cookbook).to_sym unless cookbook_settings.has_key?(cookbook_name) cookbook_settings[cookbook_name] = { - :ignore_regexes => Array.new, - :attribute_files => Array.new, - :definition_files => Array.new, - :recipe_files => Array.new, - :template_files => Array.new, - :remote_files => Array.new, - :lib_files => Array.new, - :metadata_files => Array.new + :attribute_files => Hash.new, + :definition_files => Hash.new, + :recipe_files => Hash.new, + :template_files => Hash.new, + :remote_files => Hash.new, + :lib_files => Hash.new, + :resource_files => Hash.new, + :provider_files => Hash.new, + :metadata_files => Array.new } end ignore_regexes = load_ignore_file(File.join(cookbook, "ignore")) - cookbook_settings[cookbook_name][:ignore_regexes].concat(ignore_regexes) + @ignore_regexes[cookbook_name].concat(ignore_regexes) + load_files_unless_basename( File.join(cookbook, "attributes", "*.rb"), - cookbook_settings[cookbook_name][:attribute_files], - cookbook_settings[cookbook_name][:ignore_regexes] + cookbook_settings[cookbook_name][:attribute_files] ) load_files_unless_basename( File.join(cookbook, "definitions", "*.rb"), - cookbook_settings[cookbook_name][:definition_files], - cookbook_settings[cookbook_name][:ignore_regexes] + cookbook_settings[cookbook_name][:definition_files] ) load_files_unless_basename( File.join(cookbook, "recipes", "*.rb"), - cookbook_settings[cookbook_name][:recipe_files], - cookbook_settings[cookbook_name][:ignore_regexes] + cookbook_settings[cookbook_name][:recipe_files] ) load_files_unless_basename( File.join(cookbook, "libraries", "*.rb"), - cookbook_settings[cookbook_name][:lib_files], - cookbook_settings[cookbook_name][:ignore_regexes] + cookbook_settings[cookbook_name][:lib_files] ) load_cascading_files( "*.erb", File.join(cookbook, "templates"), - cookbook_settings[cookbook_name][:template_files], - cookbook_settings[cookbook_name][:ignore_regexes] + cookbook_settings[cookbook_name][:template_files] ) load_cascading_files( "*", File.join(cookbook, "files"), - cookbook_settings[cookbook_name][:remote_files], - cookbook_settings[cookbook_name][:ignore_regexes] + cookbook_settings[cookbook_name][:remote_files] ) + load_cascading_files( + "*.rb", + File.join(cookbook, "resources"), + cookbook_settings[cookbook_name][:resource_files] + ) + load_cascading_files( + "*.rb", + File.join(cookbook, "providers"), + cookbook_settings[cookbook_name][:provider_files] + ) + if File.exists?(File.join(cookbook, "metadata.json")) cookbook_settings[cookbook_name][:metadata_files] << File.join(cookbook, "metadata.json") end end end + remove_ignored_files_from(cookbook_settings) + cookbook_settings.each_key do |cookbook| @cookbook[cookbook] = Chef::Cookbook.new(cookbook) - @cookbook[cookbook].attribute_files = cookbook_settings[cookbook][:attribute_files] - @cookbook[cookbook].definition_files = cookbook_settings[cookbook][:definition_files] - @cookbook[cookbook].recipe_files = cookbook_settings[cookbook][:recipe_files] - @cookbook[cookbook].template_files = cookbook_settings[cookbook][:template_files] - @cookbook[cookbook].remote_files = cookbook_settings[cookbook][:remote_files] - @cookbook[cookbook].lib_files = cookbook_settings[cookbook][:lib_files] + @cookbook[cookbook].attribute_files = cookbook_settings[cookbook][:attribute_files].values + @cookbook[cookbook].definition_files = cookbook_settings[cookbook][:definition_files].values + @cookbook[cookbook].recipe_files = cookbook_settings[cookbook][:recipe_files].values + @cookbook[cookbook].template_files = cookbook_settings[cookbook][:template_files].values + @cookbook[cookbook].remote_files = cookbook_settings[cookbook][:remote_files].values + @cookbook[cookbook].lib_files = cookbook_settings[cookbook][:lib_files].values + @cookbook[cookbook].resource_files = cookbook_settings[cookbook][:resource_files].values + @cookbook[cookbook].provider_files = cookbook_settings[cookbook][:provider_files].values @metadata[cookbook] = Chef::Cookbook::Metadata.new(@cookbook[cookbook]) cookbook_settings[cookbook][:metadata_files].each do |meta_json| @metadata[cookbook].from_json(IO.read(meta_json)) @@ -133,35 +148,32 @@ class Chef results end - def load_cascading_files(file_glob, base_path, result_array, ignore_regexes) - # To handle dotfiles like .ssh - Dir.glob(File.join(base_path, "**/#{file_glob}"), File::FNM_DOTMATCH).each do |file| - next if skip_file(file, ignore_regexes) - file =~ /^#{base_path}\/(.+)$/ - singlecopy = $1 - unless result_array.detect { |f| f =~ /#{singlecopy}$/ } - result_array << file + def remove_ignored_files_from(cookbook_settings) + file_types_to_inspect = [ :attribute_files, :definition_files, :recipe_files, :template_files, + :remote_files, :lib_files, :resource_files, :provider_files] + + @ignore_regexes.each do |cookbook_name, regexes| + regexes.each do |regex| + settings = cookbook_settings[cookbook_name] + file_types_to_inspect.each do |file_type| + settings[file_type].delete_if { |uniqname, fullpath| fullpath.match(regex) } + end end end end - def load_files_unless_basename(file_glob, result_array, ignore_regexes) - Dir[file_glob].each do |file| - next if skip_file(file, ignore_regexes) - file_basename = File.basename(file) - # If we've seen a file with this basename before, skip it. - unless result_array.detect { |f| File.basename(f) == file_basename } - result_array << file - end + def load_cascading_files(file_glob, base_path, result_hash) + rm_base_path = /^#{base_path}\/(.+)$/ + # To handle dotfiles like .ssh + Dir.glob(File.join(base_path, "**/#{file_glob}"), File::FNM_DOTMATCH).each do |file| + result_hash[rm_base_path.match(file)[1]] = file end end - def skip_file(file, ignore_regexes) - skip = false - ignore_regexes.each do |exp| - skip = true if exp.match(file) + def load_files_unless_basename(file_glob, result_hash) + Dir[file_glob].each do |file| + result_hash[File.basename(file)] = file end - skip end end chef/lib/chef/cookbook_loader.rb @@ -112,13 +112,22 @@ class Chef end end + status, stdout, stderr = output_of_command(args[:command], args) + command_output << "STDOUT: #{stdout}" + command_output << "STDERR: #{stderr}" + handle_command_failures(status, command_output, args) + + status + end + + module_function :run_command + + def output_of_command(command, args) + Chef::Log.debug("Executing #{command}") + stderr_string, stdout_string, status = "", "", nil + exec_processing_block = lambda do |pid, stdin, stdout, stderr| - Chef::Log.debug("---- Begin output of #{args[:command]} ----") - Chef::Log.debug("STDOUT: #{stdout.string.chomp}") - Chef::Log.debug("STDERR: #{stderr.string.chomp}") - command_output << "STDOUT: #{stdout.string.chomp}" - command_output << "STDERR: #{stderr.string.chomp}" - Chef::Log.debug("---- End output of #{args[:command]} ----") + stdout_string, stderr_string = stdout.string.chomp, stderr.string.chomp end args[:cwd] ||= Dir.tmpdir @@ -126,44 +135,65 @@ class Chef raise Chef::Exceptions::Exec, "#{args[:cwd]} does not exist or is not a directory" end - Chef::Log.debug("Executing #{args[:command]}") - - status = nil - Dir.chdir(args[:cwd]) do if args[:timeout] begin Timeout.timeout(args[:timeout]) do - status = popen4(args[:command], args, &exec_processing_block) + status = popen4(command, args, &exec_processing_block) end rescue Timeout::Error => e - Chef::Log.error("#{args[:command]} exceeded timeout #{args[:timeout]}") + Chef::Log.error("#{command} exceeded timeout #{args[:timeout]}") raise(e) end else - status = popen4(args[:command], args, &exec_processing_block) + status = popen4(command, args, &exec_processing_block) end - unless args[:ignore_failure] - args[:returns] ||= 0 - if status.exitstatus != args[:returns] - # if the log level is not debug, through output of command when we fail - output = "" - if Chef::Log.logger.level > 0 - output << "\n---- Begin output of #{args[:command]} ----\n" - output << "#{command_output}" - output << "---- End output of #{args[:command]} ----\n" - end - raise Chef::Exceptions::Exec, "#{args[:command]} returned #{status.exitstatus}, expected #{args[:returns]}#{output}" + Chef::Log.debug("---- Begin output of #{command} ----") + Chef::Log.debug("STDOUT: #{stdout_string}") + Chef::Log.debug("STDERR: #{stderr_string}") + Chef::Log.debug("---- End output of #{command} ----") + Chef::Log.debug("Ran #{command} returned #{status.exitstatus}") + end + + return status, stdout_string, stderr_string + end + + module_function :output_of_command + + def handle_command_failures(status, command_output, args={}) + unless args[:ignore_failure] + args[:returns] ||= 0 + if status.exitstatus != args[:returns] + # if the log level is not debug, through output of command when we fail + output = "" + if Chef::Log.logger.level > 0 + output << "\n---- Begin output of #{args[:command]} ----\n" + output << "#{command_output}" + output << "---- End output of #{args[:command]} ----\n" end + raise Chef::Exceptions::Exec, "#{args[:command]} returned #{status.exitstatus}, expected #{args[:returns]}#{output}" end - Chef::Log.debug("Ran #{args[:command]} returned #{status.exitstatus}") end - status end - module_function :run_command + module_function :handle_command_failures + # Call #run_command but set LC_ALL to the system's current environment so it doesn't get changed to C. + # + # === Parameters + # args<Hash>: A number of required and optional arguments that will be handed out to #run_command + # + # === Returns + # Returns the result of #run_command + def run_command_with_systems_locale(args={}) + args[:environment] ||= {} + args[:environment]["LC_ALL"] = ENV["LC_ALL"] + run_command args + end + + module_function :run_command_with_systems_locale + # This is taken directly from Ara T Howard's Open4 library, and then # modified to suit the needs of Chef. Any bugs here are most likely # my own, and not Ara's. @@ -189,7 +219,14 @@ class Chef unless args[:group].kind_of?(Integer) args[:group] = Etc.getgrnam(args[:group]).gid if args[:group] end - args[:environment] ||= nil + args[:environment] ||= {} + + # Default on C locale so parsing commands output can be done + # independently of the node's default locale. + # "LC_ALL" could be set to nil, in which case we also must ignore it. + unless args[:environment].has_key?("LC_ALL") + args[:environment]["LC_ALL"] = "C" + end pw, pr, pe, ps = IO.pipe, IO.pipe, IO.pipe, IO.pipe @@ -223,10 +260,8 @@ class Chef Process.uid = args[:user] end - if args[:environment] - args[:environment].each do |key,value| - ENV[key] = value - end + args[:environment].each do |key,value| + ENV[key] = value end if args[:umask] chef/lib/chef/mixin/command.rb @@ -72,26 +72,17 @@ class Chef File.join("#{platform}", "#{file_name}"), File.join("default", "#{file_name}") ] - to_send = nil + file_list_str = file_list.keys.join("\n") preferences.each do |pref| Chef::Log.debug("Looking for #{pref}") - file_list.each_key do |file| - Chef::Log.debug("Checking for #{pref} #{file} ") - if file =~ /#{pref}$/ - Chef::Log.debug("Matched #{pref} for #{file}!") - to_send = file - break - end + matcher = /^(.+#{pref})$/ + if match = matcher.match(file_list_str) + return match[1] end - break if to_send end - unless to_send - raise Chef::Exceptions::FileNotFound, "Cannot find a preferred file for #{file_name}!" - end - - to_send + raise Chef::Exceptions::FileNotFound, "Cannot find a preferred file for #{file_name}!" end end chef/lib/chef/mixin/find_preferred_file.rb @@ -1,5 +1,6 @@ # # Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Christopher Walters (<cw@opscode.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -31,6 +32,19 @@ class Chef raise IOError, "Cannot open or read #{filename}!" end end + + # Loads a given ruby file, and runs class_eval against it in the context of the current + # object. + # + # Raises an IOError if the file cannot be found, or is not readable. + def class_from_file(filename) + if File.exists?(filename) && File.readable?(filename) + self.class_eval(IO.read(filename), filename, 1) + else + raise IOError, "Cannot open or read #{filename}!" + end + end + end end end chef/lib/chef/mixin/from_file.rb @@ -23,6 +23,7 @@ class Chef module GenerateURL def generate_cookbook_url(url, cookbook, type, node, args=nil) + Chef::Log.debug("generating cookbook url for url=#{url}, cookbook=#{cookbook.inspect}, type=#{type}, node=#{node}") new_url = nil if url =~ /^(http|https):\/\// new_url = url @@ -39,7 +40,7 @@ class Chef end end end - + Chef::Log.debug("generated cookbook url: #{new_url}") return new_url end chef/lib/chef/mixin/generate_url.rb @@ -93,7 +93,7 @@ class Chef :bash => Chef::Provider::Script, :csh => Chef::Provider::Script, :user => Chef::Provider::User::Useradd, - :group => Chef::Provider::Group::Groupadd, + :group => Chef::Provider::Group::Gpasswd, :http_request => Chef::Provider::HttpRequest, :route => Chef::Provider::Route, :ifconfig => Chef::Provider::Ifconfig, chef/lib/chef/platform.rb @@ -1,6 +1,7 @@ # # Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Christopher Walters (<cw@opscode.com>) +# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,15 +17,25 @@ # limitations under the License. # +require 'chef/mixin/from_file' +require 'chef/mixin/convert_to_class_name' +require 'chef/mixin/recipe_definition_dsl_core' + class Chef class Provider + include Chef::Mixin::RecipeDefinitionDSLCore + attr_accessor :node, :new_resource, :current_resource - def initialize(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions={}, cookbook_loader=nil) @node = node @new_resource = new_resource @current_resource = nil + @collection = collection + @definitions = definitions + @cookbook_loader = cookbook_loader + @cookbook_name = @new_resource.cookbook_name end def load_current_resource @@ -36,5 +47,55 @@ class Chef true end + protected + + def recipe_eval(*args, &block) + provider_collection, @collection = @collection, Chef::ResourceCollection.new + + instance_eval(*args, &block) + Chef::Runner.new(@node, @collection).converge + + @collection = provider_collection + end + + public + + class << self + include Chef::Mixin::ConvertToClassName + + def build_from_file(cookbook_name, filename) + pname = filename_to_qualified_string(cookbook_name, filename) + + new_provider_class = Class.new self do |cls| + + def load_current_resource + # silence Chef::Exceptions::Override exception + end + + class << cls + include Chef::Mixin::FromFile + + # setup DSL's shortcut methods + def action(name, &block) + define_method("action_#{name.to_s}") do + instance_eval(&block) + end + end + end + + # load provider definition from file + cls.class_from_file(filename) + end + + # register new class as a Chef::Provider + pname = filename_to_qualified_string(cookbook_name, filename) + class_name = convert_to_class_name(pname) + Chef::Provider.const_set(class_name, new_provider_class) + Chef::Log.debug("Loaded contents of #{filename} into a provider named #{pname} defined in Chef::Provider::#{class_name}") + + new_provider_class + end + end + end end chef/lib/chef/provider.rb @@ -25,8 +25,8 @@ class Chef class Cron < Chef::Provider include Chef::Mixin::Command - def initialize(node, new_resource) - super(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) + super(node, new_resource, collection, definitions, cookbook_loader) @cron_exists = false @cron_empty = false end @@ -35,17 +35,46 @@ class Chef def load_current_resource crontab = String.new @current_resource = Chef::Resource::Cron.new(@new_resource.name) + @current_resource.user(@new_resource.user) status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr| stdout.each { |line| crontab << line } end if status.exitstatus > 1 raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}" elsif status.exitstatus == 0 + cron_found = false crontab.each do |line| case line when /^# Chef Name: #{@new_resource.name}/ Chef::Log.debug("Found cron '#{@new_resource.name}'") + cron_found = true @cron_exists = true + next + when /^MAILTO=(\S*)/ + @current_resource.mailto($1) if cron_found + next + when /^PATH=(\S*)/ + @current_resource.path($1) if cron_found + next + when /^SHELL=(\S*)/ + @current_resource.shell($1) if cron_found + next + when /^HOME=(\S*)/ + @current_resource.home($1) if cron_found + next + when /([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*(.*)/ + if cron_found + @current_resource.minute($1) + @current_resource.hour($2) + @current_resource.day($3) + @current_resource.month($4) + @current_resource.weekday($5) + @current_resource.command($6) + cron_found=false + end + next + else + next end end Chef::Log.debug("Cron '#{@new_resource.name}' not found") unless @cron_exists @@ -57,36 +86,53 @@ class Chef @current_resource end + def compare_cron + [ :minute, :hour, :day, :month, :weekday, :command, :mailto, :path, :shell, :home ].any? do |cron_var| + !@new_resource.send(cron_var).nil? && @new_resource.send(cron_var) != @current_resource.send(cron_var) + end + end + def action_create crontab = String.new + newcron = String.new cron_found = false + + newcron << "# Chef Name: #{new_resource.name}\n" + [ :mailto, :path, :shell, :home ].each do |v| + newcron << "#{v.to_s.upcase}=#{@new_resource.send(v)}\n" if @new_resource.send(v) + end + newcron << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n" + if @cron_exists + unless compare_cron + Chef::Log.debug("Skipping existing cron entry '#{@new_resource.name}'") + return + end status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr| stdout.each_line do |line| - if cron_found - cronline = "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n" - if (line == cronline) - Chef::Log.debug("Skipping existing cron entry '#{@new_resource.name}'") - return - end - crontab << cronline - cron_found = false - next - end case line - when /^# Chef Name: #{new_resource.name}\n/ + when /^# Chef Name: #{@new_resource.name}\n/ cron_found = true + next + when /([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*(.*)/ + if cron_found + cron_found = false + crontab << newcron + next + end + else + next if cron_found end crontab << line end end - status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr| crontab.each { |line| stdin.puts "#{line}" } stdin.close end Chef::Log.info("Updated cron '#{@new_resource.name}'") + @new_resource.updated = true else unless @cron_empty status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr| @@ -94,14 +140,14 @@ class Chef end end - crontab << "# Chef Name: #{new_resource.name}\n" - crontab << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n" - + crontab << newcron + status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr| crontab.each { |line| stdin.puts "#{line}" } stdin.close end Chef::Log.info("Added cron '#{@new_resource.name}'") + @new_resource.updated = true end end @@ -111,14 +157,17 @@ class Chef cron_found = false status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr| stdout.each_line do |line| - if cron_found - cron_found = false - next - end case line - when /^# Chef Name: #{new_resource.name}\n/ + when /^# Chef Name: #{@new_resource.name}\n/ cron_found = true next + when /([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*([0-9\*]+)\s*(.*)/ + if cron_found + cron_found = false + next + end + else + next if cron_found end crontab << line end @@ -129,6 +178,7 @@ class Chef stdin.close end Chef::Log.debug("Deleted cron '#{@new_resource.name}'") + @new_resource.updated = true end end chef/lib/chef/provider/cron.rb @@ -27,8 +27,8 @@ class Chef include Chef::Mixin::Command attr_accessor :group_exists - def initialize(node, new_resource) - super(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) + super(node, new_resource, collection, definitions, cookbook_loader) @group_exists = true end chef/lib/chef/provider/group.rb @@ -26,8 +26,7 @@ class Chef [ "/usr/sbin/groupadd", "/usr/sbin/groupmod", - "/usr/sbin/groupdel", - "/usr/bin/gpasswd" ].each do |required_binary| + "/usr/sbin/groupdel" ].each do |required_binary| raise Chef::Exceptions::Group, "Could not find binary #{required_binary} for #{@new_resource}" unless ::File.exists?(required_binary) end end @@ -54,21 +53,8 @@ class Chef end def modify_group_members - unless @new_resource.members.empty? - if(@new_resource.append) - @new_resource.members.each do |member| - Chef::Log.debug("#{@new_resource}: appending member #{member} to group #{@new_resource.group_name}") - run_command(:command => "gpasswd -a #{member} #{@new_resource.group_name}") - end - else - Chef::Log.debug("#{@new_resource}: setting group members to #{@new_resource.members.join(', ')}") - run_command(:command => "gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}") - end - else - Chef::Log.debug("#{@new_resource}: not changing group members, the group has no members") - end + raise Chef::Exceptions::Group, "you must override modify_group_members in #{self.to_s}" end - # Little bit of magic as per Adam's useradd provider to pull the assign the command line flags # # ==== Returns chef/lib/chef/provider/group/groupadd.rb @@ -106,7 +106,7 @@ class Chef def generate_config b = binding case node[:platform] - when ("centos" || "redhat" || "fedora") + when "centos","redhat","fedora" content = %{ <% if @new_resource.device %>DEVICE=<%= @new_resource.device %><% end %> <% if @new_resource.onboot %>ONBOOT=<%= @new_resource.onboot %><% end %> @@ -120,9 +120,9 @@ class Chef network_file = ::File.new("/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}", "w") network_file.puts(template.result(b)) network_file.close - when ("debian" || "ubantu") + when "debian","ubuntu" # template - when ("slackware") + when "slackware" # template end end chef/lib/chef/provider/ifconfig.rb @@ -26,10 +26,6 @@ class Chef include Chef::Mixin::Command - def initialize(node, new_resource) - super(node, new_resource) - end - def action_mount unless @current_resource.mounted Chef::Log.debug("#{@new_resource}: attempting to mount") chef/lib/chef/provider/mount.rb @@ -27,8 +27,8 @@ class Chef include Chef::Mixin::Command - def initialize(node, new_resource) - super(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) + super(node, new_resource, collection, definitions, cookbook_loader) @real_device = nil end attr_accessor :real_device chef/lib/chef/provider/mount/mount.rb @@ -30,8 +30,8 @@ class Chef attr_accessor :candidate_version - def initialize(node, new_resource) - super(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) + super(node, new_resource, collection, definitions, cookbook_loader) @candidate_version = nil end chef/lib/chef/provider/package.rb @@ -61,7 +61,7 @@ class Chef end def install_package(name, version) - run_command( + run_command_with_systems_locale( :command => "apt-get -q -y#{expand_options(@new_resource.options)} install #{name}=#{version}", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -74,7 +74,7 @@ class Chef end def remove_package(name, version) - run_command( + run_command_with_systems_locale( :command => "apt-get -q -y#{expand_options(@new_resource.options)} remove #{@new_resource.package_name}", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -83,7 +83,7 @@ class Chef end def purge_package(name, version) - run_command( + run_command_with_systems_locale( :command => "apt-get -q -y#{expand_options(@new_resource.options)} purge #{@new_resource.package_name}", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -95,7 +95,7 @@ class Chef preseed_file = get_preseed_file(name, version) if preseed_file Chef::Log.info("Pre-seeding #{@new_resource} with package installation instructions.") - run_command( + run_command_with_systems_locale( :command => "debconf-set-selections #{preseed_file}", :environment => { "DEBIAN_FRONTEND" => "noninteractive" chef/lib/chef/provider/package/apt.rb @@ -40,10 +40,9 @@ class Chef Chef::Log.debug("Checking dpkg status for #{@new_resource.package_name}") status = popen4("dpkg-deb -W #{@new_resource.source}") do |pid, stdin, stdout, stderr| stdout.each do |line| - case line - when /([\w\d]+)\t([\w\d.-]+)/ - @current_resource.package_name($1) - @new_resource.version($2) + if pkginfo = /([a-z\d\-\+]+)\t([\w\d.-]+)/.match(line) + @current_resource.package_name(pkginfo[1]) + @new_resource.version(pkginfo[2]) end end end @@ -79,31 +78,28 @@ class Chef end def install_package(name, version) - run_command( + run_command_with_systems_locale( :command => "dpkg -i#{expand_options(@new_resource.options)} #{@new_resource.source}", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } ) end def remove_package(name, version) - run_command( + run_command_with_systems_locale( :command => "dpkg -r#{expand_options(@new_resource.options)} #{@new_resource.package_name}", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } ) end def purge_package(name, version) - run_command( + run_command_with_systems_locale( :command => "dpkg -P#{expand_options(@new_resource.options)} #{@new_resource.package_name}", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } ) end chef/lib/chef/provider/package/dpkg.rb @@ -110,24 +110,24 @@ class Chef unless @current_resource.version case @new_resource.source when /^ports$/ - run_command( + run_command_with_systems_locale( :command => "make -DBATCH install", :cwd => "#{port_path}" ) when /^http/, /^ftp/ - run_command( + run_command_with_systems_locale( :command => "pkg_add -r #{package_name}", :environment => { "PACKAGESITE" => @new_resource.source } ) Chef::Log.info("Installed package #{package_name} from: #{@new_resource.source}") when /^\// - run_command( + run_command_with_systems_locale( :command => "pkg_add #{@new_resource.name}", :environment => { "PKG_PATH" => @new_resource.source } ) Chef::Log.info("Installed package #{@new_resource.name} from: #{@new_resource.source}") else - run_command( + run_command_with_systems_locale( :command => "pkg_add -r #{latest_link_name}" ) Chef::Log.info("Installed package #{package_name}") @@ -138,11 +138,11 @@ class Chef def remove_package(name, version) # a version is mandatory if version - run_command( + run_command_with_systems_locale( :command => "pkg_delete #{package_name}-#{version}" ) else - run_command( + run_command_with_systems_locale( :command => "pkg_delete #{package_name}-#{@current_resource.version}" ) end chef/lib/chef/provider/package/freebsd.rb @@ -45,7 +45,7 @@ class Chef unless @current_resource.version == version command = "port install #{name}" command << " @#{version}" if version and !version.empty? - run_command( + run_command_with_systems_locale( :command => command ) end @@ -54,7 +54,7 @@ class Chef def purge_package(name, version) command = "port uninstall #{name}" command << " @#{version}" if version and !version.empty? - run_command( + run_command_with_systems_locale( :command => command ) end @@ -63,7 +63,7 @@ class Chef command = "port deactivate #{name}" command << " @#{version}" if version and !version.empty? - run_command( + run_command_with_systems_locale( :command => command ) end @@ -78,7 +78,7 @@ class Chef # that hasn't been installed. install_package(name, version) elsif current_version != version - run_command( + run_command_with_systems_locale( :command => "port upgrade #{name} @#{version}" ) end chef/lib/chef/provider/package/macports.rb @@ -93,7 +93,7 @@ class Chef pkg = "~#{name}-#{$1}" end - run_command( + run_command_with_systems_locale( :command => "emerge -g --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}" ) end @@ -109,7 +109,7 @@ class Chef pkg = "#{@new_resource.package_name}" end - run_command( + run_command_with_systems_locale( :command => "emerge --unmerge --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}" ) end chef/lib/chef/provider/package/portage.rb @@ -69,24 +69,24 @@ class Chef end def install_package(name, version) - run_command( + run_command_with_systems_locale( :command => "rpm -i #{@new_resource.source}" ) end def upgrade_package(name, version) - run_command( + run_command_with_systems_locale( :command => "rpm -U #{@new_resource.source}" ) end def remove_package(name, version) if version - run_command( + run_command_with_systems_locale( :command => "rpm -e #{name}-#{version}" ) else - run_command( + run_command_with_systems_locale( :command => "rpm -e #{name}" ) end chef/lib/chef/provider/package/rpm.rb @@ -99,7 +99,7 @@ class Chef if @new_resource.source src = " --source=#{@new_resource.source} --source=http://gems.rubyforge.org" end - run_command( + run_command_with_systems_locale( :command => "#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}" ) end @@ -110,11 +110,11 @@ class Chef def remove_package(name, version) if version - run_command( + run_command_with_systems_locale( :command => "#{gem_binary_path} uninstall #{name} -q -v \"#{version}\"" ) else - run_command( + run_command_with_systems_locale( :command => "#{gem_binary_path} uninstall #{name} -q -a" ) end chef/lib/chef/provider/package/rubygems.rb @@ -106,9 +106,9 @@ class Chef end end - def initialize(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) @yum = YumCache.instance - super(node, new_resource) + super(node, new_resource, collection, definitions, cookbook_loader) end def load_current_resource @@ -133,7 +133,7 @@ class Chef end def install_package(name, version) - run_command( + run_command_with_systems_locale( :command => "yum -q -y install #{name}-#{version}" ) @yum.flush @@ -142,7 +142,7 @@ class Chef def upgrade_package(name, version) # If we have a version, we can upgrade - otherwise, install if @current_resource.version - run_command( + run_command_with_systems_locale( :command => "yum -q -y update #{name}-#{version}" ) @yum.flush @@ -153,11 +153,11 @@ class Chef def remove_package(name, version) if version - run_command( + run_command_with_systems_locale( :command => "yum -q -y remove #{name}-#{version}" ) else - run_command( + run_command_with_systems_locale( :command => "yum -q -y remove #{name}" ) end chef/lib/chef/provider/package/yum.rb @@ -55,23 +55,30 @@ class Chef get_from_local_cookbook(source) # If the file exists + Chef::Log.debug "#{@new_resource}: Checking for file existence of #{@new_resource.path}" if ::File.exists?(@new_resource.path) # And it matches the checksum of the raw file @new_resource.checksum(self.checksum(raw_file.path)) + Chef::Log.debug "#{@new_resource}: File exists at #{@new_resource.path}" + Chef::Log.debug "#{@new_resource}: Target checksum: #{@current_resource.checksum}" + Chef::Log.debug "#{@new_resource}: Source checksum: #{@new_resource.checksum}" if @new_resource.checksum != @current_resource.checksum # Updating target file, let's perform a backup! - Chef::Log.debug("#{@new_resource} changed from #{@current_resource.checksum} to #{@new_resource.checksum}") - Chef::Log.info("Updating #{@new_resource} at #{@new_resource.path}") - backup(@new_resource.path) + Chef::Log.debug "#{@new_resource}: checksum changed from #{@current_resource.checksum} to #{@new_resource.checksum}" + Chef::Log.info "#{@new_resource}: Updating #{@new_resource.path}" + backup @new_resource.path + FileUtils.cp raw_file.path, @new_resource.path + @new_resource.updated = true + else + Chef::Log.debug "#{@new_resource}: Target and Source checksums are the same, taking no action" end else # We're creating a new file - Chef::Log.info("Creating #{@new_resource} at #{@new_resource.path}") + Chef::Log.info "#{@new_resource}: Creating #{@new_resource.path}" + FileUtils.cp raw_file.path, @new_resource.path + @new_resource.updated = true end - FileUtils.cp(raw_file.path, @new_resource.path) - @new_resource.updated = true - # We're done with the file, so make sure to close it if it was open. raw_file.close unless raw_file.closed? rescue Net::HTTPRetriableError => e chef/lib/chef/provider/remote_file.rb @@ -25,8 +25,8 @@ class Chef include Chef::Mixin::Command - def initialize(node, new_resource) - super(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) + super(node, new_resource, collection, definitions, cookbook_loader) @enabled = nil end @@ -35,6 +35,7 @@ class Chef Chef::Log.debug("#{@new_resource}: attempting to enable") status = enable_service() if status + @new_resource.updated = true Chef::Log.info("#{@new_resource}: enabled successfully") end else @@ -47,6 +48,7 @@ class Chef Chef::Log.debug("#{@new_resource}: attempting to disable") status = disable_service() if status + @new_resource.updated = true Chef::Log.info("#{@new_resource}: disabled successfully") end else @@ -59,6 +61,7 @@ class Chef Chef::Log.debug("#{@new_resource}: attempting to start") status = start_service() if status + @new_resource.updated = true Chef::Log.info("Started service #{@new_resource} successfully") end else @@ -71,6 +74,7 @@ class Chef Chef::Log.debug("#{@new_resource}: attempting to stop") status = stop_service() if status + @new_resource.updated = true Chef::Log.info("#{@new_resource}: stopped successfully") end else @@ -82,6 +86,7 @@ class Chef Chef::Log.debug("#{@new_resource}: attempting to restart") status = restart_service() if status + @new_resource.updated = true Chef::Log.info("#{@new_resource}: restarted successfully") end end @@ -94,6 +99,7 @@ class Chef Chef::Log.debug("#{@new_resource}: attempting to reload") status = reload_service() if status + @new_resource.updated = true Chef::Log.info("#{@new_resource}: reloaded successfully") end end chef/lib/chef/provider/service.rb @@ -25,8 +25,8 @@ class Chef class Service class Init < Chef::Provider::Service::Simple - def initialize(node, new_resource) - super(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) + super(node, new_resource, collection, definitions, cookbook_loader) @init_command = "/etc/init.d/#{@new_resource.service_name}" end chef/lib/chef/provider/service/init.rb @@ -25,8 +25,8 @@ class Chef class Service class Redhat < Chef::Provider::Service::Init - def initialize(node, new_resource) - super(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) + super(node, new_resource, collection, definitions, cookbook_loader) @init_command = "/sbin/service #{@new_resource.service_name}" end chef/lib/chef/provider/service/redhat.rb @@ -39,6 +39,8 @@ class Chef cookbook_name = @new_resource.cookbook || @new_resource.cookbook_name + Chef::Log.debug("looking for template #{@new_resource.source} in cookbook #{cookbook_name.inspect}") + cache_file_name = "cookbooks/#{cookbook_name}/templates/default/#{@new_resource.source}" template_cache_name = "#{cookbook_name}_#{@new_resource.source}" chef/lib/chef/provider/template.rb @@ -29,8 +29,8 @@ class Chef attr_accessor :user_exists, :locked - def initialize(node, new_resource) - super(node, new_resource) + def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil) + super(node, new_resource, collection, definitions, cookbook_loader) @user_exists = true @locked = nil end chef/lib/chef/provider/user.rb @@ -1,6 +1,7 @@ # # Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Christopher Walters (<cw@opscode.com>) +# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,6 +21,7 @@ require 'chef/resource' Dir[File.join(File.dirname(__FILE__), 'resource/**/*.rb')].sort.each { |lib| require lib } require 'chef/mixin/from_file' require 'chef/mixin/language' +require 'chef/mixin/recipe_definition_dsl_core' require 'chef/resource_collection' require 'chef/cookbook_loader' require 'chef/rest' @@ -30,7 +32,8 @@ class Chef include Chef::Mixin::FromFile include Chef::Mixin::Language - + include Chef::Mixin::RecipeDefinitionDSLCore + attr_accessor :cookbook_name, :recipe_name, :recipe, :node, :collection, :definitions, :params, :cookbook_loader @@ -38,25 +41,9 @@ class Chef @cookbook_name = cookbook_name @recipe_name = recipe_name @node = node - - if collection - @collection = collection - else - @collection = Chef::ResourceCollection.new() - end - - if definitions - @definitions = definitions - else - @definitions = Hash.new - end - - if cookbook_loader - @cookbook_loader = cookbook_loader - else - @cookbook_loader = Chef::CookbookLoader.new() - end - + @collection = collection || Chef::ResourceCollection.new + @definitions = definitions || Hash.new + @cookbook_loader = cookbook_loader || Chef::CookbookLoader.new @params = Hash.new end @@ -152,59 +139,6 @@ class Chef @node[:tags].delete(tag) end end - - def method_missing(method_symbol, *args, &block) - resource = nil - # If we have a definition that matches, we want to use that instead. This should - # let you do some really crazy over-riding of "native" types, if you really want - # to. - if @definitions.has_key?(method_symbol) - # This dupes the high level object, but we still need to dup the params - new_def = @definitions[method_symbol].dup - new_def.params = new_def.params.dup - new_def.node = @node - # This sets up the parameter overrides - new_def.instance_eval(&block) if block - new_recipe = Chef::Recipe.new(@cookbook_name, @recipe_name, @node, @collection, @definitions, @cookbook_loader) - new_recipe.params = new_def.params - new_recipe.params[:name] = args[0] - new_recipe.instance_eval(&new_def.recipe) - else - method_name = method_symbol.to_s - # Otherwise, we're rocking the regular resource call route. - rname = nil - regexp = %r{^(.+?)(_(.+))?$} - - mn = method_name.match(regexp) - if mn - rname = "Chef::Resource::#{mn[1].capitalize}" - - while mn && mn[3] - mn = mn[3].match(regexp) - rname << mn[1].capitalize if mn - end - end - - begin - args << @collection - args << @node - resource = eval(rname).new(*args) - # If we have a resource like this one, we want to steal it's state - resource.load_prior_resource - resource.cookbook_name = @cookbook_name - resource.recipe_name = @recipe_name - resource.params = @params - resource.instance_eval(&block) if block - rescue Exception => e - if e.kind_of?(NameError) && e.to_s =~ /Chef::Resource/ - raise NameError, "Cannot find #{rname} for #{method_name}\nOriginal: #{e.to_s}" - else - raise e - end - end - @collection << resource - resource - end - end + end end chef/lib/chef/recipe.rb @@ -1,5 +1,6 @@ # # Author:: Adam Jacob (<adam@opscode.com>) +# Author:: Christopher Walters (<cw@opscode.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -19,6 +20,7 @@ require 'chef/mixin/params_validate' require 'chef/mixin/check_helper' require 'chef/mixin/language' +require 'chef/mixin/convert_to_class_name' require 'chef/resource_collection' require 'chef/node' @@ -28,8 +30,9 @@ class Chef include Chef::Mixin::CheckHelper include Chef::Mixin::ParamsValidate include Chef::Mixin::Language + include Chef::Mixin::ConvertToClassName - attr_accessor :actions, :params, :provider, :updated, :allowed_actions, :collection, :cookbook_name, :recipe_name + attr_accessor :actions, :params, :provider, :updated, :allowed_actions, :collection, :cookbook_name, :recipe_name, :enclosing_provider attr_reader :resource_name, :source_line, :node def initialize(name, collection=nil, node=nil) @@ -58,6 +61,17 @@ class Chef @source_line = ::File.expand_path(@source_line) if @source_line end end + + # If an unknown method is invoked, determine whether the enclosing Provider's + # lexical scope can fulfill the request. E.g. This happens when the Resource's + # block invokes new_resource. + def method_missing(method_symbol, *args, &block) + if enclosing_provider && enclosing_provider.respond_to?(method_symbol) + enclosing_provider.send(method_symbol, *args, &block) + else + raise NoMethodError, "undefined method `#{method_symbol.to_s}' for #{self.class.to_s}" + end + end def load_prior_resource begin @@ -83,9 +97,14 @@ class Chef end def provider(arg=nil) + klass = if arg.kind_of?(String) || arg.kind_of?(Symbol) + lookup_provider_constant(arg) + else + arg + end set_or_return( :provider, - arg, + klass, :kind_of => [ Class ] ) end @@ -192,12 +211,12 @@ class Chef results.to_json(*a) end - def self.json_create(o) - resource = self.new(o["instance_vars"]["@name"]) - o["instance_vars"].each do |k,v| - resource.instance_variable_set(k.to_sym, v) + def to_hash + instance_vars = Hash.new + self.instance_variables.each do |iv| + instance_vars[iv.sub(/^@/,'').to_sym] = self.instance_variable_get(iv) unless iv == "@collection" end - resource + instance_vars end def only_if(arg=nil, &blk) @@ -224,7 +243,101 @@ class Chef provider.send("action_#{action}") end + class << self + + def json_create(o) + resource = self.new(o["instance_vars"]["@name"]) + o["instance_vars"].each do |k,v| + resource.instance_variable_set(k.to_sym, v) + end + resource + end + + include Chef::Mixin::ConvertToClassName + + def attribute(attr_name, validation_opts={}) + define_method(attr_name.to_sym) do |arg| + set_or_return(attr_name.to_sym, arg, validation_opts) + end + end + + def build_from_file(cookbook_name, filename) + rname = filename_to_qualified_string(cookbook_name, filename) + + new_resource_class = Class.new self do |cls| + + # default initialize method that ensures that when initialize is finally + # wrapped (see below), super is called in the event that the resource + # definer does not implement initialize + def initialize(name, collection=nil, node=nil) + super(name, collection, node) + end + + @actions_to_create = [] + + class << cls + include Chef::Mixin::FromFile + + def actions_to_create + @actions_to_create + end + + define_method(:actions) do |*action_names| + actions_to_create.push(*action_names) + end + end + + # load resource definition from file + cls.class_from_file(filename) + + # create a new constructor that wraps the old one and adds the actions + # specified in the DSL + old_init = instance_method(:initialize) + + define_method(:initialize) do |name, *optional_args| + collection = optional_args.shift + node = optional_args.shift + @resource_name = rname.to_sym + old_init.bind(self).call(name, collection, node) + allowed_actions.push(self.class.actions_to_create).flatten! + end + end + + # register new class as a Chef::Resource + class_name = convert_to_class_name(rname) + Chef::Resource.const_set(class_name, new_resource_class) + Chef::Log.debug("Loaded contents of #{filename} into a resource named #{rname} defined in Chef::Resource::#{class_name}") + + new_resource_class + end + + # Resources that want providers namespaced somewhere other than + # Chef::Provider can set the namespace with +provider_base+ + # Ex: + # class MyResource < Chef::Resource + # provider_base Chef::Provider::Deploy + # # ...other stuff + # end + def provider_base(arg=nil) + @provider_base ||= arg + @provider_base ||= Chef::Provider + end + + end + private + + def lookup_provider_constant(name) + begin + self.class.provider_base.const_get(convert_to_class_name(name.to_s)) + rescue NameError => e + if e.to_s =~ /#{self.class.provider_base.to_s}/ + raise ArgumentError, "No provider found to match '#{name}'" + else + raise e + end + end + end def check_timing(timing) unless timing == :delayed || timing == :immediate || timing == :immediately chef/lib/chef/resource.rb @@ -34,6 +34,10 @@ class Chef @weekday = "*" @command = nil @user = "root" + @mailto = nil + @path = nil + @shell = nil + @home = nil end def minute(arg=nil) @@ -121,6 +125,38 @@ class Chef ) end + def mailto(arg=nil) + set_or_return( + :mailto, + arg, + :kind_of => String + ) + end + + def path(arg=nil) + set_or_return( + :path, + arg, + :kind_of => String + ) + end + + def home(arg=nil) + set_or_return( + :home, + arg, + :kind_of => String + ) + end + + def shell(arg=nil) + set_or_return( + :shell, + arg, + :kind_of => String + ) + end + def command(arg=nil) set_or_return( :command, chef/lib/chef/resource/cron.rb @@ -55,6 +55,8 @@ class Chef :kind_of => [ Array ] ) end + + alias_method :users, :members def append(arg=nil) set_or_return( chef/lib/chef/resource/group.rb @@ -1,6 +1,7 @@ # # Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Christopher Walters (<cw@opscode.com>) +# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,10 +22,11 @@ require 'chef/resource' class Chef class ResourceCollection include Enumerable - + def initialize @resources = Array.new @resources_by_name = Hash.new + @insert_after_idx = nil end def [](index) @@ -36,7 +38,7 @@ class Chef @resources[index] = arg @resources_by_name[arg.to_s] = index end - + def <<(*args) args.flatten.each do |a| is_chef_resource(a) @@ -44,6 +46,25 @@ class Chef @resources_by_name[a.to_s] = @resources.length - 1 end end + + def insert(resource) + is_chef_resource(resource) + if @insert_after_idx + # in the middle of executing a run, so any resources inserted now should + # be placed after the most recent addition done by the currently executing + # resource + @resources.insert(@insert_after_idx + 1, resource) + # update name -> location mappings and register new resource + @resources_by_name.each_key do |key| + @resources_by_name[key] += 1 if @resources_by_name[key] > @insert_after_idx + end + @resources_by_name[resource.to_s] = @insert_after_idx + 1 + @insert_after_idx += 1 + else + @resources << resource + @resources_by_name[resource.to_s] = @resources.length - 1 + end + end def push(*args) args.flatten.each do |a| @@ -58,6 +79,13 @@ class Chef yield r end end + + def execute_each_resource + @resources.each_with_index do |r, idx| + @insert_after_idx = idx + yield r + end + end def each_index @resources.each_index do |i| @@ -173,4 +201,4 @@ class Chef true end end -end \ No newline at end of file +end chef/lib/chef/resource_collection.rb @@ -26,7 +26,7 @@ class Chef include Chef::Mixin::ParamsValidate - def initialize(node, collection) + def initialize(node, collection, definitions={}, cookbook_loader=nil) validate( { :node => node, @@ -43,22 +43,49 @@ class Chef ) @node = node @collection = collection + @definitions = definitions + @cookbook_loader = cookbook_loader end def build_provider(resource) provider_klass = resource.provider provider_klass ||= Chef::Platform.find_provider_for_node(@node, resource) Chef::Log.debug("#{resource} using #{provider_klass.to_s}") - provider = provider_klass.new(@node, resource) + provider = provider_klass.new(@node, resource, @collection, @definitions, @cookbook_loader) provider.load_current_resource provider end - + + def run_action(resource, ra) + provider = build_provider(resource) + provider.send("action_#{ra}") + + if resource.updated + resource.actions.each_key do |action| + if resource.actions[action].has_key?(:immediate) + resource.actions[action][:immediate].each do |r| + Chef::Log.info("#{resource} sending #{action} action to #{r} (immediate)") + run_action(r, action) + end + end + if resource.actions[action].has_key?(:delayed) + resource.actions[action][:delayed].each do |r| + @delayed_actions[r] = Hash.new unless @delayed_actions.has_key?(r) + @delayed_actions[r][action] = Array.new unless @delayed_actions[r].has_key?(action) + @delayed_actions[r][action] << lambda { + Chef::Log.info("#{resource} sending #{action} action to #{r} (delayed)") + } + end + end + end + end + end + def converge - delayed_actions = Hash.new + @delayed_actions = Hash.new - @collection.each do |resource| + @collection.execute_each_resource do |resource| begin Chef::Log.debug("Processing #{resource}") @@ -81,27 +108,7 @@ class Chef # Walk the actions for this resource, building the provider and running each. action_list = resource.action.kind_of?(Array) ? resource.action : [ resource.action ] action_list.each do |ra| - provider = build_provider(resource) - provider.send("action_#{ra}") - if resource.updated - resource.actions.each_key do |action| - if resource.actions[action].has_key?(:immediate) - resource.actions[action][:immediate].each do |r| - Chef::Log.info("#{resource} sending #{action} action to #{r} (immediate)") - build_provider(r).send("action_#{action}") - end - end - if resource.actions[action].has_key?(:delayed) - resource.actions[action][:delayed].each do |r| - delayed_actions[r] = Hash.new unless delayed_actions.has_key?(r) - delayed_actions[r][action] = Array.new unless delayed_actions[r].has_key?(action) - delayed_actions[r][action] << lambda { - Chef::Log.info("#{resource} sending #{action} action to #{r} (delayed)") - } - end - end - end - end + run_action(resource, ra) end rescue => e Chef::Log.error("#{resource} (#{resource.source_line}) had an error:\n#{e}\n#{e.backtrace}") @@ -110,10 +117,10 @@ class Chef end # Run all our :delayed actions - delayed_actions.each do |resource, action_hash| + @delayed_actions.each do |resource, action_hash| action_hash.each do |action, log_array| log_array.each { |l| l.call } # Call each log message - build_provider(resource).send("action_#{action}") + run_action(resource, action) end end chef/lib/chef/runner.rb @@ -23,6 +23,11 @@ class Chef true end + def action_purr + @new_resource.updated = true + true + end + def action_sell true end chef/spec/lib/chef/provider/snakeoil.rb @@ -32,11 +32,16 @@ describe Chef::Client, "run" do :register, :authenticate, :sync_library_files, + :sync_provider_files, + :sync_resource_files, :sync_attribute_files, :sync_definitions, :sync_recipes, :save_node, - :save_node + :save_node, + :run_ohai, + :safe_name, + :node_name ] to_stub.each do |method| @client.stub!(method).and_return(true) @@ -88,6 +93,16 @@ describe Chef::Client, "run" do @client.run end + it "should synchronize providers from the server" do + @client.should_receive(:sync_provider_files).and_return(true) + @client.run + end + + it "should synchronize resources from the server" do + @client.should_receive(:sync_resource_files).and_return(true) + @client.run + end + it "should save the nodes state on the server (twice!)" do @client.should_receive(:save_node).exactly(3).times.and_return(true) @client.run @@ -108,7 +123,9 @@ end describe Chef::Client, "run_solo" do before(:each) do @client = Chef::Client.new - @client.stub!(:build_node).and_return(true) + [:run_ohai, :safe_name, :node_name, :build_node].each do |method| + @client.stub!(method).and_return(true) + end Chef::Compile.stub!(:new).and_return(mock("Chef::Compile", :null_object => true)) Chef::Runner.stub!(:new).and_return(mock("Chef::Runner", :null_object => true)) end chef/spec/unit/client_spec.rb @@ -22,7 +22,15 @@ describe Chef::Compile do before(:each) do Chef::Config.node_path(File.join(File.dirname(__FILE__), "..", "data", "compile", "nodes")) Chef::Config.cookbook_path(File.join(File.dirname(__FILE__), "..", "data", "compile", "cookbooks")) - @compile = Chef::Compile.new + node = Chef::Node.new + node.stub!(:determine_node_name).and_return(true) + node.stub!(:load_libraries).and_return(true) + node.stub!(:load_providers).and_return(true) + node.stub!(:load_resources).and_return(true) + node.stub!(:load_attributes).and_return(true) + node.stub!(:load_definitions).and_return(true) + node.stub!(:load_recipes).and_return(true) + @compile = Chef::Compile.new(node) end it "should create a new Chef::Compile" do chef/spec/unit/compile_spec.rb @@ -29,6 +29,18 @@ describe Chef::Mixin::Command, "popen4" do end end + it "should default all commands to be run in the POSIX standard C locale" do + popen4("echo $LC_ALL") do |pid, stdin, stdout, stderr| + stdout.read.strip.should == "C" + end + end + + it "should respect locale when specified explicitly" do + popen4("echo $LC_ALL", :environment => {"LC_ALL" => "es"}) do |pid, stdin, stdout, stderr| + stdout.read.strip.should == "es" + end + end + end describe Chef::Mixin::Command, "run_command" do @@ -45,4 +57,4 @@ describe Chef::Mixin::Command, "run_command" do end end -end \ No newline at end of file +end chef/spec/unit/mixin/command_spec.rb @@ -36,6 +36,7 @@ describe Chef::Provider::Cron, "load_current_resource" do @node = mock("Chef::Node", :null_object => true) @new_resource = mock("Chef::Resource::Cron", :null_object => true, + :user => "root", :name => "foo", :minute => "30", :command => "/bin/true" @@ -69,8 +70,8 @@ describe Chef::Provider::Cron, "load_current_resource" do @stdout = mock("STDOUT", :null_object => true) @stderr = mock("STDERR", :null_object => true) @pid = mock("PID", :null_object => true) - @stdout.stub!(:each).and_yield("# Chef Name: foo"). - and_yield("* 5 * * * /bin/true") + @stdout.stub!(:each).and_yield("# Chef Name: foo\n"). + and_yield("* 5 * * * /bin/true\n") @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) Chef::Log.should_receive(:debug).with("Found cron '#{@new_resource.name}'") @provider.load_current_resource @@ -78,6 +79,57 @@ describe Chef::Provider::Cron, "load_current_resource" do end +describe Chef::Provider::Cron, "compare_cron" do + before(:each) do + @node = mock("Chef::Node", :null_object => true) + @new_resource = mock("Chef::Resource::Cron", + :null_object => true, + :user => "root", + :name => "foo", + :minute => "30", + :hour => "2", + :day => "30", + :month => "5", + :weekday => "3", + :command => "/bin/true", + :mailto => "test@example.com", + :path => "/usr/bin:/bin", + :shell => "/bin/zsh", + :home => "/home/thom" + ) + @current_resource = mock("Chef::Resource::Cron", + :null_object => true, + :user => "root", + :name => "foo", + :minute => "30", + :hour => "2", + :day => "30", + :month => "5", + :weekday => "3", + :command => "/bin/true", + :mailto => "test@example.com", + :path => "/usr/bin:/bin", + :shell => "/bin/zsh", + :home => "/home/thom" + ) + @provider = Chef::Provider::Cron.new(@node, @new_resource) + @provider.current_resource = @current_resource + end + + %w{ minute hour day month weekday command mailto path shell home }.each do |attribute| + it "should return true if #{attribute} doesn't match" do + @new_resource.should_receive(attribute).exactly(2).times.and_return(true) + @current_resource.should_receive(attribute).once.and_return(false) + @provider.compare_cron.should eql(true) + end + end + + it "should return false if the objects are identical" do + @provider.compare_cron.should eql(false) + end +end + + describe Chef::Provider::Cron, "action_create" do before(:each) do @node = mock("Chef::Node", :null_object => true) @@ -85,16 +137,31 @@ describe Chef::Provider::Cron, "action_create" do :null_object => true, :name => "foo", :minute => "30", + :hour => "*", + :day => "*", + :month => "*", + :weekday => "*", + :mailto => nil, + :path => nil, + :shell => nil, + :home => nil, :command => "/bin/true" ) @current_resource = mock("Chef::Resource::Cron", :null_object => true, :name => "foo", - :minute => "30", + :minute => "*", + :hour => "5", + :day => "*", + :month => "*", + :weekday => "*", + :mailto => nil, + :path => nil, + :shell => nil, + :home => nil, :command => "/bin/true" ) @provider = Chef::Provider::Cron.new(@node, @new_resource) - end it "should add the cron entry if cron exists" do @@ -103,10 +170,8 @@ describe Chef::Provider::Cron, "action_create" do @stdout = mock("STDOUT", :null_object => true) @stderr = mock("STDERR", :null_object => true) @pid = mock("PID", :null_object => true) - @stdout.stub!(:each).and_yield("# Chef Name: bar"). - and_yield("* 10 * * * /bin/false"). - and_yield("# Chef Name: foo"). - and_yield("* 5 * * * /bin/true") + @stdout.stub!(:each_line).and_yield("# Chef Name: bar\n"). + and_yield("* 10 * * * /bin/false\n") @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) Chef::Log.should_receive(:info).with("Added cron '#{@new_resource.name}'") @provider.action_create @@ -118,10 +183,10 @@ describe Chef::Provider::Cron, "action_create" do @stdout = mock("STDOUT", :null_object => true) @stderr = mock("STDERR", :null_object => true) @pid = mock("PID", :null_object => true) - @stdout.stub!(:each).and_yield("# Chef Name: bar"). - and_yield("* 10 * * * /bin/false"). - and_yield("# Chef Name: foo"). - and_yield("* 5 * * * /bin/true") + @stdout.stub!(:each_line).and_yield("# Chef Name: bar\n"). + and_yield("* 10 * * * /bin/false\n"). + and_yield("# Chef Name: foo\n"). + and_yield("* 5 * * * /bin/true\n") @provider.cron_empty=true @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) Chef::Log.should_receive(:info).with("Added cron '#{@new_resource.name}'") @@ -129,22 +194,61 @@ describe Chef::Provider::Cron, "action_create" do end it "should update the cron entry if it exists and has changed" do + @provider.current_resource = @current_resource @status = mock("Status", :exitstatus => 0) @stdin = mock("STDIN", :null_object => true) @stdout = mock("STDOUT", :null_object => true) @stderr = mock("STDERR", :null_object => true) @pid = mock("PID", :null_object => true) - @stdout.stub!(:each).and_yield("# Chef Name: bar"). - and_yield("* 10 * * * /bin/false"). - and_yield("# Chef Name: foo"). - and_yield("* 5 * * * /bin/true") + @stdout.stub!(:each_line).and_yield("# Chef Name: bar\n"). + and_yield("* 10 * * * /bin/false\n"). + and_yield("# Chef Name: foo\n"). + and_yield("* 5 * * * /bin/true\n") @provider.cron_exists=true @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) Chef::Log.should_receive(:info).with("Updated cron '#{@new_resource.name}'") + @provider.should_receive(:compare_cron).once.and_return(true) @provider.action_create end it "should not update the cron entry if it exists and has not changed" do + @status = mock("Status", :exitstatus => 0) + @stdin = mock("STDIN", :null_object => true) + @stdout = mock("STDOUT", :null_object => true) + @stderr = mock("STDERR", :null_object => true) + @pid = mock("PID", :null_object => true) + @stdout.stub!(:each_line).and_yield("# Chef Name: bar\n"). + and_yield("* 10 * * * /bin/false\n"). + and_yield("# Chef Name: foo\n"). + and_yield("30 * * * * /bin/true\n") + @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) + Chef::Log.should_not_receive(:info).with("Updated cron '#{@new_resource.name}'") + Chef::Log.should_receive(:debug).with("Skipping existing cron entry '#{@new_resource.name}'") + @provider.should_receive(:compare_cron).once.and_return(false) + @provider.cron_exists = true + @provider.action_create + end + + it "should update the cron entry if it exists and has changed environment variables" do + @provider.current_resource = @current_resource + @status = mock("Status", :exitstatus => 0) + @stdin = mock("STDIN", :null_object => true) + @stdout = mock("STDOUT", :null_object => true) + @stderr = mock("STDERR", :null_object => true) + @pid = mock("PID", :null_object => true) + @stdout.stub!(:each_line).and_yield("# Chef Name: bar\n"). + and_yield("* 10 * * * /bin/false\n"). + and_yield("# Chef Name: foo\n"). + and_yield("MAILTO=warn@example.com\n"). + and_yield("30 * * * * /bin/true\n") + @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) + Chef::Log.should_receive(:info).with("Updated cron '#{@new_resource.name}'") + @provider.cron_exists = true + @provider.should_receive(:compare_cron).once.and_return(true) + @provider.action_create + end + + it "should update the cron entry if it exists and has no environment variables" do resource = mock("Chef::Resource::Cron", :null_object => true, :name => "foo", @@ -153,26 +257,31 @@ describe Chef::Provider::Cron, "action_create" do :day => "*", :month => "*", :weekday => "*", + :mailto => "test@example.com", + :path => nil, + :shell => nil, + :home => nil, :command => "/bin/true" ) provider = Chef::Provider::Cron.new(@node, resource) - + provider.current_resource = @current_resource @status = mock("Status", :exitstatus => 0) @stdin = mock("STDIN", :null_object => true) @stdout = mock("STDOUT", :null_object => true) @stderr = mock("STDERR", :null_object => true) @pid = mock("PID", :null_object => true) - @stdout.stub!(:each_line).and_yield("# Chef Name: bar"). - and_yield("* 10 * * * /bin/false"). + @stdout.stub!(:each_line).and_yield("# Chef Name: bar\n"). + and_yield("* 10 * * * /bin/false\n"). and_yield("# Chef Name: foo\n"). and_yield("30 * * * * /bin/true\n") provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) - Chef::Log.should_not_receive(:info).with("Updated cron '#{@new_resource.name}'") - Chef::Log.should_receive(:debug).with("Skipping existing cron entry '#{@new_resource.name}'") + Chef::Log.should_receive(:info).with("Updated cron '#{@new_resource.name}'") provider.cron_exists = true + provider.should_receive(:compare_cron).once.and_return(true) provider.action_create end + end describe Chef::Provider::Cron, "action_delete" do @@ -200,10 +309,10 @@ describe Chef::Provider::Cron, "action_delete" do @stdout = mock("STDOUT", :null_object => true) @stderr = mock("STDERR", :null_object => true) @pid = mock("PID", :null_object => true) - @stdout.stub!(:each).and_yield("# Chef Name: bar"). - and_yield("* 10 * * * /bin/false"). - and_yield("# Chef Name: foo"). - and_yield("* 30 * * * /bin/true") + @stdout.stub!(:each_line).and_yield("# Chef Name: bar\n"). + and_yield("* 10 * * * /bin/false\n"). + and_yield("# Chef Name: foo\n"). + and_yield("* 30 * * * /bin/true\n") @provider.cron_exists=true @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) Chef::Log.should_receive(:debug).with("Deleted cron '#{@new_resource.name}'") @@ -217,7 +326,7 @@ describe Chef::Provider::Cron, "action_delete" do @stdout = mock("STDOUT", :null_object => true) @stderr = mock("STDERR", :null_object => true) @pid = mock("PID", :null_object => true) - @stdout.stub!(:each).and_yield("# Chef Name: bar"). + @stdout.stub!(:each_line).and_yield("# Chef Name: bar"). and_yield("* 10 * * * /bin/false") @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) Chef::Log.should_not_receive(:debug).with("Deleted cron '#{@new_resource.name}'") chef/spec/unit/provider/cron_spec.rb @@ -136,64 +136,33 @@ describe Chef::Provider::Group::Groupadd, "modify_group_members" do @provider = Chef::Provider::Group::Groupadd.new(@node, @new_resource) @provider.stub!(:run_command).and_return(true) end - - describe "with an empty members array" do - before do - @new_resource.stub!(:members).and_return([]) - end - - it "should log an appropriate message" do - Chef::Log.should_receive(:debug).with("group[aj]: not changing group members, the group has no members") - @provider.modify_group_members - end - end - - describe "with supplied members" do - before do - @new_resource.stub!(:members).and_return(["all", "your", "base"]) - end - - it "should log an appropriate debug message" do - Chef::Log.should_receive(:debug).with("group[aj]: setting group members to all, your, base") - @provider.modify_group_members - end - - it "should run gpasswd with the members joined by ',' followed by the target group" do - @provider.should_receive(:run_command).with({:command => "gpasswd -M all,your,base aj"}) - @provider.modify_group_members - end - - it "should run gpasswd individually for each user when the append option is set" do - @new_resource.stub!(:append).and_return(true) - @provider.should_receive(:run_command).with({:command => "gpasswd -a all aj"}) - @provider.should_receive(:run_command).with({:command => "gpasswd -a your aj"}) - @provider.should_receive(:run_command).with({:command => "gpasswd -a base aj"}) - @provider.modify_group_members - end - + + it "should raise an error when calling modify_group_members" do + lambda { @provider.modify_group_members }.should raise_error(Chef::Exceptions::Group, "you must override modify_group_members in #{@provider.to_s}") end end -describe Chef::Provider::Group::Groupadd, "load_current_resource" do +describe Chef::Provider::Group::Usermod, "load_current_resource" do before do @node = mock("Chef::Node", :null_object => true) @new_resource = mock("Chef::Resource::Group", :null_object => true, :group_name => "aj") - @provider = Chef::Provider::Group::Groupadd.new(@node, @new_resource) + @provider = Chef::Provider::Group::Usermod.new(@node, @new_resource) File.stub!(:exists?).and_return(false) end - [ "/usr/sbin/groupadd", - "/usr/sbin/groupmod", - "/usr/sbin/groupdel", - "/usr/bin/gpasswd" ].each do |required_binary| - it "should raise an error if the required binary #{required_binary} doesn't exist" do - File.should_receive(:exists?).with("/usr/sbin/groupadd").and_return(false) - lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Group) - end - end - - it "shouldn't raise an error if the required binaries exist" do - File.stub!(:exists?).and_return(true) - lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::Group) + it "should raise an error if the required binary /usr/sbin/groupadd doesn't exist" do + File.should_receive(:exists?).with("/usr/sbin/groupadd").and_return(false) + lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Group) + end + it "should raise an error if the required binary /usr/sbin/groupmod doesn't exist" do + File.should_receive(:exists?).with("/usr/sbin/groupadd").and_return(true) + File.should_receive(:exists?).with("/usr/sbin/groupmod").and_return(false) + lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Group) + end + it "should raise an error if the required binary /usr/sbin/groupdel doesn't exist" do + File.should_receive(:exists?).with("/usr/sbin/groupadd").and_return(true) + File.should_receive(:exists?).with("/usr/sbin/groupmod").and_return(true) + File.should_receive(:exists?).with("/usr/sbin/groupdel").and_return(false) + lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Group) end end chef/spec/unit/provider/group/groupadd_spec.rb @@ -136,7 +136,7 @@ describe Chef::Provider::Package::Apt, "install_package" do end it "should run apt-get install with the package name and version" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "apt-get -q -y install emacs=1.0", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -146,7 +146,7 @@ describe Chef::Provider::Package::Apt, "install_package" do end it "should run apt-get install with the package name and version and options if specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "apt-get -q -y --force-yes install emacs=1.0", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -194,7 +194,7 @@ describe Chef::Provider::Package::Apt, "remove_package" do end it "should run apt-get remove with the package name" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "apt-get -q -y remove emacs", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -204,7 +204,7 @@ describe Chef::Provider::Package::Apt, "remove_package" do end it "should run apt-get remove with the package name and options if specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "apt-get -q -y --force-yes remove emacs", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -231,7 +231,7 @@ describe Chef::Provider::Package::Apt, "purge_package" do end it "should run apt-get purge with the package name" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "apt-get -q -y purge emacs", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -241,7 +241,7 @@ describe Chef::Provider::Package::Apt, "purge_package" do end it "should run apt-get purge with the package name and options if specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "apt-get -q -y --force-yes purge emacs", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -266,7 +266,7 @@ describe Chef::Provider::Package::Apt, "preseed_package" do ) @provider = Chef::Provider::Package::Apt.new(@node, @new_resource) @provider.stub!(:get_preseed_file).and_return("/tmp/emacs-10.seed") - @provider.stub!(:run_command).and_return(true) + @provider.stub!(:run_command_with_systems_locale).and_return(true) end it "should get the full path to the preseed response file" do @@ -275,7 +275,7 @@ describe Chef::Provider::Package::Apt, "preseed_package" do end it "should run debconf-set-selections on the preseed file if it has changed" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "debconf-set-selections /tmp/emacs-10.seed", :environment => { "DEBIAN_FRONTEND" => "noninteractive" @@ -286,7 +286,7 @@ describe Chef::Provider::Package::Apt, "preseed_package" do it "should not run debconf-set-selections if the preseed file has not changed" do @provider.stub!(:get_preseed_file).and_return(false) - @provider.should_not_receive(:run_command) + @provider.should_not_receive(:run_command_with_systems_locale) @provider.preseed_package("emacs", "10") end end chef/spec/unit/provider/package/apt_spec.rb @@ -29,16 +29,8 @@ describe Chef::Provider::Package::Dpkg, "load_current_resource" do :updated => nil, :source => "/tmp/wget_1.11.4-1ubuntu1_amd64.deb" ) - @current_resource = mock("Chef::Resource::Package", - :null_object => true, - :name => "wget", - :version => nil, - :package_name => nil, - :updated => nil - ) @provider = Chef::Provider::Package::Dpkg.new(@node, @new_resource) - Chef::Resource::Package.stub!(:new).and_return(@current_resource) @stdin = mock("STDIN", :null_object => true) @stdout = mock("STDOUT", :null_object => true) @@ -51,15 +43,10 @@ describe Chef::Provider::Package::Dpkg, "load_current_resource" do end it "should create a current resource with the name of the new_resource" do - Chef::Resource::Package.should_receive(:new).and_return(@current_resource) @provider.load_current_resource + @provider.current_resource.package_name.should == "wget" end - it "should set the current resources package name to the new resources package name" do - @current_resource.should_receive(:package_name).with(@new_resource.package_name) - @provider.load_current_resource - end - it "should raise an exception if a source is supplied but not found" do ::File.stub!(:exists?).and_return(false) lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Package) @@ -68,9 +55,16 @@ describe Chef::Provider::Package::Dpkg, "load_current_resource" do it "should get the source package version from dpkg-deb if provided" do @stdout.stub!(:each).and_yield("wget\t1.11.4-1ubuntu1") @provider.stub!(:popen4).with("dpkg-deb -W #{@new_resource.source}").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) - @current_resource.should_receive(:package_name).with("wget") @new_resource.should_receive(:version).with("1.11.4-1ubuntu1") @provider.load_current_resource + @provider.current_resource.package_name.should == "wget" + end + + it "gets the source package name from dpkg-deb correctly when the package name has `-' or `+' characters" do + @stdout.stub!(:each).and_yield("foo-pkg++2\t1.11.4-1ubuntu1") + @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) + @provider.load_current_resource + @provider.current_resource.package_name.should == "foo-pkg++2" end it "should raise an exception if the source is not set but we are installing" do @@ -99,11 +93,12 @@ describe Chef::Provider::Package::Dpkg, "load_current_resource" do and_yield("Config-Version: 1.11.4-1ubuntu1"). and_yield("Depends: libc6 (>= 2.8~20080505), libssl0.9.8 (>= 0.9.8f-5)"). and_yield("Conflicts: wget-ssl") - @provider.stub!(:popen4).with("dpkg -s #{@current_resource.package_name}").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) - @current_resource.should_receive(:version).with("1.11.4-1ubuntu1") + @provider.stub!(:popen4).with("dpkg -s wget").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status) + @provider.load_current_resource + @provider.current_resource.version.should == "1.11.4-1ubuntu1" end - + it "should raise an exception if dpkg fails to run" do @status = mock("Status", :exitstatus => -1) @provider.stub!(:popen4).and_return(@status) @@ -127,22 +122,20 @@ describe Chef::Provider::Package::Dpkg, "install and upgrade" do end it "should run dpkg -i with the package source" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "dpkg -i /tmp/wget_1.11.4-1ubuntu1_amd64.deb", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } }) @provider.install_package("wget", "1.11.4-1ubuntu1") end it "should run dpkg -i with the package source and options if specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "dpkg -i --force-yes /tmp/wget_1.11.4-1ubuntu1_amd64.deb", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } }) @new_resource.stub!(:options).and_return("--force-yes") @@ -170,22 +163,20 @@ describe Chef::Provider::Package::Dpkg, "remove and purge" do end it "should run dpkg -r to remove the package" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "dpkg -r wget", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } }) @provider.remove_package("wget", "1.11.4-1ubuntu1") end it "should run dpkg -r to remove the package with options if specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "dpkg -r --force-yes wget", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } }) @new_resource.stub!(:options).and_return("--force-yes") @@ -194,22 +185,20 @@ describe Chef::Provider::Package::Dpkg, "remove and purge" do end it "should run dpkg -P to purge the package" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "dpkg -P wget", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } }) @provider.purge_package("wget", "1.11.4-1ubuntu1") end it "should run dpkg -P to purge the package with options if specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "dpkg -P --force-yes wget", :environment => { - "DEBIAN_FRONTEND" => "noninteractive", - "LANG" => "en_US" + "DEBIAN_FRONTEND" => "noninteractive" } }) @new_resource.stub!(:options).and_return("--force-yes") chef/spec/unit/provider/package/dpkg_spec.rb @@ -138,7 +138,7 @@ describe Chef::Provider::Package::Freebsd, "install_package" do end it "should run pkg_add -r with the package name" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "pkg_add -r zsh", }) @provider.install_package("zsh", "4.3.6_7") @@ -147,28 +147,34 @@ describe Chef::Provider::Package::Freebsd, "install_package" do it "should run make install when installing from ports" do @new_resource.stub!(:source).and_return("ports") @provider.should_receive(:port_path).and_return("/usr/ports/shells/zsh") - @provider.should_receive(:run_command).with(:command => "make -DBATCH install", :cwd => "/usr/ports/shells/zsh") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "make -DBATCH install", :cwd => "/usr/ports/shells/zsh") @provider.install_package("zsh", "4.3.6_7") end end describe Chef::Provider::Package::Freebsd, "port path" do it "should figure out the port path from the package_name using whereis" do - @new_resource = mock("Chef::Resource::Package", :package_name => "zsh") + @new_resource = mock( "Chef::Resource::Package", + :package_name => "zsh", + :cookbook_name => "adventureclub") @provider = Chef::Provider::Package::Freebsd.new(mock("Chef::Node"), @new_resource) @provider.should_receive(:popen4).with("whereis -s zsh").and_yield(nil, nil, ["zsh: /usr/ports/shells/zsh"], nil) @provider.port_path.should == "/usr/ports/shells/zsh" end it "should use the package_name as the port path when it starts with /" do - @new_resource = mock("Chef::Resource::Package", :package_name => "/usr/ports/www/wordpress") + @new_resource = mock( "Chef::Resource::Package", + :package_name => "/usr/ports/www/wordpress", + :cookbook_name => "adventureclub") @provider = Chef::Provider::Package::Freebsd.new(mock("Chef::Node"), @new_resource) @provider.should_not_receive(:popen4) @provider.port_path.should == "/usr/ports/www/wordpress" end it "should use the package_name as a relative path from /usr/ports when it contains / but doesn't start with it" do - @new_resource = mock("Chef::Resource::Package", :package_name => "www/wordpress") + @new_resource = mock( "Chef::Resource::Package", + :package_name => "www/wordpress", + :cookbook_name => "xenoparadox") @provider = Chef::Provider::Package::Freebsd.new(mock("Chef::Node"), @new_resource) @provider.should_not_receive(:popen4) @provider.port_path.should == "/usr/ports/www/wordpress" @@ -198,13 +204,13 @@ describe Chef::Provider::Package::Freebsd, "ruby-iconv (package with a dash in t end it "should run pkg_add -r with the package name" do - @provider.should_receive(:run_command).with(:command => "pkg_add -r ruby18-iconv") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "pkg_add -r ruby18-iconv") @provider.install_package("ruby-iconv", "1.0") end it "should run make install when installing from ports" do @new_resource.stub!(:source).and_return("ports") - @provider.should_receive(:run_command).with(:command => "make -DBATCH install", :cwd => "/usr/ports/converters/ruby-iconv") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "make -DBATCH install", :cwd => "/usr/ports/converters/ruby-iconv") @provider.install_package("ruby-iconv", "1.0") end end @@ -230,7 +236,7 @@ describe Chef::Provider::Package::Freebsd, "remove_package" do end it "should run pkg_delete with the package name and version" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "pkg_delete zsh-4.3.6_7" }) @provider.remove_package("zsh", "4.3.6_7") @@ -274,7 +280,7 @@ describe Chef::Provider::Package::Freebsd, "install_package latest link fixes" d @provider.stub!(:package_name).and_return("perl") @provider.stub!(:latest_link_name).and_return("perl") - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "pkg_add -r perl", }) @provider.install_package("perl5.8", "5.8.8_1") @@ -299,7 +305,7 @@ describe Chef::Provider::Package::Freebsd, "install_package latest link fixes" d @provider.stub!(:package_name).and_return("mysql-server") @provider.stub!(:latest_link_name).and_return("mysql50-server") - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "pkg_add -r mysql50-server", }) @provider.install_package("mysql50-server", "5.0.45_1") chef/spec/unit/provider/package/freebsd_spec.rb @@ -113,7 +113,7 @@ EOF it "should run the port install command with the correct version" do @current_resource.should_receive(:version).and_return("4.1.6") @provider.current_resource = @current_resource - @provider.should_receive(:run_command).with(:command => "port install zsh @4.2.7") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "port install zsh @4.2.7") @provider.install_package("zsh", "4.2.7") end @@ -121,7 +121,7 @@ EOF it "should not do anything if a package already exists with the same version" do @current_resource.should_receive(:version).and_return("4.2.7") @provider.current_resource = @current_resource - @provider.should_not_receive(:run_command) + @provider.should_not_receive(:run_command_with_systems_locale) @provider.install_package("zsh", "4.2.7") end @@ -129,24 +129,24 @@ EOF describe "purge_package" do it "should run the port uninstall command with the correct version" do - @provider.should_receive(:run_command).with(:command => "port uninstall zsh @4.2.7") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "port uninstall zsh @4.2.7") @provider.purge_package("zsh", "4.2.7") end it "should purge the currently active version if no explicit version is passed in" do - @provider.should_receive(:run_command).with(:command => "port uninstall zsh") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "port uninstall zsh") @provider.purge_package("zsh", nil) end end describe "remove_package" do it "should run the port deactivate command with the correct version" do - @provider.should_receive(:run_command).with(:command => "port deactivate zsh @4.2.7") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "port deactivate zsh @4.2.7") @provider.remove_package("zsh", "4.2.7") end it "should remove the currently active version if no explicit version is passed in" do - @provider.should_receive(:run_command).with(:command => "port deactivate zsh") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "port deactivate zsh") @provider.remove_package("zsh", nil) end end @@ -156,7 +156,7 @@ EOF @current_resource.should_receive(:version).at_least(:once).and_return("4.1.6") @provider.current_resource = @current_resource - @provider.should_receive(:run_command).with(:command => "port upgrade zsh @4.2.7") + @provider.should_receive(:run_command_with_systems_locale).with(:command => "port upgrade zsh @4.2.7") @provider.upgrade_package("zsh", "4.2.7") end @@ -164,7 +164,7 @@ EOF it "should not run the port upgrade command if the version is already installed" do @current_resource.should_receive(:version).at_least(:once).and_return("4.2.7") @provider.current_resource = @current_resource - @provider.should_not_receive(:run_command) + @provider.should_not_receive(:run_command_with_systems_locale) @provider.upgrade_package("zsh", "4.2.7") end chef/spec/unit/provider/package/macports_spec.rb @@ -117,21 +117,21 @@ describe Chef::Provider::Package::Portage, "install_package" do end it "should install a normally versioned package using portage" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "emerge -g --color n --nospinner --quiet =dev-util/git-1.0.0" }) @provider.install_package("dev-util/git", "1.0.0") end it "should install a tilde versioned package using portage" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "emerge -g --color n --nospinner --quiet ~dev-util/git-1.0.0" }) @provider.install_package("dev-util/git", "~1.0.0") end it "should add options to the emerge command when specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "emerge -g --color n --nospinner --quiet --oneshot =dev-util/git-1.0.0" }) @new_resource.stub!(:options).and_return("--oneshot") @@ -156,14 +156,14 @@ describe Chef::Provider::Package::Portage, "remove_package" do end it "should un-emerge the package with no version specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "emerge --unmerge --color n --nospinner --quiet dev-util/git" }) @provider.remove_package("dev-util/git", nil) end it "should un-emerge the package with a version specified" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "emerge --unmerge --color n --nospinner --quiet =dev-util/git-1.0.0" }) @provider.remove_package("dev-util/git", "1.0.0") chef/spec/unit/provider/package/portage_spec.rb @@ -114,14 +114,14 @@ describe Chef::Provider::Package::Rpm, "install and upgrade" do end it "should run rpm -i with the package source to install" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "rpm -i /tmp/emacs-21.4-20.el5.i386.rpm" }) @provider.install_package("emacs", "21.4-20.el5") end it "should run rpm -U with the package source to upgrade" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "rpm -U /tmp/emacs-21.4-20.el5.i386.rpm" }) @provider.upgrade_package("emacs", "21.4-20.el5") @@ -142,7 +142,7 @@ describe Chef::Provider::Package::Rpm, "remove" do end it "should run rpm -e to remove the package" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "rpm -e emacs-21.4-20.el5" }) @provider.remove_package("emacs", "21.4-20.el5") chef/spec/unit/provider/package/rpm_spec.rb @@ -60,8 +60,11 @@ describe Chef::Provider::Package::Rubygems, "install_package" do it "should run gem install with the package name and version" do @provider.should_receive(:run_command).with({ - :command => "gem install rspec -q --no-rdoc --no-ri -v \"1.2.2\"" + :command => "gem install rspec -q --no-rdoc --no-ri -v \"1.2.2\"", + :environment => { + "LC_ALL" => nil + } }) @provider.install_package("rspec", "1.2.2") end -end \ No newline at end of file +end chef/spec/unit/provider/package/rubygems_spec.rb @@ -104,7 +104,7 @@ describe Chef::Provider::Package::Yum, "install_package" do end it "should run yum install with the package name and version" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "yum -q -y install emacs-1.0" }) @provider.install_package("emacs", "1.0") @@ -143,7 +143,7 @@ describe Chef::Provider::Package::Yum, "upgrade_package" do end it "should run yum update if the package is installed" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "yum -q -y update emacs-11" }) @provider.upgrade_package(@new_resource.name, @provider.candidate_version) @@ -151,7 +151,7 @@ describe Chef::Provider::Package::Yum, "upgrade_package" do it "should run yum install if the package is not installed" do @current_resource.stub!(:version).and_return(nil) - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "yum -q -y install emacs-11" }) @provider.upgrade_package(@new_resource.name, @provider.candidate_version) @@ -180,7 +180,7 @@ describe Chef::Provider::Package::Yum, "remove_package" do end it "should run yum remove with the package name" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "yum -q -y remove emacs-1.0" }) @provider.remove_package("emacs", "1.0") @@ -209,7 +209,7 @@ describe Chef::Provider::Package::Yum, "purge_package" do end it "should run yum remove with the package name" do - @provider.should_receive(:run_command).with({ + @provider.should_receive(:run_command_with_systems_locale).with({ :command => "yum -q -y remove emacs-1.0" }) @provider.purge_package("emacs", "1.0") chef/spec/unit/provider/package/yum_spec.rb @@ -165,34 +165,57 @@ describe Chef::Provider::RemoteFile, "do_remote_file" do @provider.should_receive(:checksum).with(@tempfile.path).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa") do_remote_file end + + describe "when the target file does not exist" do + before do + ::File.stub!(:exists?).with(@resource.path).and_return(false) + @provider.stub!(:get_from_server).and_return(@tempfile) + end + + it "should copy the raw file to the new resource" do + FileUtils.should_receive(:cp).with(@tempfile.path, @resource.path).and_return(true) + do_remote_file + end + + it "should set the new resource to updated" do + @resource.should_receive(:updated=).with(true) + do_remote_file + end + end describe "when the target file already exists" do before do - ::File.stub!(:exists?).and_return(true) + ::File.stub!(:exists?).with(@resource.path).and_return(true) @provider.stub!(:get_from_server).and_return(@tempfile) end - it "should backup the original file if it is different" do - @provider.current_resource.checksum("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924ab") - @provider.should_receive(:backup).with(@resource.path).and_return(true) - do_remote_file + describe "and the checksum doesn't match" do + before do + @provider. + current_resource. + checksum("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924ab") + end + + it "should backup the original file" do + @provider.should_receive(:backup).with(@resource.path).and_return(true) + do_remote_file + end + + it "should copy the raw file to the new resource" do + FileUtils.should_receive(:cp).with(@tempfile.path, @resource.path).and_return(true) + do_remote_file + end + + it "should set the new resource to updated" do + @resource.should_receive(:updated=).with(true) + do_remote_file + end end it "shouldn't backup the original file when it's the same" do @provider.should_not_receive(:backup).with(@resource.path).and_return(true) do_remote_file end - - end - - it "should set the new resource to updated" do - @resource.should_receive(:updated=).with(true) - do_remote_file - end - - it "should copy the raw file to the new resource" do - FileUtils.should_receive(:cp).with(@tempfile.path, @resource.path).and_return(true) - do_remote_file end it "should set the owner if provided" do chef/spec/unit/provider/remote_file_spec.rb @@ -51,17 +51,20 @@ describe Chef::Provider::Service, "action_enable" do @provider.stub!(:enable_service).and_return(true) end - it "should enable the service if disabled" do + it "should enable the service if disabled and set the resource as updated" do @current_resource.stub!(:enabled).and_return(false) @provider.should_receive(:enable_service).and_return(true) + @provider.new_resource.should_receive(:updated=).with(true) @provider.action_enable end it "should not enable the service if already enabled" do @current_resource.stub!(:enabled).and_return(true) @provider.should_not_receive(:enable_service).and_return(true) + @provider.new_resource.should_not_receive(:updated=).with(true) @provider.action_enable end + end describe Chef::Provider::Service, "action_disable" do @@ -84,15 +87,17 @@ describe Chef::Provider::Service, "action_disable" do @provider.stub!(:disable_service).and_return(true) end - it "should disable the service if enabled" do + it "should disable the service if enabled and set the resource as updated" do @current_resource.stub!(:enabled).and_return(true) @provider.should_receive(:disable_service).and_return(true) + @provider.new_resource.should_receive(:updated=).with(true) @provider.action_disable end it "should not disable the service if already disabled" do @current_resource.stub!(:enabled).and_return(false) @provider.should_not_receive(:disable_service).and_return(true) + @provider.new_resource.should_not_receive(:updated=).with(true) @provider.action_disable end end @@ -117,15 +122,17 @@ describe Chef::Provider::Service, "action_start" do @provider.stub!(:start_service).and_return(true) end - it "should start the service if it isn't running" do + it "should start the service if it isn't running and set the resource as updated" do @current_resource.stub!(:running).and_return(false) @provider.should_receive(:start_service).with.and_return(true) + @provider.new_resource.should_receive(:updated=).with(true) @provider.action_start end it "should not start the service if already running" do @current_resource.stub!(:running).and_return(true) @provider.should_not_receive(:start_service).and_return(true) + @provider.new_resource.should_not_receive(:updated=).with(true) @provider.action_enable end end @@ -150,15 +157,17 @@ describe Chef::Provider::Service, "action_stop" do @provider.stub!(:stop_service).and_return(true) end - it "should stop the service if it is running" do + it "should stop the service if it is running and set the resource as updated" do @current_resource.stub!(:running).and_return(true) @provider.should_receive(:stop_service).and_return(true) + @provider.new_resource.should_receive(:updated=).with(true) @provider.action_stop end it "should not stop the service if it's already stopped" do @current_resource.stub!(:running).and_return(false) @provider.should_not_receive(:stop_service).and_return(true) + @provider.new_resource.should_not_receive(:updated=).with(true) @provider.action_stop end end @@ -185,14 +194,16 @@ before(:each) do @current_resource.stub!(:supports).and_return({:restart => true}) end - it "should restart the service if it's supported" do + it "should restart the service if it's supported and set the resource as updated" do @provider.should_receive(:restart_service).and_return(true) + @provider.new_resource.should_receive(:updated=).with(true) @provider.action_restart end - it "should restart the service even if it isn't running" do + it "should restart the service even if it isn't running and set the resource as updated" do @current_resource.stub!(:running).and_return(false) @provider.should_receive(:restart_service).and_return(true) + @provider.new_resource.should_receive(:updated=).with(true) @provider.action_restart end end @@ -225,15 +236,17 @@ before(:each) do lambda { @provider.action_reload }.should raise_error(Chef::Exceptions::UnsupportedAction) end - it "should reload the service if it is running" do + it "should reload the service if it is running and set the resource as updated" do @current_resource.stub!(:running).and_return(true) @provider.should_receive(:reload_service).and_return(true) + @provider.new_resource.should_receive(:updated=).with(true) @provider.action_reload end it "should not reload the service if it's stopped" do @current_resource.stub!(:running).and_return(false) @provider.should_not_receive(:stop_service).and_return(true) + @provider.new_resource.should_not_receive(:updated=).with(true) @provider.action_stop end end chef/spec/unit/provider/service_spec.rb @@ -21,6 +21,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper")) describe Chef::Provider do before(:each) do @resource = Chef::Resource.new("funk") + @resource.cookbook_name = "a_delicious_pie" @node = Chef::Node.new @node.name "latte" @provider = Chef::Provider.new(@node, @resource) @@ -45,4 +46,17 @@ describe Chef::Provider do it "should return true for action_nothing" do @provider.action_nothing.should eql(true) end + + it "sets @cookbook_name to the cookbook name given by @new_resource" do + @provider.instance_variable_get(:@cookbook_name).should == "a_delicious_pie" + end + + it "evals embedded recipes with a pristine resource collection" do + @provider.instance_variable_set(:@collection, "bouncyCastle") + temporary_collection = nil + snitch = lambda {temporary_collection = @collection} + @provider.send(:recipe_eval, &snitch) + temporary_collection.should be_an_instance_of(Chef::ResourceCollection) + @provider.instance_variable_get(:@collection).should == "bouncyCastle" + end end \ No newline at end of file chef/spec/unit/provider_spec.rb @@ -78,6 +78,26 @@ describe Chef::Resource::Cron do @resource.weekday.should eql("2") end + it "should allow you to specify the mailto variable" do + @resource.mailto "test@example.com" + @resource.mailto.should eql("test@example.com") + end + + it "should allow you to specify the path" do + @resource.path "/usr/bin:/usr/sbin" + @resource.path.should eql("/usr/bin:/usr/sbin") + end + + it "should allow you to specify the home directory" do + @resource.home "/root" + @resource.home.should eql("/root") + end + + it "should allow you to specify the shell to run the command with" do + @resource.shell "/bin/zsh" + @resource.shell.should eql("/bin/zsh") + end + it "should allow * for all time and date values" do [ "minute", "hour", "day", "month", "weekday" ].each do |x| @resource.send(x, "*").should eql("*") chef/spec/unit/resource/cron_spec.rb @@ -43,6 +43,10 @@ describe Chef::Resource::Group, "initialize" do it "should default members to an empty array" do @resource.members.should eql([]) end + + it "should alias users to members, also an empty array" do + @resource.users.should eql([]) + end it "should set action to :create" do @resource.action.should eql(:create) @@ -90,18 +94,20 @@ describe Chef::Resource::Group, "members" do @resource = Chef::Resource::Group.new("admin") end - it "should allow and convert a string" do - @resource.members "aj" - @resource.members.should eql(["aj"]) - end + [ :users, :members].each do |method| + it "(#{method}) should allow and convert a string" do + @resource.send(method, "aj") + @resource.send(method).should eql(["aj"]) + end - it "should allow an array" do - @resource.members [ "aj", "adam" ] - @resource.members.should eql( ["aj", "adam"] ) - end + it "(#{method}) should allow an array" do + @resource.send(method, [ "aj", "adam" ]) + @resource.send(method).should eql( ["aj", "adam"] ) + end - it "should not allow a hash" do - lambda { @resource.send(:members, { :aj => "is freakin awesome" }) }.should raise_error(ArgumentError) + it "(#{method}) should not allow a hash" do + lambda { @resource.send(method, { :aj => "is freakin awesome" }) }.should raise_error(ArgumentError) + end end end chef/spec/unit/resource/group_spec.rb @@ -1,6 +1,7 @@ # # Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Christopher Walters (<cw@opscode.com>) +# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -56,6 +57,37 @@ describe Chef::ResourceCollection do end end + describe "insert" do + it "should accept only Chef::Resources" do + lambda { @rc.insert(@resource) }.should_not raise_error + lambda { @rc.insert("string") }.should raise_error + end + + it "should append resources to the end of the collection when not executing a run" do + zmr = Chef::Resource::ZenMaster.new("there is no spoon") + @rc.insert(@resource) + @rc.insert(zmr) + @rc[0].should eql(@resource) + @rc[1].should eql(zmr) + end + + it "should insert resources to the middle of the collection if called while executing a run" do + resource_to_inject = Chef::Resource::ZenMaster.new("there is no spoon") + zmr = Chef::Resource::ZenMaster.new("morpheus") + dummy = Chef::Resource::ZenMaster.new("keanu reeves") + @rc.insert(zmr) + @rc.insert(dummy) + + @rc.execute_each_resource do |resource| + @rc.insert(resource_to_inject) if resource == zmr + end + + @rc[0].should eql(zmr) + @rc[1].should eql(resource_to_inject) + @rc[2].should eql(dummy) + end + end + describe "each" do it "should allow you to iterate over every resource in the collection" do load_up_resources @@ -204,4 +236,4 @@ describe Chef::ResourceCollection do @rc << Chef::Resource::File.new("something") end -end \ No newline at end of file +end chef/spec/unit/resource_collection_spec.rb @@ -18,6 +18,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper")) +class ResourceTestHarness < Chef::Resource + provider_base Chef::Provider::Package +end + describe Chef::Resource do before(:each) do @resource = Chef::Resource.new("funk") @@ -164,6 +168,16 @@ describe Chef::Resource do end end + describe "to_hash" do + it "should convert to a hash" do + hash = @resource.to_hash + hash.keys.should include( :only_if, :allowed_actions, :params, :provider, + :updated, :before, :not_if, :supports, :node, + :actions, :noop, :ignore_failure, :name, :source_line, :action) + hash[:name].should eql("funk") + end + end + describe "self.json_create" do it "should deserialize itself from json" do json = @resource.to_json @@ -201,4 +215,16 @@ describe Chef::Resource do end end + describe "setting the base provider class for the resource" do + + it "defaults to Chef::Provider for the base class" do + Chef::Resource.provider_base.should == Chef::Provider + end + + it "allows the base provider to be overriden by a " do + ResourceTestHarness.provider_base.should == Chef::Provider::Package + end + + end + end \ No newline at end of file chef/spec/unit/resource_spec.rb @@ -1,4 +1,4 @@ -# + # Author:: Adam Jacob (<adam@opscode.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. # License:: Apache License, Version 2.0 @@ -55,7 +55,7 @@ describe Chef::Runner do end it "should pass each resource in the collection to a provider" do - @collection.should_receive(:each).once + @collection.should_receive(:execute_each_resource).once @runner.converge end @@ -129,6 +129,21 @@ describe Chef::Runner do @runner.converge end + it "should follow a chain of actions" do + Chef::Platform.should_receive(:find_provider_for_node).exactly(5).times.and_return(Chef::Provider::SnakeOil) + @collection << Chef::Resource::Cat.new("peanut", @collection) + @collection[1].notifies :buy, @collection[0], :immediately + @collection << Chef::Resource::Cat.new("snuffles", @collection) + @collection[2].notifies :purr, @collection[1], :immediately + @collection[2].updated = true + provider = Chef::Provider::SnakeOil.new(@node, @collection[0]) + p1 = Chef::Provider::SnakeOil.new(@node, @collection[1]) + p2 = Chef::Provider::SnakeOil.new(@node, @collection[2]) + Chef::Provider::SnakeOil.should_receive(:new).exactly(5).times.and_return(provider, p1, p2, p1, provider) + provider.should_receive(:action_buy).once.and_return(true) + @runner.converge + end + it "should execute delayed actions on changed resources" do Chef::Platform.should_receive(:find_provider_for_node).exactly(3).times.and_return(Chef::Provider::SnakeOil) provider = Chef::Provider::SnakeOil.new(@node, @collection[0]) @@ -153,4 +168,4 @@ describe Chef::Runner do @runner.converge end -end \ No newline at end of file +end chef/spec/unit/runner_spec.rb @@ -18,6 +18,8 @@ search: --tags search --format pretty -r features/steps -r features/support feat language: --tags language --format pretty -r features/steps -r features/support features recipe_inclusion: --tags recipe_inclusion --format pretty -r features/steps -r features/support features provider_remote_file: --tags provider,remote_file --format pretty -r features/steps -r features/support features +provider_git: --tags provider,git --format pretty -r features/steps -r features/support features provider_template: --tags template --format pretty -r features/steps -r features/support features provider_package_macports: --tags macports --format pretty -r features/steps -r features/support features +lwrp: --tags lwrp --format pretty -r features/steps -r features/support features cucumber.yml @@ -31,6 +31,10 @@ When /^I run the chef\-client$/ do @status = status end +When /^I run the chef\-client again$/ do + When "I run the chef-client" +end + When /^I run the chef\-client with '(.+)'$/ do |args| @chef_args = args When "I run the chef-client" features/steps/run_client_steps.rb chef-server-slice/app/controllers/cookbook_attributes.rb chef-server-slice/app/controllers/cookbook_definitions.rb chef-server-slice/app/controllers/cookbook_libraries.rb chef-server-slice/app/controllers/cookbook_recipes.rb distro/debian/etc/init.d/chef-client distro/debian/etc/init.d/chef-indexer distro/debian/etc/init.d/chef-server distro/debian/man/man1/chef-indexer.1 distro/debian/man/man1/chef-server.1 distro/debian/man/man8/chef-client.8 distro/debian/man/man8/chef-solo.8 distro/redhat/etc/chef/client.rb distro/redhat/etc/chef/indexer.rb distro/redhat/etc/chef/server.rb distro/redhat/etc/init.d/chef-client distro/redhat/etc/init.d/chef-indexer distro/redhat/etc/init.d/chef-server e5121817ab8525e51a01a4420631c4829e39b5ae 6f78b9ff0026b1784375a8baf8076c0cc210c946 Adam Jacob adam@opscode.com http://github.com/opscode/chef/commit/8c2b5381d6819f3e76f2ed58dd9bc8df70408f38 8c2b5381d6819f3e76f2ed58dd9bc8df70408f38 2009-10-16T17:00:23-07:00 2009-10-16T17:00:23-07:00 Merge branch 'master' of git@github.com:opscode/chef into 0712-merge Conflicts: Rakefile chef-server-slice/Rakefile chef-server-slice/app/controllers/application.rb chef-server-slice/app/controllers/cookbooks.rb chef-server-slice/app/views/cookbooks/show.html.haml chef-server-slice/lib/chef-server-slice.rb chef-server/Rakefile chef/Rakefile chef/lib/chef.rb chef/lib/chef/client.rb chef/lib/chef/cookbook.rb chef/spec/unit/client_spec.rb cucumber.yml e8f517c7d69c78d29e0efd06810b2cdfa2139f90 Adam Jacob adam@opscode.com