chef 0.9.14.rc.1 → 0.9.14

data/lib/chef/provider/deploy.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,40 +24,40 @@ require "chef/provider/subversion"
 class Chef
   class Provider
     class Deploy < Chef::Provider
-      
+
       include Chef::Mixin::FromFile
       include Chef::Mixin::Command
-      
+
       attr_reader :scm_provider, :release_path
-      
+
       def initialize(new_resource, run_context)
         super(new_resource, run_context)
-        
+
         @scm_provider = new_resource.scm_provider.new(new_resource, run_context)
-        
+
         # @configuration is not used by Deploy, it is only for backwards compat with
         # chef-deploy or capistrano hooks that might use it to get environment information
         @configuration = @new_resource.to_hash
         @configuration[:environment] = @configuration[:environment] && @configuration[:environment]["RAILS_ENV"]
       end
-      
+
       def load_current_resource
         @release_path = @new_resource.deploy_to + "/releases/#{release_slug}"
       end
-      
+
       def sudo(command,&block)
         execute(command, &block)
       end
-      
+
       def run(command, &block)
         exec = execute(command, &block)
         exec.user(@new_resource.user) if @new_resource.user
         exec.group(@new_resource.group) if @new_resource.group
         exec.cwd(release_path) unless exec.cwd
-        exec.environment(@new_resource.environment) unless exec.environment 
+        exec.environment(@new_resource.environment) unless exec.environment
         exec
       end
-      
+
       def action_deploy
         if all_releases.include?(release_path)
           if all_releases[-1] == release_path
@@ -71,7 +71,7 @@ class Chef
           @new_resource.updated_by_last_action(true)
         end
       end
-      
+
       def action_force_deploy
         if all_releases.include?(release_path)
           Chef::Log.info("Already deployed app at #{release_path}, forcing.")
@@ -80,7 +80,7 @@ class Chef
         deploy
         @new_resource.updated_by_last_action(true)
       end
-      
+
       def action_rollback
         if release_path
           rp_index = all_releases.index(release_path)
@@ -88,7 +88,7 @@ class Chef
           rp_index += 1
           releases_to_nuke = all_releases[rp_index..-1]
         else
-          @release_path = all_releases[-2] 
+          @release_path = all_releases[-2]
           raise RuntimeError, "There is no release to rollback to!" unless @release_path
           releases_to_nuke = [ all_releases.last ]
         end
@@ -99,12 +99,12 @@ class Chef
         restart
         releases_to_nuke.each do |i|
           Chef::Log.info "Removing release: #{i}"
-          FileUtils.rm_rf i 
+          FileUtils.rm_rf i
           release_deleted(i)
         end
         @new_resource.updated_by_last_action(true)
       end
-      
+
       def deploy
         Chef::Log.info "deploying branch: #{@new_resource.branch}"
         enforce_ownership
@@ -121,7 +121,7 @@ class Chef
         callback(:after_restart, @new_resource.after_restart)
         cleanup!
       end
-      
+
       def callback(what, callback_code=nil)
         @collection = Chef::ResourceCollection.new
         case callback_code
@@ -140,31 +140,31 @@ class Chef
           raise RuntimeError, "You gave me a callback I don't know what to do with: #{callback_code.inspect}"
         end
       end
-      
+
       def migrate
         run_symlinks_before_migrate
-        
+
         if @new_resource.migrate
           enforce_ownership
-          
+
           environment = @new_resource.environment
-          env_info = environment && environment.map do |key_and_val| 
+          env_info = environment && environment.map do |key_and_val|
             "#{key_and_val.first}='#{key_and_val.last}'"
           end.join(" ")
-          
+
           Chef::Log.info  "Migrating: running #{@new_resource.migration_command} as #{@new_resource.user} " +
                           "with environment #{env_info}"
           run_command(run_options(:command => @new_resource.migration_command, :cwd=>release_path))
         end
       end
-      
+
       def symlink
         Chef::Log.info "Symlinking"
         purge_tempfiles_from_current_release
         link_tempfiles_to_current_release
         link_current_release_to_production
       end
-      
+
       def restart
         if restart_cmd = @new_resource.restart_command
           if restart_cmd.kind_of?(Proc)
