chef 0.9.14.beta.1 → 0.9.14.rc.1

data/lib/chef/provider/service/simple.rb

@@ -49,7 +49,7 @@ class Chef
               @current_resource.running false
               nil
             end
-          elsif
+          else
             Chef::Log.debug "#{@new_resource}: falling back to process table inspection"
             if ps_cmd.nil? or ps_cmd.empty?
               raise Chef::Exceptions::Service, "#{@new_resource}: could not determine how to inspect the process table, please set this nodes 'command.ps' attribute"

data/lib/chef/resource/solaris_package.rb

@@ -18,6 +18,7 @@
 
 require 'chef/resource/package'
 require 'chef/provider/package/solaris'
+require 'chef/json_compat'
 
 class Chef
   class Resource

data/lib/chef/resource/yum_package.rb

@@ -18,6 +18,7 @@
 
 require 'chef/resource/package'
 require 'chef/provider/package/yum'
+require 'chef/json_compat'
 
 class Chef
   class Resource

data/lib/chef/rest.rb

@@ -22,7 +22,7 @@
 
 require 'net/https'
 require 'uri'
-require 'chef/json'
+require 'chef/json_compat'
 require 'tempfile'
 require 'chef/api_client'
 require 'chef/rest/auth_credentials'
@@ -79,9 +79,10 @@ class Chef
             Chef::Log.debug("Registration response: #{response.inspect}")
             raise Chef::Exceptions::CannotWritePrivateKey, "The response from the server did not include a private key!" unless response.has_key?("private_key")
             # Write out the private key
-            file = ::File.open(destination, File::WRONLY|File::EXCL|File::CREAT, 0600)
-            file.print(response["private_key"])
-            file.close
+            ::File.open(destination, "w") {|f|
+              f.chmod(0600)
+              f.print(response["private_key"])
+            }
             throw :done
           rescue IOError
             raise Chef::Exceptions::CannotWritePrivateKey, "I cannot write your private key to #{destination}"
@@ -162,7 +163,7 @@ class Chef
     #
     # Will return the body of the response on success.
     def run_request(method, url, headers={}, data=false, limit=nil, raw=false)
-      json_body = data ? Chef::JSON.to_json(data) : nil
+      json_body = data ? Chef::JSONCompat.to_json(data) : nil
       headers = build_headers(method, url, headers, json_body, raw)
 
       tf = nil
@@ -180,7 +181,7 @@ class Chef
         if res.kind_of?(Net::HTTPSuccess)
           if res['content-type'] =~ /json/
             response_body = res.body.chomp
-            Chef::JSON.from_json(response_body)
+            Chef::JSONCompat.from_json(response_body)
           else
             if method == :HEAD
               true
@@ -196,7 +197,7 @@ class Chef
           false
         else
           if res['content-type'] =~ /json/
-            exception = Chef::JSON.from_json(res.body)
+            exception = Chef::JSONCompat.from_json(res.body)
             msg = "HTTP Request Returned #{res.code} #{res.message}: "
             msg << (exception["error"].respond_to?(:join) ? exception["error"].join(", ") : exception["error"].to_s)
             Chef::Log.warn(msg)
@@ -208,7 +209,7 @@ class Chef
 
     # Runs an HTTP request to a JSON API. File Download not supported.
     def api_request(method, url, headers={}, data=false)
-      json_body = data ? Chef::JSON.to_json(data) : nil
+      json_body = data ? Chef::JSONCompat.to_json(data) : nil
       headers = build_headers(method, url, headers, json_body)
 
       retriable_rest_request(method, url, json_body, headers) do |rest_request|
@@ -216,7 +217,7 @@ class Chef
 
         if response.kind_of?(Net::HTTPSuccess)
           if response['content-type'] =~ /json/
-            Chef::JSON.from_json(response.body.chomp)
+            Chef::JSONCompat.from_json(response.body.chomp)
           else
             Chef::Log.warn("Expected JSON response, but got content-type '#{response['content-type']}'")
             response.body
@@ -225,7 +226,7 @@ class Chef
           follow_redirect {api_request(:GET, create_url(redirect_location))}
         else
           if response['content-type'] =~ /json/
-            exception = Chef::JSON.from_json(response.body)
+            exception = Chef::JSONCompat.from_json(response.body)
             msg = "HTTP Request Returned #{response.code} #{response.message}: "
             msg << (exception["error"].respond_to?(:join) ? exception["error"].join(", ") : exception["error"].to_s)
             Chef::Log.warn(msg)
@@ -246,7 +247,7 @@ class Chef
       headers = build_headers(:GET, url, headers, nil, true)
       retriable_rest_request(:GET, url, nil, headers) do |rest_request|
         tempfile = nil
