chef 12.0.0.alpha.0 → 12.0.0.alpha.1

data/lib/chef/knife/cookbook_site_unshare.rb

@@ -41,7 +41,7 @@ class Chef
         confirm "Do you really want to unshare the cookbook #{@cookbook_name}"
 
         begin
-          rest.delete_rest "http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}"
+          rest.delete_rest "https://supermarket.getchef.com/api/v1/cookbooks/#{@name_args[0]}"
         rescue Net::HTTPServerException => e
           raise e unless e.message =~ /Forbidden/
           ui.error "Forbidden: You must be the maintainer of #{@cookbook_name} to unshare it."

data/lib/chef/knife/core/node_editor.rb

@@ -42,8 +42,8 @@ class Chef
       end
 
       def updated?
-        pristine_copy = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(node), :create_additions => false)
-        updated_copy  = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(@updated_node), :create_additions => false)
+        pristine_copy = Chef::JSONCompat.parse(Chef::JSONCompat.to_json(node))
+        updated_copy  = Chef::JSONCompat.parse(Chef::JSONCompat.to_json(@updated_node))
         unless pristine_copy == updated_copy
           updated_properties = %w{name normal chef_environment run_list default override automatic}.reject do |key|
              pristine_copy[key] == updated_copy[key]
@@ -107,4 +107,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/core/ui.rb

@@ -195,8 +195,8 @@ class Chef
         # We wouldn't have to do these shenanigans if all the editable objects
         # implemented to_hash, or if to_json against a hash returned a string
         # with stable key order.
-        object_parsed_again = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(object), :create_additions => false)
-        output_parsed_again = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(output), :create_additions => false)
+        object_parsed_again = Chef::JSONCompat.parse(Chef::JSONCompat.to_json(object))
+        output_parsed_again = Chef::JSONCompat.parse(Chef::JSONCompat.to_json(output))
         if object_parsed_again != output_parsed_again
           output.save
           self.msg("Saved #{output}")

data/lib/chef/knife/deps.rb

@@ -77,7 +77,7 @@ class Chef
             return entry.chef_object.metadata.dependencies.keys.map { |cookbook| "/cookbooks/#{cookbook}" }
 
           elsif entry.parent && entry.parent.path == '/nodes'
-            node = JSON.parse(entry.read, :create_additions => false)
+            node = Chef::JSONCompat.parse(entry.read)
             result = []
             if node['chef_environment'] && node['chef_environment'] != '_default'
               result << "/environments/#{node['chef_environment']}.json"
@@ -88,7 +88,7 @@ class Chef
             result
 
           elsif entry.parent && entry.parent.path == '/roles'
-            role = JSON.parse(entry.read, :create_additions => false)
+            role = Chef::JSONCompat.parse(entry.read)
             result = []
             if role['run_list']
               dependencies_from_runlist(role['run_list']).each do |dependency|
@@ -138,4 +138,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/mixin/shell_out.rb

@@ -33,7 +33,7 @@ class Chef
 
       def shell_out(*command_args)
         cmd = Mixlib::ShellOut.new(*run_command_compatible_options(command_args))
-        cmd.live_stream = io_for_live_stream
+        cmd.live_stream ||= io_for_live_stream
         cmd.run_command
         cmd
       end

data/lib/chef/mixin/windows_architecture_helper.rb

@@ -18,6 +18,7 @@
 
 
 require 'chef/exceptions'
+require 'chef/platform/query_helpers'
 require 'win32/api' if Chef::Platform.windows?
 require 'chef/win32/api/process' if Chef::Platform.windows?
 require 'chef/win32/api/error' if Chef::Platform.windows?

data/lib/chef/node.rb

@@ -181,7 +181,6 @@ class Chef
       attributes.override
     end
 
-
     def override_attrs
      attributes.override
     end
@@ -416,7 +415,7 @@ class Chef
 
     # Serialize this object as a hash
     def to_json(*a)
-      for_json.to_json(*a)
+      Chef::JSONCompat.to_json(for_json, *a)
     end
 
     def for_json

data/lib/chef/platform/provider_mapping.rb

