chef 0.9.6 → 0.9.8.beta.1

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

@@ -90,7 +90,7 @@ class Chef
           if ::File.exists?("/etc/rc.conf")
             read_rc_conf.each do |line|
               case line
-              when /#{service_enable_variable_name}="(\w+)"/
+              when /#{Regexp.escape(service_enable_variable_name)}="(\w+)"/
                 if $1 =~ /[Yy][Ee][Ss]/
                   @current_resource.enabled true
                 elsif $1 =~ /[Nn][Oo][Nn]?[Oo]?[Nn]?[Ee]?/

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

@@ -44,16 +44,9 @@ class Chef
           run_context.node
           
           platform, version = Chef::Platform.find_platform_and_version(run_context.node)
-          case platform
-          when "ubuntu"
-            case version
-            when /8.04/,/8.10/,/9.04/,/10.04/
-              @upstart_job_dir = "/etc/event.d"
-              @upstart_conf_suffix = ""
-            else
-              @upstart_job_dir = "/etc/init"
-              @upstart_conf_suffix = ".conf"
-            end
+          if platform == "ubuntu" && (8.04..9.04).include?(version.to_f)
+            @upstart_job_dir = "/etc/event.d"
+            @upstart_conf_suffix = ""
           else
             @upstart_job_dir = "/etc/init"
             @upstart_conf_suffix = ".conf"

data/lib/chef/provider/user/dscl.rb

@@ -52,7 +52,7 @@ class Chef
           uid = nil; next_uid_guess = 200
           users_uids = safe_dscl("list /Users uid")
           while(next_uid_guess < search_limit + 200)
-            if users_uids =~ Regexp.new("#{next_uid_guess}\n")
+            if users_uids =~ Regexp.new("#{Regexp.escape(next_uid_guess.to_s)}\n")
               next_uid_guess += 1
             else
               uid = next_uid_guess
@@ -65,7 +65,7 @@ class Chef
         def uid_used?(uid)
           return false unless uid
           users_uids = safe_dscl("list /Users uid")
-          !! ( users_uids =~ Regexp.new("#{uid}\n") )
+          !! ( users_uids =~ Regexp.new("#{Regexp.escape(uid.to_s)}\n") )
         end
 
         def set_uid

data/lib/chef/providers.rb

@@ -57,6 +57,7 @@ require 'chef/provider/package/rpm'
 require 'chef/provider/package/rubygems'
 require 'chef/provider/package/yum'
 require 'chef/provider/package/zypper'
+require 'chef/provider/package/solaris'
 
 require 'chef/provider/service/arch'
 require 'chef/provider/service/debian'

data/lib/chef/resource.rb

@@ -28,7 +28,10 @@ require 'chef/mixin/deprecation'
 
 class Chef
   class Resource
-    HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name]
+    class Notification < Struct.new(:resource, :action)
+    end
+
+    HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node]
 
     include Chef::Mixin::CheckHelper
     include Chef::Mixin::ParamsValidate
@@ -211,12 +214,10 @@ class Chef
     end
 
     def to_text
-      skip = 
       ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS
       text = "# Declared in #{@source_line}\n"
-      text << convert_to_snake_case(self.class.name, 'Chef::Resource') + "(#{name}) do\n"
+      text << convert_to_snake_case(self.class.name, 'Chef::Resource') + "(\"#{name}\") do\n"
       ivars.each do |ivar|
-        #next if skip.include?(ivar)
         if (value = instance_variable_get(ivar)) && !(value.respond_to?(:empty?) && value.empty?)
           text << "  #{ivar.to_s.sub(/^@/,'')}(#{value.inspect})\n"
         end
@@ -242,8 +243,6 @@ class Chef
     def to_hash
       instance_vars = Hash.new
       self.instance_variables.each do |iv|
-        #iv = iv.to_s
-        #next if iv == "@run_context"
         key = iv.to_s.sub(/^@/,'').to_sym
         instance_vars[key] = self.instance_variable_get(iv) unless (key == :run_context) || (key == :node)
       end
