chef 0.10.8 → 0.10.10.beta.1

data/lib/chef/resource/mdadm.rb

@@ -21,7 +21,7 @@ require 'chef/resource'
 class Chef
   class Resource
     class Mdadm < Chef::Resource
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :mdadm
@@ -30,6 +30,7 @@ class Chef
         @devices = []
         @exists = false
         @level = 1
+        @metadata = "0.90"
         @raid_device = name
 
         @action = :create
@@ -68,6 +69,14 @@ class Chef
         )
       end
 
+      def metadata(arg=nil)
+        set_or_return(
+          :metadata,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
       def raid_device(arg=nil)
         set_or_return(
           :raid_device,

data/lib/chef/resource/remote_directory.rb

@@ -17,11 +17,16 @@
 #
 
 require 'chef/resource/directory'
+require 'chef/provider/remote_directory'
+require 'chef/mixin/securable'
 
 class Chef
   class Resource
     class RemoteDirectory < Chef::Resource::Directory
-      
+      include Chef::Mixin::Securable
+
+      provides :remote_directory, :on_platforms => :all
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :remote_directory
@@ -34,10 +39,11 @@ class Chef
         @files_backup = 5
         @files_owner = nil
         @files_group = nil
-        @files_mode = 0644
+        @files_mode = 0644 unless Chef::Platform.windows?
         @overwrite = true
         @allowed_actions.push(:create, :create_if_missing, :delete)
         @cookbook = nil
+        @provider = Chef::Provider::RemoteDirectory
       end
 
       def source(args=nil)
@@ -72,6 +78,11 @@ class Chef
         )
       end
 
+      if Chef::Platform.windows?
+        # create a second instance of the 'rights' attribute
+        Chef::Mixin::Securable.rights_attribute(:files_rights)
+      end
+
       def files_mode(arg=nil)
         set_or_return(
           :files_mode,

data/lib/chef/resource/remote_file.rb

@@ -1,14 +1,15 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2011 Opscode, Inc.
 # 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.
@@ -17,19 +18,25 @@
 #
 
 require 'chef/resource/file'
+require 'chef/provider/remote_file'
+require 'chef/mixin/securable'
 
 class Chef
   class Resource
     class RemoteFile < Chef::Resource::File
-      
+      include Chef::Mixin::Securable
+
+      provides :remote_file, :on_platforms => :all
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :remote_file
         @action = "create"
         @source = ::File.basename(name)
         @cookbook = nil
+        @provider = Chef::Provider::RemoteFile
       end
-      
+
       def source(args=nil)
         set_or_return(
           :source,
@@ -37,7 +44,7 @@ class Chef
           :kind_of => String
         )
       end
-      
+
       def cookbook(args=nil)
         set_or_return(
           :cookbook,
@@ -71,7 +78,7 @@ class Chef
       end
 
       private
-      
+
       def absolute_uri?(source)
         URI.parse(source).absolute?
       rescue URI::InvalidURIError

data/lib/chef/resource/smartos_package.rb

@@ -0,0 +1,36 @@
+#
+# Author:: Toomas Pelberg (<toomasp@gmx.net>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# 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 'chef/resource/package'
+require 'chef/provider/package/smartos'
+
+class Chef
+  class Resource
+    class SmartOSPackage < Chef::Resource::Package
+        
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :smartos_package
+        @provider = Chef::Provider::Package::SmartOS
+      end
+      
+    end
+  end
+end
+
+

data/lib/chef/resource/template.rb

@@ -1,14 +1,15 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2011 Opscode, Inc.
 # 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.
@@ -17,11 +18,16 @@
 #
 
 require 'chef/resource/file'
+require 'chef/provider/template'
+require 'chef/mixin/securable'
 
 class Chef
   class Resource
     class Template < Chef::Resource::File
-      
+      include Chef::Mixin::Securable
+
+      provides :template, :on_platforms => :all
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :template
@@ -30,6 +36,7 @@ class Chef
         @cookbook = nil
         @local = false
         @variables = Hash.new
+        @provider = Chef::Provider::Template
       end
 
       def source(file=nil)
@@ -47,7 +54,7 @@ class Chef
           :kind_of => [ Hash ]
         )
       end
-      
+
       def cookbook(args=nil)
         set_or_return(
           :cookbook,

data/lib/chef/resource_platform_map.rb

@@ -0,0 +1,153 @@
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# 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 'chef/mixin/params_validate'
+require 'chef/mixin/convert_to_class_name'
+
+class Chef
+  class Resource
+    class PlatformMap
+
+      include Chef::Mixin::ParamsValidate
+      include Chef::Mixin::ConvertToClassName
+
+      attr_reader :map
+
+      def initialize(map={:default => {}})
+        @map = map
+      end
+
+      def filter(platform, version)
+        resource_map = map[:default].clone
+        platform_sym = platform
+        if platform.kind_of?(String)
+          platform.downcase!
+          platform.gsub!(/\s/, "_")
+          platform_sym = platform.to_sym
+        end
+
+        if map.has_key?(platform_sym)
+          if map[platform_sym].has_key?(version)
+            Chef::Log.debug("Platform #{platform_sym} version #{version} found")
+            if map[platform_sym].has_key?(:default)
+              resource_map.merge!(map[platform_sym][:default])
+            end
+            resource_map.merge!(map[platform_sym][version])
+          elsif map[platform_sym].has_key?(:default)
+            resource_map.merge!(map[platform_sym][:default])
+          end
+        else
+          Chef::Log.debug("Platform #{platform} not found, using all defaults. (Unsupported platform?)")
+        end
+        resource_map
+      end
+
+      def set(args)
+        validate(
+          args,
+          {
+            :platform => {
+              :kind_of => Symbol,
+              :required => false
+            },
+            :version => {
+              :kind_of => String,
+              :required => false
+            },
+            :short_name => {
+              :kind_of => Symbol,
+              :required => true
+            },
+            :resource => {
+              :kind_of => [ String, Symbol, Class ],
+              :required => true
+            }
+          }
+        )
+        if args.has_key?(:platform)
+          if args.has_key?(:version)
+            if map.has_key?(args[:platform])
+              if map[args[:platform]].has_key?(args[:version])
+                map[args[:platform]][args[:version]][args[:short_name].to_sym] = args[:resource]
+              else
+                map[args[:platform]][args[:version]] = {
+                  args[:short_name].to_sym => args[:resource]
+                }
+              end
+            else
+              map[args[:platform]] = {
+                args[:version] => {
+                  args[:short_name].to_sym => args[:resource]
+                }
+              }
+            end
+          else
+            if map.has_key?(args[:platform])
+              if map[args[:platform]].has_key?(:default)
+                map[args[:platform]][:default][args[:short_name].to_sym] = args[:resource]
+              else
+                map[args[:platform]] = { :default => { args[:short_name].to_sym => args[:resource] } }
+              end
+            else
+              map[args[:platform]] = {
+                :default => {
+                  args[:short_name].to_sym => args[:resource]
+                }
+              }
+            end
+          end
+        else
+          if map.has_key?(:default)
+            map[:default][args[:short_name].to_sym] = args[:resource]
+          else
+            map[:default] = {
+              args[:short_name].to_sym => args[:resource]
+            }
+          end
+        end
+      end
+
+      def get(short_name, platform=nil, version=nil)
+        resource_klass = platform_resource(short_name, platform, version) ||
+                         resource_matching_short_name(short_name)
+
+        raise NameError, "Cannot find a resource for #{short_name} on #{platform} version #{version}" if resource_klass.nil?
+
+        resource_klass
+      end
+
+      private
+
+      def platform_resource(short_name, platform, version)
+        pmap = filter(platform, version)
+        rtkey = short_name.kind_of?(Chef::Resource) ? short_name.resource_name.to_sym : short_name
+        pmap.has_key?(rtkey) ? pmap[rtkey] : nil
+      end
+
+      def resource_matching_short_name(short_name)
+        begin
+          rname = convert_to_class_name(short_name.to_s)
+          Chef::Resource.const_get(rname)
+        rescue NameError
+          nil
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/resources.rb

@@ -20,6 +20,7 @@ require 'chef/resource/apt_package'
 require 'chef/resource/bash'
 require 'chef/resource/breakpoint'
 require 'chef/resource/cookbook_file'
+require 'chef/resource/chef_gem'
 require 'chef/resource/cron'
 require 'chef/resource/csh'
 require 'chef/resource/deploy'
@@ -58,6 +59,7 @@ require 'chef/resource/scm'
 require 'chef/resource/script'
 require 'chef/resource/service'
 require 'chef/resource/subversion'
+require 'chef/resource/smartos_package'
 require 'chef/resource/template'
 require 'chef/resource/timestamped_deploy'
 require 'chef/resource/user'

data/lib/chef/rest.rb

@@ -20,6 +20,7 @@
 # limitations under the License.
 #
 
+require 'zlib'
 require 'net/https'
 require 'uri'
 require 'chef/json_compat'
@@ -27,15 +28,28 @@ require 'tempfile'
 require 'chef/rest/auth_credentials'
 require 'chef/rest/rest_request'
 require 'chef/monkey_patches/string'
+require 'chef/config'
 
 class Chef
   # == Chef::REST
   # Chef's custom REST client with built-in JSON support and RSA signed header
   # authentication.
   class REST
+
+    class NoopInflater
+      def inflate(chunk)
+        chunk
+      end
+    end
+
     attr_reader :auth_credentials
     attr_accessor :url, :cookies, :sign_on_redirect, :redirect_limit
 
+    CONTENT_ENCODING  = "content-encoding".freeze
+    GZIP              = "gzip".freeze
+    DEFLATE           = "deflate".freeze
+    IDENTITY          = "identity".freeze
+
     # Create a REST client object. The supplied +url+ is used as the base for
     # all subsequent requests. For example, when initialized with a base url
     # http://localhost:4000, a call to +get_rest+ with 'nodes' will make an
@@ -173,7 +187,7 @@ class Chef
       json_body.force_encoding(Encoding::BINARY) if json_body.respond_to?(:force_encoding)
       headers = build_headers(method, url, headers, json_body, raw)
 
-      tf = nil
+      tf, response_body = nil, nil
 
       retriable_rest_request(method, url, json_body, headers) do |rest_request|
 
@@ -181,13 +195,12 @@ class Chef
           if raw
             tf = stream_to_tempfile(url, response)
           else
-            response.read_body
+            response_body = decompress_body(response)
           end
         end
 
         if res.kind_of?(Net::HTTPSuccess)
           if res['content-type'] =~ /json/
-            response_body = res.body.chomp
             Chef::JSONCompat.from_json(response_body)
           else
             if method == :HEAD
@@ -195,7 +208,7 @@ class Chef
             elsif raw
               tf
             else
-              res.body
+              response_body
             end
           end
         elsif res.kind_of?(Net::HTTPFound) or res.kind_of?(Net::HTTPMovedPermanently)
@@ -204,7 +217,7 @@ class Chef
           false
         else
           if res['content-type'] =~ /json/
-            exception = Chef::JSONCompat.from_json(res.body)
+            exception = Chef::JSONCompat.from_json(response_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)
@@ -226,18 +239,23 @@ class Chef
       retriable_rest_request(method, url, json_body, headers) do |rest_request|
         response = rest_request.call {|r| r.read_body}
 
+        response_body = decompress_body(response)
+
         if response.kind_of?(Net::HTTPSuccess)
           if response['content-type'] =~ /json/
-            Chef::JSONCompat.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
+            response_body
           end
         elsif redirect_location = redirected_to(response)
           follow_redirect {api_request(:GET, create_url(redirect_location))}
         else
+          # have to decompress the body before making an exception for it. But the body could be nil.
+          response.body.replace(decompress_body(response)) if response.body.respond_to?(:replace)
+
           if response['content-type'] =~ /json/
-            exception = Chef::JSONCompat.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.info(msg)
@@ -247,6 +265,19 @@ class Chef
       end
     end
 
+    def decompress_body(response)
+      case response[CONTENT_ENCODING]
+      when GZIP
+        Chef::Log.debug "decompressing gzip response"
+        Zlib::Inflate.new(Zlib::MAX_WBITS + 16).inflate(response.body)
+      when DEFLATE
+        Chef::Log.debug "decompressing deflate response"
+        Zlib::Inflate.inflate(response.body)
+      else
+        response.body
+      end
+    end
+
     # Makes a streaming download request. <b>Doesn't speak JSON.</b>
     # Streams the response body to a tempfile. If a block is given, it's
     # passed to Tempfile.open(), which means that the tempfile will automatically
@@ -368,9 +399,11 @@ class Chef
 
     def build_headers(method, url, headers={}, json_body=false, raw=false)
       headers                 = @default_headers.merge(headers)
+      #headers['Accept']       = "application/json" unless raw
       headers['Accept']       = "application/json" unless raw
       headers["Content-Type"] = 'application/json' if json_body
       headers['Content-Length'] = json_body.bytesize.to_s if json_body
+      headers[RESTRequest::ACCEPT_ENCODING] = RESTRequest::ENCODING_GZIP_DEFLATE
       headers.merge!(authentication_headers(method, url, json_body)) if sign_requests?
       headers.merge!(Chef::Config[:custom_http_headers]) if Chef::Config[:custom_http_headers]
       headers
@@ -378,15 +411,27 @@ class Chef
 
     def stream_to_tempfile(url, response)
       tf = Tempfile.open("chef-rest")
-      if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+      if Chef::Platform.windows?
         tf.binmode #required for binary files on Windows platforms
       end
       Chef::Log.debug("Streaming download from #{url.to_s} to tempfile #{tf.path}")
       # Stolen from http://www.ruby-forum.com/topic/166423
       # Kudos to _why!
       size, total = 0, response.header['Content-Length'].to_i
+
+      inflater = case response[CONTENT_ENCODING]
+      when GZIP
+        Chef::Log.debug "decompressing gzip stream"
+        Zlib::Inflate.new(Zlib::MAX_WBITS + 16)
+      when DEFLATE
+        Chef::Log.debug "decompressing inflate stream"
+        Zlib::Inflate.new
+      else
+        NoopInflater.new
+      end
+
       response.read_body do |chunk|
-        tf.write(chunk)
+        tf.write(inflater.inflate(chunk))
         size += chunk.size
       end
       tf.close