@@ -176,7 +176,7 @@ class Chef
           end
         end
       end
-      
+
       def cleanup!
         all_releases[0..-6].each do |old_release|
           Chef::Log.info "Removing old release #{old_release}"
@@ -184,48 +184,49 @@ class Chef
           release_deleted(old_release)
         end
       end
-      
+
       def all_releases
         Dir.glob(@new_resource.deploy_to + "/releases/*").sort
       end
-      
+
       def update_cached_repo
+        @scm_provider.load_current_resource
         if @new_resource.svn_force_export
           svn_force_export
         else
           run_scm_sync
         end
       end
-      
+
       def run_scm_sync
         Chef::Log.info "updating the cached checkout"
         @scm_provider.action_sync
       end
-      
+
       def svn_force_export
         Chef::Log.info "exporting source repository to #{@new_resource.destination}"
         @scm_provider.action_force_export
       end
-      
+
       def copy_cached_repo
         Chef::Log.info "copying the cached checkout to #{release_path}"
         FileUtils.mkdir_p(@new_resource.deploy_to + "/releases")
         run_command(:command => "cp -RPp #{::File.join(@new_resource.destination, ".")} #{release_path}")
         release_created(release_path)
       end
-      
+
       def enforce_ownership
         Chef::Log.info "ensuring proper ownership"
         FileUtils.chown_R(@new_resource.user, @new_resource.group, @new_resource.deploy_to)
       end
-      
+
       def link_current_release_to_production
         Chef::Log.info "Linking release #{release_path} into production at #{@new_resource.current_path}"
         FileUtils.rm_f(@new_resource.current_path)
         FileUtils.ln_sf(release_path, @new_resource.current_path)
         enforce_ownership
       end
-      
+
       def run_symlinks_before_migrate
         links_info = @new_resource.symlink_before_migrate.map { |src, dst| "#{src} => #{dst}" }.join(", ")
         Chef::Log.info "Making pre-migration symlinks: #{links_info}"
@@ -233,12 +234,12 @@ class Chef
           FileUtils.ln_sf(@new_resource.shared_path + "/#{src}", release_path + "/#{dest}")
         end
       end
-      
+
       def link_tempfiles_to_current_release
         dirs_info = @new_resource.create_dirs_before_symlink.join(",")
         Chef::Log.info("creating directories before symlink: #{dirs_info}")
         @new_resource.create_dirs_before_symlink.each { |dir| FileUtils.mkdir_p(release_path + "/#{dir}") }
-        
+
         links_info = @new_resource.symlinks.map { |src, dst| "#{src} => #{dst}" }.join(", ")
         Chef::Log.info("Linking shared paths into current release: #{links_info}")
         @new_resource.symlinks.each do |src, dest|
@@ -247,32 +248,32 @@ class Chef
         run_symlinks_before_migrate
         enforce_ownership
       end
-      
+
       def create_dirs_before_symlink
       end
-      
+
       def purge_tempfiles_from_current_release
         log_info = @new_resource.purge_before_symlink.join(", ")
         Chef::Log.info("Purging directories in checkout #{log_info}")
         @new_resource.purge_before_symlink.each { |dir| FileUtils.rm_rf(release_path + "/#{dir}") }
       end
-      
+
       protected
-      
+
       # Internal callback, called after copy_cached_repo.
       # Override if you need to keep state externally.
       def release_created(release_path)
       end
-      
+
       # Internal callback, called during cleanup! for each old release removed.
       # Override if you need to keep state externally.
       def release_deleted(release_path)
       end
-      
+
       def release_slug
         raise Chef::Exceptions::Override, "You must override release_slug in #{self.to_s}"
       end
-      
+
       def install_gems
         gem_resource_collection_runner.converge
       end
@@ -288,7 +289,7 @@ class Chef
       def gem_packages
         return [] unless ::File.exist?("#{release_path}/gems.yml")
         gems = YAML.load(IO.read("#{release_path}/gems.yml"))
-        
+
         gems.map do |g|
           r = Chef::Resource::GemPackage.new(g[:name])
           r.version g[:version]
@@ -297,14 +298,14 @@ class Chef
           r
         end
       end
-      
+
       def run_options(run_opts={})
         run_opts[:user] = @new_resource.user if @new_resource.user
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts[:environment] = @new_resource.environment if @new_resource.environment
         run_opts
       end