-        response = rest_request.call do |r| 
+        response = rest_request.call do |r|
           if block_given? && r.kind_of?(Net::HTTPSuccess)
             begin
               tempfile = stream_to_tempfile(url, r, &block)

data/lib/chef/role.rb

@@ -25,7 +25,7 @@ require 'chef/couchdb'
 require 'chef/run_list'
 require 'chef/index_queue'
 require 'extlib'
-require 'chef/json'
+require 'chef/json_compat'
 
 class Chef
   class Role
@@ -255,7 +255,7 @@ class Chef
       rb_file = File.join(Chef::Config[:role_path], "#{name}.rb")
 
       if File.exists?(js_file) || force == "json"
-        Chef::JSON.from_json(IO.read(js_file))
+        Chef::JSONCompat.from_json(IO.read(js_file))
       elsif File.exists?(rb_file) || force == "ruby"
         role = Chef::Role.new
         role.name(name)

data/lib/chef/shef.rb

@@ -24,8 +24,9 @@ require 'chef/version'
 require "chef/client"
 require "chef/config"
 
-require "chef/shef/shef_session"
-require "chef/shef/ext"
+require 'chef/shef/shef_session'
+require 'chef/shef/ext'
+require 'chef/json_compat'
 
 # = Shef
 # Shef is Chef in an IRB session. Shef can interact with a Chef server via the
@@ -163,7 +164,7 @@ module Shef
       end
 
       begin
-        @json_attribs = Chef::JSON.from_json(json_io.read)
+        @json_attribs = Chef::JSONCompat.from_json(json_io.read)
       rescue JSON::ParserError => error
         fatal!("Could not parse the provided JSON file (#{Chef::Config[:json_attribs]})!: " + error.message, 2)
       end

data/lib/chef/shef/ext.rb

@@ -23,6 +23,7 @@ require 'chef/version'
 require 'chef/shef/shef_session'
 require 'chef/shef/model_wrapper'
 require 'chef/shef/shef_rest'
+require 'chef/json_compat'
 
 module Shef
   module Extensions
@@ -327,13 +328,13 @@ E
 
         edited_data = Tempfile.open([filename, ".js"]) do |tempfile|
           tempfile.sync = true
-          tempfile.puts Chef::JSON.to_json(object)
+          tempfile.puts Chef::JSONCompat.to_json(object)
           system("#{Shef.editor.to_s} #{tempfile.path}")
           tempfile.rewind
           tempfile.read
         end
 
-        Chef::JSON.from_json(edited_data)
+        Chef::JSONCompat.from_json(edited_data)
       end
 
       desc "Find and edit API clients"

data/lib/chef/shell_out.rb

@@ -288,6 +288,10 @@ class Chef
       File.umask(umask) if umask
     end
     
+    def set_cwd
+      Dir.chdir(cwd) if cwd
+    end
+
     def initialize_ipc
       @stdout_pipe, @stderr_pipe, @process_status_pipe = IO.pipe, IO.pipe, IO.pipe
       @process_status_pipe.last.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
@@ -381,6 +385,7 @@ class Chef
         set_group
         set_environment
         set_umask
+        set_cwd
 
         begin
           command.kind_of?(Array) ? exec(*command) : exec(command)

data/lib/chef/tasks/chef_repo.rake

@@ -17,7 +17,7 @@
 #
 
 require 'rubygems'
-require 'chef/json'
+require 'chef/json_compat'
 require 'chef'
 require 'chef/role'
 require 'chef/cookbook/metadata'

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.beta.1'
+  VERSION = '0.9.14.rc.1'
 end

data/lib/chef/webui_user.rb

@@ -22,7 +22,7 @@ require 'chef/mixin/params_validate'
 require 'chef/couchdb'
 require 'chef/index_queue'
 require 'digest/sha1'
-require 'chef/json'
+require 'chef/json_compat'
   
 
 class Chef

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 62196289
+  hash: 15424247
   prerelease: true
   segments: 
   - 0
   - 9
   - 14
-  - beta
+  - rc
   - 1
-  version: 0.9.14.beta.1
+  version: 0.9.14.rc.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -405,6 +405,7 @@ files:
 - lib/chef/monkey_patches/dir.rb
 - lib/chef/monkey_patches/string.rb
 - lib/chef/monkey_patches/numeric.rb
+- lib/chef/monkey_patches/regexp.rb
 - lib/chef/monkey_patches/tempfile.rb
 - lib/chef/shef.rb
 - lib/chef/handler/json_file.rb
@@ -601,7 +602,7 @@ files:
 - lib/chef/mixin/command.rb
 - lib/chef/mixin/params_validate.rb
 - lib/chef/mixin/language_include_attribute.rb
-- lib/chef/json.rb
+- lib/chef/json_compat.rb
 - lib/chef/knife.rb
 - lib/chef.rb
 - bin/chef-client