@@ -142,11 +142,14 @@ class Chef
             },
             :centos   => {
               :default => {
-                :service => Chef::Provider::Service::Redhat,
+                :service => Chef::Provider::Service::Systemd,
                 :cron => Chef::Provider::Cron,
                 :package => Chef::Provider::Package::Yum,
                 :mdadm => Chef::Provider::Mdadm,
                 :ifconfig => Chef::Provider::Ifconfig::Redhat
+              },
+              "< 7" => {
+                :service => Chef::Provider::Service::Redhat
               }
             },
             :amazon   => {
@@ -159,19 +162,25 @@ class Chef
             },
             :scientific => {
               :default => {
-                :service => Chef::Provider::Service::Redhat,
+                :service => Chef::Provider::Service::Systemd,
                 :cron => Chef::Provider::Cron,
                 :package => Chef::Provider::Package::Yum,
                 :mdadm => Chef::Provider::Mdadm
+              },
+              "< 7" => {
+                :service => Chef::Provider::Service::Redhat
               }
             },
             :fedora   => {
               :default => {
-                :service => Chef::Provider::Service::Redhat,
+                :service => Chef::Provider::Service::Systemd,
                 :cron => Chef::Provider::Cron,
                 :package => Chef::Provider::Package::Yum,
                 :mdadm => Chef::Provider::Mdadm,
                 :ifconfig => Chef::Provider::Ifconfig::Redhat
+              },
+              "< 15" => {
+                :service => Chef::Provider::Service::Redhat
               }
             },
             :opensuse     => {
@@ -196,19 +205,25 @@ class Chef
             },
             :oracle  => {
               :default => {
-                :service => Chef::Provider::Service::Redhat,
+                :service => Chef::Provider::Service::Systemd,
                 :cron => Chef::Provider::Cron,
                 :package => Chef::Provider::Package::Yum,
                 :mdadm => Chef::Provider::Mdadm
+              },
+              "< 7" => {
+                :service => Chef::Provider::Service::Redhat
               }
             },
             :redhat   => {
               :default => {
-                :service => Chef::Provider::Service::Redhat,
+                :service => Chef::Provider::Service::Systemd,
                 :cron => Chef::Provider::Cron,
                 :package => Chef::Provider::Package::Yum,
                 :mdadm => Chef::Provider::Mdadm,
                 :ifconfig => Chef::Provider::Ifconfig::Redhat
+              },
+              "< 7" => {
+                :service => Chef::Provider::Service::Systemd
               }
             },
             :ibm_powerkvm   => {
@@ -229,6 +244,15 @@ class Chef
                 :ifconfig => Chef::Provider::Ifconfig::Redhat
               }
             },