-      
+
       def run_callback_from_file(callback_file)
         if ::File.exist?(callback_file)
           Dir.chdir(release_path) do
@@ -313,7 +314,7 @@ class Chef
           end
         end
       end
-      
+
     end
   end
 end

data/lib/chef/provider/deploy/revision.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,27 +24,27 @@ class Chef
   class Provider
     class Deploy
       class Revision < Chef::Provider::Deploy
-        
+
         def all_releases
           sorted_releases
         end
-        
+
         protected
-        
+
         def release_created(release)
           sorted_releases {|r| r.delete(release); r << release }
         end
-        
+
         def release_deleted(release)
           sorted_releases { |r| r.delete(release)}
         end
-        
+
         def release_slug
           scm_provider.revision_slug
         end
-        
+
         private
-        
+
         def sorted_releases
           cache = load_cache
           if block_given?
@@ -53,7 +53,7 @@ class Chef
           end
           cache
         end
-        
+
         def sorted_releases_from_filesystem
           Dir.glob(new_resource.deploy_to + "/releases/*").sort_by { |d| ::File.ctime(d) }
         end
@@ -65,12 +65,12 @@ class Chef
             sorted_releases_from_filesystem
           end
         end
-        
+
         def save_cache(cache)
           Chef::FileCache.store("revision-deploys/#{new_resource.name}", cache.to_json)
           cache
         end
-        
+
       end
     end
   end

data/lib/chef/provider/package/yum.rb

@@ -108,12 +108,25 @@ class Chef
             if (package_data = @data[package_name])
               if (available_versions = package_data[:available])
                 if arch
-                  matching_versions = available_versions[arch]
+                  # arch gets passed like ".x86_64"
+                  matching_versions = [ available_versions[arch.sub(/^./, '')]]
                 else
                   matching_versions = available_versions.values
                 end
 
+                if matching_versions.nil?
+                  if arch.empty?
+                    arch_msg = ""
+                  else
+                    arch_msg = "with arch #{arch.sub(/^./, '')} "
+                  end
+
+                  raise ArgumentError, "#{package_name}: Found no available versions #{arch_msg}to match"
+                end
+
+                # Expect [ { :version => "ver", :release => "rel" }, { :version => "ver", :release => "rel" }, { :version => "ver", :release => "rel" } ] ???
                 matching_versions.each do |ver|
+                  Chef::Log.debug("#{package_name}: trying to match #{desired_version} to version #{ver[:version]} and release #{ver[:release]}")
                   if (desired_version == "#{ver[:version]}-#{ver[:release]}")
                     return true
                   end
@@ -205,7 +218,7 @@ class Chef
                 :command => "yum -d0 -e0 -y #{@new_resource.options} install #{name}-#{version}#{yum_arch}"
               )
             else
-              raise ArgumentError, "#{new_resource.name}: Version #{version} of #{name} not found. Did you specify both version and release? (version-release, e.g. 1.84-10.fc6)"
+              raise ArgumentError, "#{@new_resource.name}: Version #{version} of #{name} not found. Did you specify both version and release? (version-release, e.g. 1.84-10.fc6)"
             end
           end
           @yum.flush

data/lib/chef/shef/shef_session.rb

@@ -186,7 +186,7 @@ module Shef
       @run_status = Chef::RunStatus.new(@node)
       Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::RemoteFileVendor.new(manifest, Chef::REST.new(Chef::Config[:server_url])) }
       cookbook_hash = @client.sync_cookbooks
-      run_context = Chef::RunContext.new(node, Chef::CookbookCollection.new(cookbook_hash))
+      @run_context = Chef::RunContext.new(node, Chef::CookbookCollection.new(cookbook_hash))
       @run_status.run_context = run_context
     end
 

data/lib/chef/shell_out.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,9 +28,9 @@ class Chef
   # Provides a simplified interface to shelling out yet still collecting both
   # standard out and standard error and providing full control over environment,
   # working directory, uid, gid, etc.
-  # 
+  #
   # No means for passing input to the subprocess is provided, nor is there any