@@ -385,7 +384,7 @@ class Chef
         begin
           self.class.provider_base.const_get(convert_to_class_name(name.to_s))
         rescue NameError => e
-          if e.to_s =~ /#{self.class.provider_base.to_s}/
+          if e.to_s =~ /#{Regexp.escape(self.class.provider_base.to_s)}/
             raise ArgumentError, "No provider found to match '#{name}'"
           else
             raise e
@@ -404,7 +403,7 @@ class Chef
         
         resource_array = [resources].flatten
         resource_array.each do |resource|
-          new_notify = OpenStruct.new(:resource => resource, :action => action)
+          new_notify = Notification.new(resource, action)
           if timing == :delayed
             notifies_delayed << new_notify
           else

data/lib/chef/resource/service.rb

@@ -34,6 +34,7 @@ class Chef
         @status_command = nil
         @restart_command = nil
         @reload_command = nil
+        @priority = nil
         @action = "nothing"
         @startup_type = :automatic
         @supports = { :restart => false, :reload => false, :status => false }
@@ -119,6 +120,22 @@ class Chef
         )
       end
 
+      # Priority arguments can have two forms:
+      #
+      # - a simple number, in which the default start runlevels get
+      #   that as the start value and stop runlevels get 100 - value.
+      #
+      # - a hash like { 2 => [:start, 20], 3 => [:stop, 55] }, where
+      #   the service will be marked as started with priority 20 in
+      #   runlevel 2, stopped in 3 with priority 55 and no symlinks or
+      #   similar for other runlevels
+      #
+      def priority(arg=nil)
+        set_or_return(:priority,
+                      arg,
+                      :kind_of => [ Integer, String, Hash ])
+      end
+
       def supports(args={})
         if args.is_a? Array
           args.each { |arg| @supports[arg] = true }

data/lib/chef/resource/solaris_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/solaris'
+
+class Chef
+  class Resource
+    class SolarisPackage < Chef::Resource::Package
+        
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :solaris_package
+        @provider = Chef::Provider::Package::Solaris
+      end
+      
+    end
+  end
+end
+
+

data/lib/chef/resource/yum_package.rb

@@ -22,15 +22,22 @@ require 'chef/provider/package/yum'
 class Chef
   class Resource
     class YumPackage < Chef::Resource::Package
-      
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :yum_package
         @provider = Chef::Provider::Package::Yum
       end
