Merge branch 'master' into dbalatero/chef-257

adamhjk · adamhjk · commit 6168c05d0591 · 2009-04-29T15:17:14.000-07:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,58 @@
+Tue Apr 28 16:43:43 PDT 2009
+Release Notes - Chef - Version 0.6.0
+http://tickets.opscode.com
+
+** Bug
+    * [CHEF-134] - User IDs and GIDs with negative numbers cause a type exception
+    * [CHEF-162] - delayed notifications should coalesce so they don't run multiple times
+    * [CHEF-163] - remote_file not working on head, 404 due to missing route
+    * [CHEF-164] - Slice routing changes break remote file provider
+    * [CHEF-169] - Detect and use new view URL's for CouchDB 0.9.0 compatability
+    * [CHEF-171] - Package name with a dash (-) in it is not recognised
+    * [CHEF-173] - With debug logging level set long running commands do not show their output in real time
+    * [CHEF-174] - directory mode not set correctly
+    * [CHEF-182] - Chef::Exception masks ::Exception (see OHAI-79)
+    * [CHEF-185] - file delete backs up links
+    * [CHEF-186] - file delete fails if file does not exist
+    * [CHEF-188] - Merb dependencies for both the server app and slice need to be updated to 1.0.10 
+    * [CHEF-190] - apt provider fails on non-English debian installations
+    * [CHEF-195] - The backup attribute for File needlessly creates a backup then deletes it when set to 0
+    * [CHEF-198] - chef-solo banner
+    * [CHEF-206] - chef-server-slice rake install fails
+    * [CHEF-207] - chef-server and chef-server-slice should require merb > 1.0, not specific versions
+    * [CHEF-218] - Search indexes are broken due to missing route
+    * [CHEF-222] - CouchDB 0.9 compat causes the client to attempt a connection to the CouchDB server (while instantiating a node object)
+    * [CHEF-227] - Delete operation of Search Index is not working
+    * [CHEF-228] - chef-server under passenger: Controller class not found for controller `registrations'
+    * [CHEF-230] - remote_file with a url should include a type of hash option to verify the downloaded file is what we expected
+    * [CHEF-237] - Apt provider won't install msttcorefonts
+    * [CHEF-238] - Commands with over 4k of output will block forever
+    * [CHEF-244] - Chef server no longer checks openid's against the authorized_openid_identifiers configuration
+
+** Improvement
+    * [CHEF-54] - chef-server should be a merb slice
+    * [CHEF-129] - Implement pilu's web-app-theme for chef-server
+    * [CHEF-148] - cookbook naming and routing
+    * [CHEF-153] - Allow access to a list of OpenID's via configration.
+    * [CHEF-159] - CookbookLoader#load_cascading_files uses Dir.glob(array) syntax, which is unavailable on RHEL and Centos
+    * [CHEF-167] - chef-server-slice rake install requires sudo
+    * [CHEF-172] - In FreeBSD package provider simplify source parameter "magic" by using PKGNAME in ports Makefile
+    * [CHEF-177] - Where multiple ports have the same name allow path to ports to be given
+    * [CHEF-192] - speed up yum provider
+    * [CHEF-200] - fixes from centos packaging attempt
+    * [CHEF-210] - enterprise linux init scripts and configs
+    * [CHEF-213] - Fixing typos in the code
+    * [CHEF-214] - On Gentoo, services always support the :status command, so enable it by default
+    * [CHEF-246] - Should be clearer what tags are attached to a node
+    * [CHEF-247] - Let chef-server and chef-client compare checksums in bulk rather than one at a time.
+
+** New Feature
+    * [CHEF-78] - Add a mixin for parsing a file and replacing lines
+    * [CHEF-176] - Chef status page that displays basic info about each chef managed node
+    * [CHEF-191] - Enable optional CouchDB storage for OpenID associations and nonces
+    * [CHEF-216] - Allow execute/script resources to set umask
+
+
 Thu Mar  5 19:51:02 PST 2009
 Release Notes - Chef - Version 0.5.6
 http://tickets.opscode.com
diff --git a/Rakefile b/Rakefile
@@ -2,22 +2,15 @@ gems = %w[chef chef-server-slice chef-server]
 require 'rubygems'
 require 'cucumber/rake/task'
 
-namespace :git do
-  desc "Initialise and update the Git submodules"
-  task :submodule_update do
-    sh "git submodule update --init"
-  end
-end
-
 desc "Build the chef gems"
-task :gem => "git:submodule_update" do
+task :gem do
   gems.each do |dir|
     Dir.chdir(dir) { sh "rake package" }
   end
 end
  
 desc "Install the chef gems"
-task :install => "git:submodule_update" do
+task :install do
   gems.each do |dir|
     Dir.chdir(dir) { sh "rake install" }
   end
diff --git a/chef-server-slice/Rakefile b/chef-server-slice/Rakefile
@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "chef-server-slice"
-CHEF_SERVER_VERSION="0.5.7"
+CHEF_SERVER_VERSION="0.6.0"
 AUTHOR = "Opscode"
 EMAIL = "chef@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/chef"
diff --git a/chef-server/Rakefile b/chef-server/Rakefile
@@ -18,7 +18,7 @@ require 'chef' unless defined?(Chef)
 include FileUtils
 
 GEM = "chef-server"
-CHEF_SERVER_VERSION = "0.5.7"
+CHEF_SERVER_VERSION = "0.6.0"
 AUTHOR = "Opscode"
 EMAIL = "chef@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/chef"
diff --git a/chef/Rakefile b/chef/Rakefile
@@ -4,7 +4,7 @@ require 'rake/rdoctask'
 require './tasks/rspec.rb'
 
 GEM = "chef"
-CHEF_VERSION = "0.5.7"
+CHEF_VERSION = "0.6.0"
 AUTHOR = "Adam Jacob"
 EMAIL = "adam@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/chef"
diff --git a/chef/bin/chef-client b/chef/bin/chef-client
@@ -85,12 +85,15 @@ Chef::Daemon.change_privilege
 
 Chef::Log.init(Chef::Config[:log_location])
 Chef::Log.level(Chef::Config[:log_level])
-Chef::Config[:delay] = 0
+Chef::Config[:delay] = 0 
 
 if Chef::Config[:daemonize]
   # We want to set the interval to half an hour, if one is not set.
   Chef::Config[:interval] ||= 1800
   Chef::Daemon.daemonize("chef-client")
+end
+
+if Chef::Config[:interval]
   Chef::Config[:delay] = Chef::Config[:interval].to_i + (Chef::Config[:splay] ? rand(Chef::Config[:splay]) : 0)
 end
 
@@ -101,7 +104,7 @@ loop do
     c.validation_token = Chef::Config[:validation_token]
     c.node_name = Chef::Config[:node_name]
     c.run
-    if Chef::Config[:daemonize]
+    if Chef::Config[:interval]
       Chef::Log.debug("Sleeping for #{Chef::Config[:delay]} seconds")
       sleep Chef::Config[:delay]
     else
@@ -110,7 +113,7 @@ loop do
   rescue SystemExit => e
     raise
   rescue Exception => e
-    if Chef::Config[:daemonize]
+    if Chef::Config[:interval]
       Chef::Log.error("#{e.class}")
       Chef::Log.fatal("#{e}\n#{e.backtrace.join("\n")}")
       Chef::Log.fatal("Sleeping for #{Chef::Config[:delay]} seconds before trying again")
diff --git a/chef/lib/chef.rb b/chef/lib/chef.rb
@@ -27,7 +27,7 @@
 Dir[File.join(File.dirname(__FILE__), 'chef/mixin/**/*.rb')].sort.each { |lib| require lib }
 
 class Chef
-  VERSION = '0.5.7'
+  VERSION = '0.6.0'
   
   class << self
     def fatal!(msg, err = -1)
diff --git a/chef/lib/chef/mixin/command.rb b/chef/lib/chef/mixin/command.rb
@@ -294,7 +294,6 @@ def popen4(cmd, args={}, &b)
               stdout.fcntl(Fcntl::F_SETFL, pi[1].fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
               stderr.fcntl(Fcntl::F_SETFL, pi[2].fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
               
-              
               stdout_finished = false
               stderr_finished = false
              
diff --git a/chef/lib/chef/provider/package/rubygems.rb b/chef/lib/chef/provider/package/rubygems.rb
@@ -34,14 +34,19 @@ def gem_list_parse(line)
             nil
           end
         end
+
+        def gem_binary_path
+          path = @new_resource.gem_binary
+          path ? path : 'gem'
+        end
       
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
           @current_resource.version(nil)
         
           # First, we need to look up whether we have the local gem installed or not
-          status = popen4("gem list --local #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+          status = popen4("#{gem_binary_path} list --local #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               installed_versions = gem_list_parse(line)
               next unless installed_versions
@@ -60,10 +65,10 @@ def load_current_resource
           end
           
           unless status.exitstatus == 0
-            raise Chef::Exceptions::Package, "gem list --local failed - #{status.inspect}!"
+            raise Chef::Exceptions::Package, "#{gem_binary_path} list --local failed - #{status.inspect}!"
           end
           
-          status = popen4("gem list --remote #{@new_resource.package_name}#{' --source=' + @new_resource.source if @new_resource.source}") do |pid, stdin, stdout, stderr|
+          status = popen4("#{gem_binary_path} list --remote #{@new_resource.package_name}#{' --source=' + @new_resource.source if @new_resource.source}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               installed_versions = gem_list_parse(line)
               next unless installed_versions
@@ -77,7 +82,7 @@ def load_current_resource
           end
 
           unless status.exitstatus == 0
-            raise Chef::Exceptions::Package, "gem list --remote failed - #{status.inspect}!"
+            raise Chef::Exceptions::Package, "#{gem_binary_path} list --remote failed - #{status.inspect}!"
           end
         
           @current_resource
@@ -89,7 +94,7 @@ def install_package(name, version)
             src = "  --source=#{@new_resource.source} --source=http://gems.rubyforge.org"
           end  
           run_command(
-            :command => "gem install #{name} -q --no-rdoc --no-ri -v #{version}#{src}"
+            :command => "#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v #{version}#{src}"
           )
         end
       
@@ -100,11 +105,11 @@ def upgrade_package(name, version)
         def remove_package(name, version)
           if version
             run_command(
-              :command => "gem uninstall #{name} -q -v #{version}"
+              :command => "#{gem_binary_path} uninstall #{name} -q -v #{version}"
             )
           else
             run_command(
-              :command => "gem uninstall #{name} -q -a"
+              :command => "#{gem_binary_path} uninstall #{name} -q -a"
             )
           end
         end
diff --git a/chef/lib/chef/resource/gem_package.rb b/chef/lib/chef/resource/gem_package.rb
@@ -27,7 +27,15 @@ def initialize(name, collection=nil, node=nil)
         @resource_name = :gem_package
         @provider = Chef::Provider::Package::Rubygems
       end
-      
+
+      # Sets a custom gem_binary to run for gem commands.
+      def gem_binary(arg=nil)
+        set_or_return(
+          :gem_binary,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
     end
   end
-end
+end
diff --git a/chef/spec/unit/provider/package/rubygems_spec.rb b/chef/spec/unit/provider/package/rubygems_spec.rb
@@ -0,0 +1,44 @@
+#
+# Author:: David Balatero (dbalatero@gmail.com)
+#
+# Copyright:: Copyright (c) 2009 David Balatero 
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper"))
+
+describe Chef::Provider::Package::Rubygems, "gem_binary_path" do
+  before(:each) do
+    @node = mock("Chef::Node", :null_object => true)
+    @new_resource = mock("Chef::Resource::Package",
+      :null_object => true,
+      :name => "rspec",
+      :version => "1.2.2",
+      :package_name => "rspec",
+      :updated => nil,
+      :gem_binary => nil
+    )
+    @provider = Chef::Provider::Package::Rubygems.new(@node, @new_resource)
+  end
+
+  it "should return a relative path to gem if no gem_binary is given" do
+    @provider.gem_binary_path.should eql("gem")
+  end
+
+  it "should return a specific path to gem if a gem_binary is given" do
+    @new_resource.should_receive(:gem_binary).and_return("/opt/local/bin/custom/ruby")
+    @provider.gem_binary_path.should eql("/opt/local/bin/custom/ruby")
+  end
+end
diff --git a/chef/spec/unit/resource/gem_package_spec.rb b/chef/spec/unit/resource/gem_package_spec.rb
@@ -35,4 +35,15 @@
   it "should set the provider to Chef::Provider::Package::Rubygems" do
     @resource.provider.should eql(Chef::Provider::Package::Rubygems)
   end
-end
+end
+
+describe Chef::Resource::GemPackage, "gem_binary" do
+  before(:each) do
+    @resource = Chef::Resource::GemPackage.new("foo")
+  end
+
+  it "should set the gem_binary variable to whatever is passed in" do
+    @resource.gem_binary("/opt/local/bin/gem")
+    @resource.gem_binary.should eql("/opt/local/bin/gem")
+  end
+end
diff --git a/features/chef-client/run_interval.feature b/features/chef-client/run_interval.feature
@@ -0,0 +1,12 @@
+Feature: Run chef-client at periodic intervals 
+  In order to ensure a system is always correctly configured 
+  As an Administrator
+  I want to run the chef-client repeatedly at an interval
+
+  Scenario: Run the client at an interval
+    Given a validated node
+      And it includes the recipe 'run_interval'
+     When I run the chef-client with '-l info -i 5' for '10' seconds
+     Then the run should exit from being signaled 
+      And 'INFO: Starting Chef Run' should appear on 'stdout' '2' times
+
diff --git a/features/data/cookbooks/run_interval/recipes/default.rb b/features/data/cookbooks/run_interval/recipes/default.rb
@@ -0,0 +1,18 @@
+#
+# Cookbook Name:: run_interval
+# Recipe:: default
+#
+# Copyright 2009, Opscode
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
diff --git a/features/steps/run_client.rb b/features/steps/run_client.rb