-  # way to inspect the output of the command as it is being read. If you need 
+  # way to inspect the output of the command as it is being read. If you need
   # to do that, you have to use popen4 (in Chef::Mixin::Command)
   #
   # === Platform Support
@@ -41,16 +41,16 @@ class Chef
     READ_SIZE = 4096
     DEFAULT_READ_TIMEOUT = 60
     DEFAULT_ENVIRONMENT = {'LC_ALL' => 'C'}
-    
+
     attr_accessor :user, :group, :cwd, :valid_exit_codes
     attr_reader :command, :umask, :environment
     attr_writer :timeout
     attr_reader :execution_time
-    
+
     attr_reader :stdout, :stderr, :status
-    
+
     attr_reader :stdin_pipe, :stdout_pipe, :stderr_pipe, :process_status_pipe
-    
+
     # === Arguments:
     # Takes a single command, or a list of command fragments. These are used
     # as arguments to Kernel.exec. See the Kernel.exec documentation for more
@@ -97,34 +97,34 @@ class Chef
     def initialize(*command_args)
       @stdout, @stderr = '', ''
       @environment = DEFAULT_ENVIRONMENT
-      @cwd = Dir.tmpdir
+      @cwd = nil
       @valid_exit_codes = [0]
 
       if command_args.last.is_a?(Hash)
         parse_options(command_args.pop)
       end
-      
+
       @command = command_args.size == 1 ? command_args.first : command_args
     end
-    
+
     def umask=(new_umask)
       @umask = (new_umask.respond_to?(:oct) ? new_umask.oct : new_umask.to_i) & 007777
     end
-    
+
     def uid
       return nil unless user
       user.kind_of?(Integer) ? user : Etc.getpwnam(user.to_s).uid
     end
-    
+
     def gid
       return nil unless group
       group.kind_of?(Integer) ? group : Etc.getgrnam(group.to_s).gid
     end
-    
+
     def timeout
       @timeout || DEFAULT_READ_TIMEOUT
     end
-    
+
     # Creates a String showing the output of the command, including a banner
     # showing the exact command executed. Used by +invalid!+ to show command
     # results when the command exited with an unexpected status.
@@ -137,11 +137,11 @@ class Chef
       msg << "Ran #{command} returned #{status.exitstatus}" if status
       msg
     end
-    
+
     def exitstatus
       @status && @status.exitstatus
     end
-    
+
     # Run the command, writing the command's standard out and standard error
     # to +stdout+ and +stderr+, and saving its exit status object to +status+
     # === Returns
@@ -156,13 +156,13 @@ class Chef
     def run_command
       Chef::Log.debug("sh(#{@command})")
       @child_pid = fork_subprocess
-      
+
       configure_parent_process_file_descriptors
       propagate_pre_exec_failure
-        
+
       @result = nil
       @execution_time = 0
-     
+
       # Ruby 1.8.7 and 1.8.6 from mid 2009 try to allocate objects during GC
       # when calling IO.select and IO#read. Some OS Vendors are not interested
       # in updating their ruby packages (Apple, *cough*) and we *have to*
@@ -176,14 +176,14 @@ class Chef
             raise Chef::Exceptions::CommandTimeout, "command timed out:\n#{format_for_exception}"
           end
         end
-        
+
         if ready && ready.first.include?(child_stdout)
           read_stdout_to_buffer
         end
         if ready && ready.first.include?(child_stderr)
           read_stderr_to_buffer
         end
-        
+
         unless @status
           # make one more pass to get the last of the output after the
           # child process dies
@@ -205,8 +205,8 @@ class Chef
       GC.enable
       close_all_pipes
     end
-    
-    # Checks the +exitstatus+ against the set of +valid_exit_codes+. If 
+
+    # Checks the +exitstatus+ against the set of +valid_exit_codes+. If
     # +exitstatus+ is not in the list of +valid_exit_codes+, calls +invalid!+,
     # which raises an Exception.
     # === Returns
@@ -231,15 +231,15 @@ class Chef
       msg ||= "Command produced unexpected results"
       raise Chef::Exceptions::ShellCommandFailed, msg + "\n" + format_for_exception
     end
-    
+
     def inspect
       "<#{self.class.name}##{object_id}: command: '#@command' process_status: #{@status.inspect} " +