-      
+
+      # Install a specific arch
+      def arch(arg=nil)
+        set_or_return(
+          :arch,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
     end
   end
 end
-
-

data/lib/chef/rest/rest_request.rb

@@ -103,8 +103,25 @@ class Chef
         end
       end
 
+      #adapted from buildr/lib/buildr/core/transports.rb
+      def proxy_uri
+        proxy = Chef::Config["#{url.scheme}_proxy"]
+        proxy = URI.parse(proxy) if String === proxy
+        excludes = Chef::Config[:no_proxy].to_s.split(/\s*,\s*/).compact
+        excludes = excludes.map { |exclude| exclude =~ /:\d+$/ ? exclude : "#{exclude}:*" }
+        return proxy unless excludes.any? { |exclude| File.fnmatch(exclude, "#{host}:#{port}") }
+      end
+
       def configure_http_client
-        @http_client = Net::HTTP.new(host, port)
+        http_proxy = proxy_uri
+        if http_proxy.nil?
+          @http_client = Net::HTTP.new(host, port)
+        else
+          Chef::Log.debug("using #{http_proxy.host}:#{http_proxy.port} for proxy")
+          user = Chef::Config["#{url.scheme}_proxy_user"]
+          pass = Chef::Config["#{url.scheme}_proxy_pass"]
+          @http_client = Net::HTTP.Proxy(http_proxy.host, http_proxy.port, user, pass).new(host, port)
+        end
         if url.scheme == "https"
           @http_client.use_ssl = true
           if config[:ssl_verify_mode] == :verify_none

data/lib/chef/run_list/run_list_expansion.rb

@@ -105,6 +105,10 @@ class Chef
         @applied_roles[role_name] = true
       end
 
+      def roles
+        @applied_roles.keys
+      end
+
       # In subclasses, this method will fetch the role from the data source.
       def fetch_role(name)
         raise NotImplementedError

data/lib/chef/run_list/run_list_item.rb

@@ -28,7 +28,7 @@ class Chef
       def initialize(item)
         case item
         when Hash
-          raise ArgumentError, "Initializing a #{self.class} from a hash requires that it have a 'type' and 'name' key" unless (item.has_key?('type')||item.has_key?(:type)) && (item.has_key?('name')||item.has_key?(:name))
+          assert_hash_is_valid_run_list_item!(item)
           @type = (item['type'] || item[:type]).to_sym
           @name = item['name'] || item[:name]
         when String
@@ -66,6 +66,13 @@ class Chef
           other.respond_to?(:type) && other.respond_to?(:name) && other.type == @type && other.name == @name
         end
       end
+
+      def assert_hash_is_valid_run_list_item!(item)
+        unless (item.key?('type')|| item.key?(:type)) && (item.key?('name') || item.key?(:name))
+          raise ArgumentError, "Initializing a #{self.class} from a hash requires that it have a 'type' and 'name' key"
+        end
+      end
+
     end
   end
 end

data/lib/chef/shef/ext.rb

@@ -241,7 +241,7 @@ class Object
               :skip_back    => "move back in the run list",
               :skip_forward => "move forward in the run list"
   def chef_run
-    Shef.session.collection.iterator
+    Shef.session.resource_collection.iterator
   end
   
   desc "resets the current recipe"

data/lib/chef/shef/shef_session.rb

@@ -15,6 +15,13 @@
 # limitations under the License.
 #
 
+require 'chef/recipe'
+require 'chef/run_context'
+require 'chef/config'
+require 'chef/client'
+require 'chef/cookbook/cookbook_collection'
+require 'chef/cookbook_loader'
+
 module Shef
   class ShefSession
     include Singleton
@@ -126,7 +133,6 @@ module Shef
       Chef::Config[:solo] = true
       @client = Chef::Client.new
       @client.run_ohai
-      @client.determine_node_name
       @client.build_node #(@client.node_name, true)
     end
     
@@ -149,7 +155,6 @@ module Shef
       Chef::Config[:solo] = true
       @client = Chef::Client.new
       @client.run_ohai
-      @client.determine_node_name
       @client.build_node #(@client.node_name, true)
     end
     
@@ -168,7 +173,6 @@ module Shef
       Chef::Config[:solo] = false
       @client = Chef::Client.new
       @client.run_ohai
-      @client.determine_node_name
       @client.register
       @client.build_node #(@client.node_name, false)
       

data/lib/chef/tasks/chef_repo.rake

@@ -77,6 +77,7 @@ task :default => [ :test_cookbooks ]
 
 desc "Create a new cookbook (with COOKBOOK=name, optional CB_PREFIX=site-)"
 task :new_cookbook do
+  puts "***WARN: rake new_cookbook is deprecated. Please use 'knife cookbook new COOKBOOK' command.***"
   create_cookbook(File.join(TOPDIR, "#{ENV["CB_PREFIX"]}cookbooks"))
   create_readme(File.join(TOPDIR, "#{ENV["CB_PREFIX"]}cookbooks"))
   create_metadata(File.join(TOPDIR, "#{ENV["CB_PREFIX"]}cookbooks"))

data/lib/chef/version.rb

@@ -16,5 +16,6 @@
 # limitations under the License.
 
 class Chef
-  VERSION = '0.9.6'
+  CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
+  VERSION = '0.9.8.beta.1'
 end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 8
+  - beta
+  - 1
+  version: 0.9.8.beta.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -07:00
+date: 2010-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -275,7 +277,6 @@ files:
 - lib/chef/application.rb
 - lib/chef/applications.rb
 - lib/chef/cache/checksum.rb
-- lib/chef/cache/file_cache_by_checksum.rb
 - lib/chef/cache.rb
 - lib/chef/certificate.rb
 - lib/chef/checksum.rb
@@ -289,6 +290,8 @@ files:
 - lib/chef/cookbook/remote_file_vendor.rb
 - lib/chef/cookbook/syntax_check.rb
 - lib/chef/cookbook_loader.rb
+- lib/chef/cookbook_site_streaming_uploader.rb
+- lib/chef/cookbook_uploader.rb
 - lib/chef/cookbook_version.rb
 - lib/chef/couchdb.rb
 - lib/chef/daemon.rb
@@ -303,6 +306,9 @@ files:
 - lib/chef/index_queue/consumer.rb
 - lib/chef/index_queue/indexable.rb
 - lib/chef/index_queue.rb
+- lib/chef/knife/bootstrap/centos5-gems.erb
+- lib/chef/knife/bootstrap/fedora13-gems.erb
+- lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
 - lib/chef/knife/bootstrap.rb
 - lib/chef/knife/client_bulk_delete.rb
 - lib/chef/knife/client_create.rb
@@ -314,6 +320,7 @@ files:
 - lib/chef/knife/configure.rb
 - lib/chef/knife/configure_client.rb
 - lib/chef/knife/cookbook_bulk_delete.rb
+- lib/chef/knife/cookbook_create.rb
 - lib/chef/knife/cookbook_delete.rb
 - lib/chef/knife/cookbook_download.rb
 - lib/chef/knife/cookbook_list.rb
@@ -323,7 +330,9 @@ files:
 - lib/chef/knife/cookbook_site_download.rb
 - lib/chef/knife/cookbook_site_list.rb
 - lib/chef/knife/cookbook_site_search.rb
+- lib/chef/knife/cookbook_site_share.rb
 - lib/chef/knife/cookbook_site_show.rb
+- lib/chef/knife/cookbook_site_unshare.rb
 - lib/chef/knife/cookbook_site_vendor.rb
 - lib/chef/knife/cookbook_test.rb
 - lib/chef/knife/cookbook_upload.rb
@@ -372,6 +381,8 @@ files:
 - lib/chef/log.rb
 - lib/chef/mixin/check_helper.rb
 - lib/chef/mixin/checksum.rb
+- lib/chef/mixin/command/unix.rb
+- lib/chef/mixin/command/windows.rb
 - lib/chef/mixin/command.rb
 - lib/chef/mixin/convert_to_class_name.rb
 - lib/chef/mixin/create_path.rb
@@ -432,6 +443,7 @@ files:
 - lib/chef/provider/package/portage.rb
 - lib/chef/provider/package/rpm.rb
 - lib/chef/provider/package/rubygems.rb
+- lib/chef/provider/package/solaris.rb
 - lib/chef/provider/package/yum-dump.py
 - lib/chef/provider/package/yum.rb
 - lib/chef/provider/package/zypper.rb
@@ -501,6 +513,7 @@ files:
 - lib/chef/resource/scm.rb
 - lib/chef/resource/script.rb
 - lib/chef/resource/service.rb
+- lib/chef/resource/solaris_package.rb
 - lib/chef/resource/subversion.rb
 - lib/chef/resource/template.rb
 - lib/chef/resource/timestamped_deploy.rb
@@ -564,11 +577,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/chef/cache/file_cache_by_checksum.rb

@@ -1,52 +0,0 @@
-#
-# Author:: Tim Hinderliter (<tim@opscode.com>)
-# Author:: Christopher Walters (<cw@opscode.com>)
-# 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.
-#
-
-class Chef
-  class Cache
-    class FileCacheByChecksum
-      attr_reader :basedir
-      
-      def initialize(basedir = Chef::Config[:file_cache_path])
-        @basedir = basedir
-      end
-
-      # returns path
-      def get_path(checksum)
-        path = checksum_path(checksum)
-        
-        File.exists?(path) ? path : nil
-      end
-      
-      # path = path to tempfile as input
-      # returns destination path
-      def put(checksum, src_path)
-        dest_path = checksum_path(checksum)
-        FileUtils.mkdir_p(File.dirname(dest_path))
-      
-        FileUtils.cp(src_path, dest_path)
-        
-        dest_path
-      end
-      
-      def checksum_path(checksum)
-        File.join(basedir, checksum[0..1], checksum)
-      end
-    end
-  end
-end