+            :parallels   => {
+                :default => {
+                    :service => Chef::Provider::Service::Redhat,
+                    :cron => Chef::Provider::Cron,
+                    :package => Chef::Provider::Package::Yum,
+                    :mdadm => Chef::Provider::Mdadm,
+                    :ifconfig => Chef::Provider::Ifconfig::Redhat
+                }
+            },
             :gentoo   => {
               :default => {
                 :package => Chef::Provider::Package::Portage,
@@ -365,7 +389,8 @@ class Chef
                 :mount => Chef::Provider::Mount::Aix,
                 :ifconfig => Chef::Provider::Ifconfig::Aix,
                 :cron => Chef::Provider::Cron::Aix,
-                :package => Chef::Provider::Package::Aix
+                :package => Chef::Provider::Package::Aix,
+                :user => Chef::Provider::User::Aix
               }
             },
             :exherbo => {
@@ -523,6 +548,8 @@ class Chef
             if platforms.has_key?(args[:platform])
               if platforms[args[:platform]].has_key?(:default)
                 platforms[args[:platform]][:default][args[:resource].to_sym] = args[:provider]
+              elsif args[:platform] == :default
+                platforms[:default][args[:resource].to_sym] = args[:provider]
               else
                 platforms[args[:platform]] = { :default => { args[:resource].to_sym => args[:provider] } }
               end

data/lib/chef/provider.rb

@@ -19,14 +19,12 @@
 
 require 'chef/mixin/from_file'
 require 'chef/mixin/convert_to_class_name'
-require 'chef/dsl/recipe'
 require 'chef/mixin/enforce_ownership_and_permissions'
 require 'chef/mixin/why_run'
 require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
-    include Chef::DSL::Recipe
     include Chef::Mixin::WhyRun
     include Chef::Mixin::ShellOut
 

data/lib/chef/provider/cookbook_file/content.rb

@@ -28,7 +28,7 @@ class Chef
 
         def file_for_provider
           cookbook = run_context.cookbook_collection[resource_cookbook]
-          file_cache_location = cookbook.preferred_filename_on_disk_location(run_context.node, :files, @new_resource.source, @new_resource.path)
+          file_cache_location = cookbook.preferred_filename_on_disk_location(run_context.node, :files, @new_resource.source)
           if file_cache_location.nil?
             nil
           else

data/lib/chef/provider/cron.rb

@@ -118,6 +118,12 @@ class Chef
             when ENV_PATTERN
               crontab << line unless cron_found
               next
+            when SPECIAL_PATTERN
+              if cron_found
+                cron_found = false
+                crontab << newcron
+                next
+              end
             when CRON_PATTERN
               if cron_found
                 cron_found = false
@@ -163,6 +169,11 @@ class Chef
               next
             when ENV_PATTERN
               next if cron_found
+            when SPECIAL_PATTERN
+              if cron_found
+                cron_found = false
+                next
+              end
             when CRON_PATTERN
               if cron_found
                 cron_found = false

data/lib/chef/provider/deploy.rb

@@ -21,7 +21,7 @@ require "chef/mixin/from_file"
 require "chef/monkey_patches/fileutils"
 require "chef/provider/git"
 require "chef/provider/subversion"
-require 'chef/dsl/recipe'
+require "chef/dsl/recipe"
 
 class Chef
   class Provider
@@ -31,7 +31,7 @@ class Chef
       include Chef::Mixin::FromFile
       include Chef::Mixin::Command
 
-      attr_reader :scm_provider, :release_path, :previous_release_path
+      attr_reader :scm_provider, :release_path, :shared_path, :previous_release_path
 
       def initialize(new_resource, run_context)
         super(new_resource, run_context)
@@ -53,6 +53,7 @@ class Chef
       def load_current_resource
         @scm_provider.load_current_resource
         @release_path = @new_resource.deploy_to + "/releases/#{release_slug}"
+        @shared_path = @new_resource.shared_path
       end
 
       def sudo(command,&block)

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

@@ -90,14 +90,14 @@ class Chef
 
         def load_cache
           begin
-            Chef::JSONCompat.from_json(Chef::FileCache.load("revision-deploys/#{new_resource.name}"))
+            Chef::JSONCompat.parse(Chef::FileCache.load("revision-deploys/#{new_resource.name}"))
           rescue Chef::Exceptions::FileNotFound
             sorted_releases_from_filesystem
           end
         end
 
         def save_cache(cache)
-          Chef::FileCache.store("revision-deploys/#{new_resource.name}", cache.to_json)
+          Chef::FileCache.store("revision-deploys/#{new_resource.name}", Chef::JSONCompat.to_json(cache))
           cache
         end
 

data/lib/chef/provider/env.rb

@@ -143,7 +143,7 @@ class Chef
       def modify_env
         if @new_resource.delim
           #e.g. add to PATH
-          @new_resource.value << @new_resource.delim << @current_resource.value
+          @new_resource.value(@new_resource.value + @new_resource.delim + @current_resource.value)
         end
         create_env
       end

data/lib/chef/provider/env/windows.rb

@@ -51,17 +51,13 @@ class Chef
           return obj ? obj.variablevalue : nil
         end
 
-        def find_env(environment_variables, key_name)
-          environment_variables.find do | environment_variable |
-            environment_variable['name'].downcase == key_name
-          end
-        end
-
         def env_obj(key_name)
           wmi = WmiLite::Wmi.new
-          environment_variables = wmi.instances_of('Win32_Environment')
-          existing_variable = find_env(environment_variables, key_name)
-          existing_variable.nil? ? nil : existing_variable.wmi_ole_object
+          # Note that by design this query is case insensitive with regard to key_name
+          environment_variables = wmi.query("select * from Win32_Environment where name = '#{key_name}'")
+          if environment_variables && environment_variables.length > 0
+            environment_variables[0].wmi_ole_object
+          end
         end
 
         #see: http://msdn.microsoft.com/en-us/library/ms682653%28VS.85%29.aspx

data/lib/chef/provider/file.rb

@@ -56,6 +56,10 @@ class Chef
 
       attr_reader :deployment_strategy
 
+      attr_accessor :needs_creating
+      attr_accessor :needs_unlinking
+      attr_accessor :managing_symlink
+
       def initialize(new_resource, run_context)
         @content_class ||= Chef::Provider::File::Content
         if new_resource.respond_to?(:atomic_update)
@@ -69,22 +73,47 @@ class Chef
       end
 
       def load_current_resource
+        # true if there is a symlink and we need to manage what it points at
+        @managing_symlink = file_class.symlink?(new_resource.path) && ( new_resource.manage_symlink_source || new_resource.manage_symlink_source.nil? )
+
+        # true if there is a non-file thing in the way that we need to unlink first
+        @needs_unlinking =
+          if ::File.exist?(new_resource.path)
+            if managing_symlink?
+              !symlink_to_real_file?(new_resource.path)
+            else
+              !real_file?(new_resource.path)
+            end
+          else
+            false
+          end
+
+        # true if we are going to be creating a new file
+        @needs_creating  = !::File.exist?(new_resource.path) || needs_unlinking?
+
         # Let children resources override constructing the @current_resource
-        @current_resource ||= Chef::Resource::File.new(@new_resource.name)
-        @current_resource.path(@new_resource.path)
-        if ::File.exists?(@current_resource.path) && ::File.file?(::File.realpath(@current_resource.path))
+        @current_resource ||= Chef::Resource::File.new(new_resource.name)
+        current_resource.path(new_resource.path)
+
+        if !needs_creating?
+          # we are updating an existing file
           if managing_content?
-            Chef::Log.debug("#{@new_resource} checksumming file at #{@new_resource.path}.")
-            @current_resource.checksum(checksum(@current_resource.path))
+            Chef::Log.debug("#{new_resource} checksumming file at #{new_resource.path}.")
+            current_resource.checksum(checksum(current_resource.path))
+          else
+            # if the file does not exist or is not a file, then the checksum is invalid/pointless
+            current_resource.checksum(nil)
           end
-          load_resource_attributes_from_file(@current_resource)
+          load_resource_attributes_from_file(current_resource)
         end
-        @current_resource
+
+        current_resource
       end
 
       def define_resource_requirements
         # deep inside FAC we have to assert requirements, so call FACs hook to set that up
         access_controls.define_resource_requirements
+
         # Make sure the parent directory exists, otherwise fail.  For why-run assume it would have been created.
         requirements.assert(:create, :create_if_missing, :touch) do |a|
           parent_directory = ::File.dirname(@new_resource.path)
@@ -94,7 +123,7 @@ class Chef
         end
 
         # Make sure the file is deletable if it exists, otherwise fail.
-        if ::File.exists?(@new_resource.path)
+        if ::File.exist?(@new_resource.path)
           requirements.assert(:delete) do |a|
             a.assertion { ::File.writable?(@new_resource.path) }
             a.failure_message(Chef::Exceptions::InsufficientPermissions,"File #{@new_resource.path} exists but is not writable so it cannot be deleted")
@@ -114,6 +143,8 @@ class Chef
       end
 
       def action_create
+        do_generate_content
+        do_validate_content
         do_unlink
         do_create_file
         do_contents_changes
@@ -123,10 +154,10 @@ class Chef
       end
 
       def action_create_if_missing
-        if ::File.exists?(@new_resource.path)
-          Chef::Log.debug("#{@new_resource} exists at #{@new_resource.path} taking no action.")
-        else
+        unless ::File.exist?(@new_resource.path)
           action_create
+        else
+          Chef::Log.debug("#{@new_resource} exists at #{@new_resource.path} taking no action.")
         end
       end
 
@@ -275,6 +306,15 @@ class Chef
         !file_class.symlink?(path) && ::File.file?(path)
       end
 
+      # like real_file? that follows (sane) symlinks
+      def symlink_to_real_file?(path)
+        begin
+          real_file?(::File.realpath(path))
+        rescue Errno::ELOOP, Errno::ENOENT
+          false
+        end
+      end
+
       # Similar to File.exist?, but also returns true in the case that the
       # named file is a broken symlink.
       def l_exist?(path)
@@ -290,41 +330,42 @@ class Chef
         end
       end
 
+      def do_generate_content
+        # referencing the tempfile magically causes content to be generated
+        tempfile
+      end
+
+      def tempfile_checksum
+        @tempfile_checksum ||= checksum(tempfile.path)
+      end
+
+      def do_validate_content
+        if new_resource.checksum && tempfile && ( new_resource.checksum != tempfile_checksum )
+          raise Chef::Exceptions::ChecksumMismatch.new(short_cksum(new_resource.checksum), short_cksum(tempfile_checksum))
+        end
+      end
+
       def do_unlink
-        @file_unlinked = false
         if @new_resource.force_unlink
-          if l_exist?(@new_resource.path) && !real_file?(@new_resource.path)
+          if needs_unlinking?
             # unlink things that aren't normal files
             description = "unlink #{file_type_string(@new_resource.path)} at #{@new_resource.path}"
             converge_by(description) do
               unlink(@new_resource.path)
             end
-            @current_resource.checksum = nil
-            @file_unlinked = true
           end
         end
       end
 
-      def file_unlinked?
-        @file_unlinked == true
-      end
-
       def do_create_file
-        @file_created = false
-        if !::File.exists?(@new_resource.path) || file_unlinked?
+        if needs_creating?
           converge_by("create new file #{@new_resource.path}") do
             deployment_strategy.create(@new_resource.path)
             Chef::Log.info("#{@new_resource} created file #{@new_resource.path}")
           end
-          @file_created = true
         end
       end
 
-      # do_contents_changes needs to know if do_create_file created a file or not
-      def file_created?
-        @file_created == true
-      end
-
       def do_backup(file = nil)
         Chef::Util::Backup.new(@new_resource, file).backup!
       end
@@ -334,7 +375,7 @@ class Chef
       end
 
       def update_file_contents
-        do_backup unless file_created?
+        do_backup unless needs_creating?
         deployment_strategy.deploy(tempfile.path, ::File.realpath(@new_resource.path))
         Chef::Log.info("#{@new_resource} updated file contents #{@new_resource.path}")
         if managing_content?
@@ -353,7 +394,7 @@ class Chef
         # the file? on the next line suppresses the case in why-run when we have a not-file here that would have otherwise been removed
         if ::File.file?(@new_resource.path) && contents_changed?
           description = [ "update content in file #{@new_resource.path} from \
-#{short_cksum(@current_resource.checksum)} to #{short_cksum(checksum(tempfile.path))}" ]
+#{short_cksum(@current_resource.checksum)} to #{short_cksum(tempfile_checksum)}" ]
 
           # Hide the diff output if the resource is marked as a sensitive resource
           if @new_resource.sensitive
@@ -361,7 +402,7 @@ class Chef
             description << "suppressed sensitive resource"
           else
             diff.diff(@current_resource.path, tempfile.path)
-            @new_resource.diff( diff.for_reporting ) unless file_created?
+            @new_resource.diff( diff.for_reporting ) unless needs_creating?
             description << diff.for_output
           end
 
@@ -401,11 +442,11 @@ class Chef
 
       def contents_changed?
         Chef::Log.debug "calculating checksum of #{tempfile.path} to compare with #{@current_resource.checksum}"
-        checksum(tempfile.path) != @current_resource.checksum
+        tempfile_checksum != @current_resource.checksum
       end
 
       def tempfile
-        content.tempfile
+        @tempfile ||= content.tempfile
       end
 
       def short_cksum(checksum)
@@ -414,7 +455,6 @@ class Chef
       end
 
       def load_resource_attributes_from_file(resource)
-
         if Chef::Platform.windows?
           # This is a work around for CHEF-3554.
           # OC-6534: is tracking the real fix for this workaround.
@@ -426,6 +466,17 @@ class Chef
         acl_scanner.set_all!
       end
 
+      def managing_symlink?
+        !!@managing_symlink
+      end
+
+      def needs_creating?
+        !!@needs_creating
+      end
+
+      def needs_unlinking?
+        !!@needs_unlinking
+      end
     end
   end
 end