chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/resource/gem_package.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.
@@ -21,13 +21,17 @@ require 'chef/resource/package'
 class Chef
   class Resource
     class GemPackage < Chef::Resource::Package
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :gem_package
         @provider = Chef::Provider::Package::Rubygems
       end
 
+      def source(arg=nil)
+        set_or_return(:source, arg, :kind_of => [ String, Array ])
+      end
+
       # Sets a custom gem_binary to run for gem commands.
       def gem_binary(gem_cmd=nil)
         set_or_return(:gem_binary,gem_cmd,:kind_of => [ String ])

data/lib/chef/resource/git.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.
@@ -21,16 +21,16 @@ require "chef/resource/scm"
 class Chef
   class Resource
     class Git < Chef::Resource::Scm
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :git
         @provider = Chef::Provider::Git
       end
-      
+
       alias :branch :revision
       alias :reference :revision
-      
+
     end
   end
 end

data/lib/chef/resource/package.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.
@@ -21,7 +21,7 @@ require 'chef/resource'
 class Chef
   class Resource
     class Package < Chef::Resource
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :package
@@ -34,7 +34,7 @@ class Chef
         @options = nil
         @allowed_actions.push(:install, :upgrade, :remove, :purge)
       end
-      
+
       def package_name(arg=nil)
         set_or_return(
           :package_name,
@@ -42,7 +42,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def version(arg=nil)
         set_or_return(
           :version,
@@ -50,7 +50,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def response_file(arg=nil)
         set_or_return(
           :response_file,
@@ -58,7 +58,7 @@ class Chef
           :kind_of => [ String ]
         )
       end
-      
+
       def source(arg=nil)
         set_or_return(
           :source,

data/lib/chef/resource/scm.rb

@@ -22,7 +22,7 @@ require 'chef/resource'
 class Chef
   class Resource
     class Scm < Chef::Resource
-      
+
       def initialize(name, run_context=nil)
         super
         @destination = name
@@ -33,6 +33,7 @@ class Chef
         @ssh_wrapper = nil
         @depth = nil
         @allowed_actions.push(:checkout, :export, :sync, :diff, :log)
+        @action = [:sync]
       end
 
       def destination(arg=nil)

data/lib/chef/resource/solaris_package.rb

@@ -18,7 +18,6 @@
 
 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,7 +18,6 @@
 
 require 'chef/resource/package'
 require 'chef/provider/package/yum'
-require 'chef/json_compat'
 
 class Chef
   class Resource

data/lib/chef/rest.rb

@@ -298,12 +298,13 @@ class Chef
           retry
         end
         raise Timeout::Error, "Timeout connecting to #{url.host}:#{url.port} for #{rest_request.path}, giving up"
-      rescue Net::HTTPFatalError => e
-        if http_retry_count - http_attempts + 1 > 0
-          sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
-          Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
-          sleep(sleep_time)
-          retry
+      rescue Net::HTTPServerException
+        if res.kind_of?(Net::HTTPForbidden)
+          if http_retry_count - http_attempts + 1 > 0
+            Chef::Log.error("Received 403 Forbidden against #{url.host}:#{url.port} for #{rest_request.path}, retry #{http_attempts}/#{http_retry_count}")
+            sleep(http_retry_delay)
+            retry
+          end
         end
         raise
       end
@@ -358,7 +359,6 @@ class Chef
       headers["Content-Type"] = 'application/json' if json_body
       headers['Content-Length'] = json_body.bytesize.to_s if json_body
       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
     end
 
@@ -374,15 +374,6 @@ class Chef
       response.read_body do |chunk|
         tf.write(chunk)
         size += chunk.size
-        if Chef::Log.verbose
-          if size == 0
-            Chef::Log.debug("#{url.path} done (0 length file)")
-          elsif total == 0
-            Chef::Log.debug("#{url.path} (zero content length or no Content-Length header)")
-          else
-            Chef::Log.debug("#{url.path}" + " %d%% done (%d of %d)" % [(size * 100) / total, size, total])
-          end
-        end
       end
       tf.close
       tf

data/lib/chef/rest/rest_request.rb

@@ -23,26 +23,11 @@
 require 'uri'
 require 'net/http'
 require 'chef/rest/cookie_jar'
-require 'ohai' #used in user agent string.
 require 'chef/version'
 
 class Chef
   class REST
     class RESTRequest
-
-      engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-
-      UA_COMMON = "/#{::Chef::VERSION} (#{engine}-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}; ohai-#{Ohai::VERSION}; #{RUBY_PLATFORM}; +http://opscode.com)"
-      DEFAULT_UA = "Chef Client" << UA_COMMON
-
-      def self.user_agent=(ua)
-        @user_agent = ua
-      end
-
-      def self.user_agent
-        @user_agent ||= DEFAULT_UA
-      end
-
       attr_reader :method, :url, :headers, :http_client, :http_request
 
       def initialize(method, url, req_body, base_headers={})
@@ -196,7 +181,6 @@ class Chef
         @http_request.body = request_body if (request_body && @http_request.request_body_permitted?)
         # Optionally handle HTTP Basic Authentication
         @http_request.basic_auth(url.user, url.password) if url.user
-        @http_request['User-Agent'] = self.class.user_agent
       end
 
     end

data/lib/chef/role.rb

@@ -24,7 +24,7 @@ require 'chef/mixin/from_file'
 require 'chef/couchdb'
 require 'chef/run_list'
 require 'chef/index_queue'
-require 'extlib'
+require 'chef/mash'
 require 'chef/json_compat'
 
 class Chef
@@ -68,7 +68,7 @@ class Chef
       @description = ''
       @default_attributes = Mash.new
       @override_attributes = Mash.new
-      @run_list = Chef::RunList.new
+      @env_run_lists = {"_default" => Chef::RunList.new}
       @couchdb_rev = nil
       @couchdb_id = nil
       @couchdb = couchdb || Chef::CouchDB.new
@@ -104,15 +104,42 @@ class Chef
     end
 
     def run_list(*args)
-      (args.length > 0) ? @run_list.reset!(args) : @run_list
+      if (args.length > 0)
+        @env_run_lists["_default"].reset!(args)
+      end
+      @env_run_lists["_default"]
     end
 
     alias_method :recipes, :run_list
 
-#     def recipes(*args)
-#       Chef::Log.warn "Chef::Role#recipes method is deprecated.  Please use Chef::Role#run_list"
-#       run_list(*args)
-#     end
+    # For run_list expansion
+    def run_list_for(environment)
+      if env_run_lists[environment].nil?
+        env_run_lists["_default"]
+      else
+        env_run_lists[environment]
+      end
+    end
+
+    def active_run_list_for(environment)
+      @env_run_lists.has_key?(environment) ? environment : '_default'
+    end
+
+    # Per environment run lists
+    def env_run_lists(env_run_lists=nil)
+      if (!env_run_lists.nil?)
+        unless env_run_lists.key?("_default")
+          msg = "_default key is required in env_run_lists.\n"
+          msg << "(env_run_lists: #{env_run_lists.inspect})"
+          raise Chef::Exceptions::InvalidEnvironmentRunListSpecification, msg
+        end
+        @env_run_lists.clear
+        env_run_lists.each { |k,v| @env_run_lists[k] = Chef::RunList.new(*Array(v))}
+      end
+      @env_run_lists
+    end
+
+    alias :env_run_list :env_run_lists
 
     def default_attributes(arg=nil)
       set_or_return(
@@ -131,6 +158,8 @@ class Chef
     end
 
     def to_hash
+      env_run_lists_without_default = @env_run_lists.dup
+      env_run_lists_without_default.delete("_default")
       result = {
         "name" => @name,
         "description" => @description,
@@ -138,7 +167,8 @@ class Chef
         "default_attributes" => @default_attributes,
         "override_attributes" => @override_attributes,
         "chef_type" => "role",
-        "run_list" => @run_list.run_list
+        "run_list" => run_list,
+        "env_run_lists" => env_run_lists_without_default
       }
       result["_rev"] = couchdb_rev if couchdb_rev
       result
@@ -149,6 +179,15 @@ class Chef
       to_hash.to_json(*a)
     end
 
+    def update_from!(o)
+      description(o.description)
+      recipes(o.recipes) if defined?(o.recipes)
+      default_attributes(o.default_attributes)
+      override_attributes(o.override_attributes)
+      env_run_lists(o.env_run_lists) unless o.env_run_lists.nil?
+      self
+    end
+
     # Create a Chef::Role from JSON
     def self.json_create(o)
       role = new
@@ -156,11 +195,18 @@ class Chef
       role.description(o["description"])
       role.default_attributes(o["default_attributes"])
       role.override_attributes(o["override_attributes"])
-      role.run_list(if o.has_key?("run_list")
-                      o["run_list"]
-                    else
-                      o["recipes"]
-                    end)
+
+      # _default run_list is in 'run_list' for newer clients, and
+      # 'recipes' for older clients.
+      env_run_list_hash = {"_default" => (o.has_key?("run_list") ? o["run_list"] : o["recipes"])}
+
+      # Clients before 0.10 do not include env_run_lists, so only
+      # merge if it's there.
+      if o["env_run_lists"]
+        env_run_list_hash.merge!(o["env_run_lists"])
+      end
+      role.env_run_lists(env_run_list_hash)
+
       role.couchdb_rev = o["_rev"] if o.has_key?("_rev")
       role.index_id = role.couchdb_id
       role.couchdb_id = o["_id"] if o.has_key?("_id")
@@ -206,6 +252,14 @@ class Chef
       end
     end
 
+    def environment(env_name)
+      chef_server_rest.get_rest("roles/#{@name}/environments/#{env_name}")
+    end
+
+    def environments
+      chef_server_rest.get_rest("roles/#{@name}/environments")
+    end
+
     # Remove this role from the CouchDB
     def cdb_destroy
       couchdb.delete("role", @name, couchdb_rev)

data/lib/chef/run_context.rb

@@ -8,9 +8,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.
@@ -47,32 +47,61 @@ class Chef
       @cookbook_collection = cookbook_collection
       @resource_collection = Chef::ResourceCollection.new
       @definitions = Hash.new
-      
+
       # TODO: 5/18/2010 cw/timh - See note on Chef::Node's
       # cookbook_collection attr_accessor
       node.cookbook_collection = cookbook_collection
+    end
 
-      load
+    def load(run_list_expansion)
+      load_libraries
+      load_lwrp_providers
+      load_lwrp_resources
+      load_attributes
+      load_resource_definitions
+
+      # Precendence rules state that roles' attributes come after
+      # cookbooks. Now we've loaded attributes from cookbooks with
+      # load_attributes, apply the expansion attributes (loaded from
+      # roles) to the node.
+      @node.apply_expansion_attributes(run_list_expansion)
+
+      run_list_expansion.recipes.each do |recipe|
+        # TODO: timh/cw, 5-14-2010: It's distasteful to be including
+        # the DSL in a class outside the context of the DSL
+        include_recipe(recipe)
+      end
     end
 
-    def load
+
+    private
+
+    def load_libraries
       foreach_cookbook_load_segment(:libraries) do |cookbook_name, filename|
         Chef::Log.debug("Loading cookbook #{cookbook_name}'s library file: #{filename}")
         require filename
       end
-      
+    end
+
+    def load_lwrp_providers
       foreach_cookbook_load_segment(:providers) do |cookbook_name, filename|
         Chef::Log.debug("Loading cookbook #{cookbook_name}'s providers from #{filename}")
         Chef::Provider.build_from_file(cookbook_name, filename)
       end
-      
+    end
+
+    def load_lwrp_resources
       foreach_cookbook_load_segment(:resources) do |cookbook_name, filename|
         Chef::Log.debug("Loading cookbook #{cookbook_name}'s resources from #{filename}")
         Chef::Resource.build_from_file(cookbook_name, filename)
       end
+    end
 
+    def load_attributes
       node.load_attributes
+    end
 
+    def load_resource_definitions
       foreach_cookbook_load_segment(:definitions) do |cookbook_name, filename|
         Chef::Log.debug("Loading cookbook #{cookbook_name}'s definitions from #{filename}")
         resourcelist = Chef::ResourceDefinitionList.new
@@ -82,21 +111,8 @@ class Chef
           newval
         end
       end
-
-      # Retrieve the fully expanded list of recipes for the node by
-      # resolving roles; this step also merges attributes into the
-      # node from the roles/recipes included.
-      recipe_names = node.expand!
-
-      recipe_names.each do |recipe_name|
-        # TODO: timh/cw, 5-14-2010: It's distasteful to be including
-        # the DSL in a class outside the context of the DSL
-        include_recipe(recipe_name)
-      end
     end
 
-    private
-    
     def foreach_cookbook_load_segment(segment, &block)
       cookbook_collection.each do |cookbook_name, cookbook|
         segment_filenames = cookbook.segment_filenames(segment)
@@ -105,6 +121,6 @@ class Chef
         end
       end
     end
-    
+
   end
 end