-      "stdout: '#{stdout.strip}' stderr: '#{stderr.strip}' child_pid: #{@child_pid.inspect} " + 
+      "stdout: '#{stdout.strip}' stderr: '#{stderr.strip}' child_pid: #{@child_pid.inspect} " +
       "environment: #{@environment.inspect} timeout: #{timeout} user: #@user group: #@group working_dir: #@cwd >"
     end
 
     private
-    
+
     def parse_options(opts)
       opts.each do |option, setting|
         case option.to_s
@@ -263,31 +263,31 @@ class Chef
         end
       end
     end
-    
+
     def set_user
       if user
         Process.euid = uid
         Process.uid = uid
       end
-    end 
-    
+    end
+
     def set_group
       if group
         Process.egid = gid
         Process.gid = gid
       end
     end
-    
+
     def set_environment
       environment.each do |env_var,value|
         ENV[env_var] = value
       end
     end
-    
+
     def set_umask
       File.umask(umask) if umask
     end
-    
+
     def set_cwd
       Dir.chdir(cwd) if cwd
     end
@@ -296,31 +296,31 @@ class Chef
       @stdout_pipe, @stderr_pipe, @process_status_pipe = IO.pipe, IO.pipe, IO.pipe
       @process_status_pipe.last.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
     end
-    
+
     def child_stdout
       @stdout_pipe[0]
     end
-    
+
     def child_stderr
       @stderr_pipe[0]
     end
-    
+
     def child_process_status
       @process_status_pipe[0]
     end
-    
+
     def close_all_pipes
       child_stdout.close  unless child_stdout.closed?
       child_stderr.close  unless child_stderr.closed?
       child_process_status.close unless child_process_status.closed?
     end
-    
+
     # replace stdout, and stderr with pipes to the parent, and close the
     # reader side of the error marshaling side channel. Close STDIN so when we
     # exec, the new program will know it's never getting input ever.
     def configure_subprocess_file_descriptors
       process_status_pipe.first.close
-      
+
       # HACK: for some reason, just STDIN.close isn't good enough when running
       # under ruby 1.9.2, so make it good enough:
       stdin_reader, stdin_writer = IO.pipe
@@ -338,7 +338,7 @@ class Chef
 
       STDOUT.sync = STDERR.sync = true
     end
-    
+
     def configure_parent_process_file_descriptors
       # Close the sides of the pipes we don't care about
       stdout_pipe.last.close
@@ -350,7 +350,7 @@ class Chef
 
       true
     end
-    
+
     # Some patch levels of ruby in wide use (in particular the ruby 1.8.6 on OSX)
     # segfault when you IO.select a pipe that's reached eof. Weak sauce.
     def open_pipes
@@ -365,7 +365,7 @@ class Chef
     rescue EOFError
       open_pipes.delete_at(0)
     end
-    
+
     def read_stderr_to_buffer
       while chunk = child_stderr.read_nonblock(READ_SIZE)
         @stderr << chunk
@@ -374,13 +374,13 @@ class Chef
     rescue EOFError
       open_pipes.delete_at(1)
     end
-    
+
     def fork_subprocess
       initialize_ipc
-      
+
       fork do
         configure_subprocess_file_descriptors
-        
+
         set_user
         set_group
         set_environment
@@ -389,7 +389,7 @@ class Chef
 
         begin
           command.kind_of?(Array) ? exec(*command) : exec(command)
-          
+
           raise 'forty-two' # Should never get here
         rescue Exception => e
           Marshal.dump(e, process_status_pipe.last)
@@ -399,7 +399,7 @@ class Chef
         exit!
       end
     end
-    
+
     # Attempt to get a Marshaled error from the side-channel.
     # If it's there, un-marshal it and raise. If it's not there,
     # assume everything went well.
@@ -413,6 +413,6 @@ class Chef
         child_process_status.close
       end
     end
-    
+
   end
 end

data/lib/chef/version.rb

@@ -17,5 +17,5 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.14.rc.1'
+  VERSION = '0.9.14'
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 15424247
-  prerelease: true
+  hash: 39
+  prerelease: false
   segments: 
   - 0
   - 9
   - 14
-  - rc
-  - 1
-  version: 0.9.14.rc.1
+  version: 0.9.14
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -630,14 +628,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: