chef 0.7.12 → 0.7.14

data/lib/chef.rb

@@ -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.12'
+  VERSION = '0.7.14'
 end
 
 # Adds a Dir.glob to Ruby 1.8.5, for compat

data/lib/chef/mixin/find_preferred_file.rb

@@ -74,6 +74,8 @@ class Chef
         ]
         
         file_list_str = file_list.keys.join("\n")
+        Chef::Log.debug("Searching for preferred file in\n#{file_list_str}")
+        
         preferences.each do |pref|
           Chef::Log.debug("Looking for #{pref}")
           matcher = /^(.+#{pref})$/

data/lib/chef/provider/deploy.rb

@@ -167,7 +167,7 @@ class Chef
       end
       
       def all_releases
-        Dir.glob(@new_resource.deploy_to + "/releases/*")
+        Dir.glob(@new_resource.deploy_to + "/releases/*").sort
       end
       
       def update_cached_repo

data/lib/chef/provider/git.rb

@@ -39,11 +39,13 @@ class Chef
         clone
         checkout
         enable_submodules
+        @new_resource.updated = true
       end
       
       def action_export
         action_checkout
         FileUtils.rm_rf(::File.join(@new_resource.destination,".git"))
+        @new_resource.updated = true
       end
       
       def action_sync
@@ -53,6 +55,8 @@ class Chef
           sync
           enable_submodules
         end
+
+        @new_resource.updated = true
       end
       
       def find_current_revision
@@ -191,4 +195,4 @@ class Chef
       
     end
   end
-end
+end

data/lib/chef/provider/package/yum-dump.py

@@ -34,6 +34,8 @@ import yum
 
 from yum import Errors
 
+PIDFILE='/var/run/yum.pid'
+
 # Seconds to wait for exclusive access to yum
 lock_timeout = 10
 
@@ -54,7 +56,7 @@ try:
     countdown = lock_timeout
     while True:
       try:
-        y.doLock()
+        y.doLock(PIDFILE)
       except Errors.LockError, e:
         time.sleep(1)
         countdown -= 1 
@@ -80,7 +82,7 @@ try:
 # Ensure we clear the lock.
 finally:
   try:
-    y.doUnlock()
+    y.doUnlock(PIDFILE)
   # Keep Unlock from raising a second exception as it does with a yum.conf 
   # config error.
   except Errors.YumBaseError:

data/lib/chef/provider/subversion.rb

@@ -37,10 +37,12 @@ class Chef
       
       def action_checkout
         run_command(run_options(:command => checkout_command))
+        @new_resource.updated = true
       end
       
       def action_export
         run_command(run_options(:command => export_command))
+        @new_resource.updated = true
       end
       
       def action_sync
@@ -49,6 +51,7 @@ class Chef
         else
           run_command(run_options(:command => sync_command))
         end
+        @new_resource.updated = true
       end
       
       def sync_command

data/lib/chef/resource/deploy.rb

@@ -69,10 +69,9 @@ class Chef
         @remote = "origin"
         @enable_submodules = false
         @shallow_clone = false
-        @force_deploy = false
         @scm_provider = Chef::Provider::Git
         @provider = Chef::Provider::Deploy::Timestamped
-        @allowed_actions.push(:deploy, :rollback)
+        @allowed_actions.push(:force_deploy, :deploy, :rollback)
       end
       
       # where the checked out/cloned code goes
@@ -244,15 +243,6 @@ class Chef
         )
       end
       
-      # Shall we run the deploy even if the code has not changed?
-      def force_deploy(arg=nil)
-        set_or_return(
-          :force_deploy,
-          arg,
-          :kind_of => [ TrueClass, FalseClass ]
-        )
-      end
-      
       def scm_provider(arg=nil)
         set_or_return(
           :scm_provider,
@@ -357,4 +347,4 @@ class Chef
       
     end
   end
-end
+end

data/lib/chef/tasks/chef_repo.rake

@@ -185,6 +185,8 @@ def create_cookbook(dir)
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "recipes")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "definitions")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "libraries")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "resources")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "providers")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "files", "default")}" 
   sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "templates", "default")}" 
   unless File.exists?(File.join(dir, ENV["COOKBOOK"], "recipes", "default.rb"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  version: 0.7.12
+  version: 0.7.14
 platform: ruby
 authors: 
 - Adam Jacob
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 +13:00
+date: 2009-10-27 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.4
+        version: 0.3.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-cli