chef 12.0.0.alpha.2 → 12.0.0.rc.0

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

@@ -41,10 +41,10 @@ class Chef
 
         def load_current_resource
           @current_resource = Chef::Resource::Group.new(@new_resource.name)
-          @current_resource.group_name(@new_resource.name)
+          @current_resource.group_name(@new_resource.group_name)
           group_info = nil
           begin
-            group_info = safe_dscl("read /Groups/#{@new_resource.name}")
+            group_info = safe_dscl("read /Groups/#{@new_resource.group_name}")
           rescue Chef::Exceptions::Group
             @group_exists = false
             Chef::Log.debug("#{@new_resource} group does not exist")

data/lib/chef/provider/group/pw.rb

@@ -40,20 +40,16 @@ class Chef
           command = "pw groupadd"
           command << set_options
 
-          # pw group[add|mod] -M is used to set the full membership list on a
-          # new or existing group. Because pw groupadd does not support the -m
-          # and -d options used by manage_group, we treat group creation as a
-          # special case and use -M.
-          Chef::Log.debug("#{@new_resource} setting group members: #{@new_resource.members.join(',')}")
-          member_options = [" -M #{@new_resource.members.join(',')}"]
-
-          if member_options.empty?
-            run_command(:command => command)
-          else
-            member_options.each do |option|
-              run_command(:command => command + option)
-            end
+          unless @new_resource.members.empty?
+            # pw group[add|mod] -M is used to set the full membership list on a
+            # new or existing group. Because pw groupadd does not support the -m
+            # and -d options used by manage_group, we treat group creation as a
+            # special case and use -M.
+            Chef::Log.debug("#{@new_resource} setting group members: #{@new_resource.members.join(',')}")
+            command += " -M #{@new_resource.members.join(',')}"
           end
+
+          run_command(:command => command)
         end
 
         # Manage the group when it already exists

data/lib/chef/provider/http_request.rb

@@ -23,6 +23,8 @@ class Chef
   class Provider
     class HttpRequest < Chef::Provider
 
+      provides :http_request
+
       attr_accessor :http
 
       def whyrun_supported?

data/lib/chef/provider/link.rb

@@ -22,11 +22,14 @@ require 'chef/mixin/file_class'
 require 'chef/resource/link'
 require 'chef/provider'
 require 'chef/scan_access_control'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
     class Link < Chef::Provider
 
+      provides :link
+
       include Chef::Mixin::EnforceOwnershipAndPermissions
       include Chef::Mixin::FileClass
 

data/lib/chef/provider/log.rb

@@ -25,6 +25,8 @@ class Chef
       # Chef log provider, allows logging to chef's logs from recipes
       class ChefLog < Chef::Provider
 
+        provides :log
+
         def whyrun_supported?
           true
         end

data/lib/chef/provider/lwrp_base.rb

@@ -81,22 +81,24 @@ class Chef
       include Chef::DSL::DataQuery
 
       def self.build_from_file(cookbook_name, filename, run_context)
+        provider_class = nil
         provider_name = filename_to_qualified_string(cookbook_name, filename)
 
-        # Add log entry if we override an existing light-weight provider.
         class_name = convert_to_class_name(provider_name)
 
         if Chef::Provider.const_defined?(class_name)
-          Chef::Log.info("#{class_name} light-weight provider already initialized -- overriding!")
+          Chef::Log.info("#{class_name} light-weight provider is already initialized -- Skipping loading #{filename}!")
+          Chef::Log.debug("Overriding already defined LWRPs is not supported anymore starting with Chef 12.")
+          provider_class = Chef::Provider.const_get(class_name)
+        else
+          provider_class = Class.new(self)
+          provider_class.class_from_file(filename)
+
+          class_name = convert_to_class_name(provider_name)
+          Chef::Provider.const_set(class_name, provider_class)
+          Chef::Log.debug("Loaded contents of #{filename} into a provider named #{provider_name} defined in Chef::Provider::#{class_name}")
         end
 
-        provider_class = Class.new(self)
-        provider_class.class_from_file(filename)
-
-        class_name = convert_to_class_name(provider_name)
-        Chef::Provider.const_set(class_name, provider_class)
-        Chef::Log.debug("Loaded contents of #{filename} into a provider named #{provider_name} defined in Chef::Provider::#{class_name}")
-
         provider_class
       end
 

data/lib/chef/provider/mount/mount.rb

@@ -191,7 +191,7 @@ class Chef
         def device_should_exist?
           ( @new_resource.device != "none" ) &&
             ( not network_device? ) &&
-            ( not %w[ tmpfs fuse ].include? @new_resource.fstype )
+            ( not %w[ cgroup tmpfs fuse ].include? @new_resource.fstype )
         end
 
         private

data/lib/chef/provider/package/aix.rb

@@ -26,6 +26,8 @@ class Chef
     class Package
       class Aix < Chef::Provider::Package
 
+        provides :bff_package, os: "aix"
+
         include Chef::Mixin::GetSourceFromPackage
 
         def define_resource_requirements

data/lib/chef/provider/package/apt.rb

@@ -25,6 +25,8 @@ class Chef
     class Package
       class Apt < Chef::Provider::Package
 
+        provides :apt_package, os: "linux"
+
         attr_accessor :is_virtual_package
 
         def load_current_resource

data/lib/chef/provider/package/dpkg.rb

@@ -30,6 +30,8 @@ class Chef
         DPKG_INSTALLED = /^Status: install ok installed/
         DPKG_VERSION = /^Version: (.+)$/
 
+        provides :dpkg_package, os: "linux"
+
         include Chef::Mixin::GetSourceFromPackage
 
         def define_resource_requirements

data/lib/chef/provider/package/easy_install.rb

@@ -25,6 +25,8 @@ class Chef
     class Package
       class EasyInstall < Chef::Provider::Package
 
+        provides :easy_install_package
+
         def install_check(name)
           check = false
 

data/lib/chef/provider/package/freebsd/pkg.rb

@@ -20,6 +20,7 @@
 #
 
 require 'chef/provider/package/freebsd/base'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
@@ -87,7 +88,7 @@ class Chef
           end
 
           def file_candidate_version_path
-            Dir["#{@new_resource.source}/#{@current_resource.package_name}*"][-1].to_s
+            Dir[Chef::Util::PathHelper.escape_glob("#{@new_resource.source}/#{@current_resource.package_name}") + "*"][-1].to_s
           end
 
           def file_candidate_version

data/lib/chef/provider/package/freebsd/pkgng.rb

@@ -45,7 +45,7 @@ class Chef
 
           def current_installed_version
             pkg_info = shell_out!("pkg info \"#{@new_resource.package_name}\"", :env => nil, :returns => [0,70])
-            pkg_info.stdout[/^#{Regexp.escape(@new_resource.package_name)}-(.+)/, 1]
+            pkg_info.stdout[/^Version +: (.+)$/, 1]
           end
 
           def candidate_version

data/lib/chef/provider/package/freebsd/port.rb

@@ -34,7 +34,7 @@ class Chef
           end
 
           def current_installed_version
-            pkg_info = if supports_pkgng?
+            pkg_info = if @new_resource.supports_pkgng?
                          shell_out!("pkg info \"#{@new_resource.package_name}\"", :env => nil, :returns => [0,70])
                        else
                          shell_out!("pkg_info -E \"#{@new_resource.package_name}*\"", :env => nil, :returns => [0,1])
@@ -53,14 +53,6 @@ class Chef
           def port_dir
             super(@new_resource.package_name)
           end
-
-          private
-
-          def supports_pkgng?
-            with_pkgng = makefile_variable_value('WITH_PKGNG')
-            with_pkgng && with_pkgng =~ /yes/i
-          end
-
         end
       end
     end

data/lib/chef/provider/package/homebrew.rb

@@ -0,0 +1,127 @@
+#
+# Author:: Joshua Timberman (<joshua@getchef.com>)
+# Author:: Graeme Mathieson (<mathie@woss.name>)
+#
+# Copyright 2011-2013, Opscode, Inc.
+# Copyright 2014, Chef Software, Inc <legal@getchef.com>
+#
+# 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 'etc'
+require 'chef/mixin/homebrew_user'
+
+class Chef
+  class Provider
+    class Package
+      class Homebrew < Chef::Provider::Package
+
+        provides :homebrew_package, os: "mac_os_x"
+
+        include Chef::Mixin::HomebrewUser
+
+        def load_current_resource
+          self.current_resource = Chef::Resource::Package.new(new_resource.name)
+          current_resource.package_name(new_resource.package_name)
+          current_resource.version(current_installed_version)
+          Chef::Log.debug("#{new_resource} current version is #{current_resource.version}") if current_resource.version
+
+          @candidate_version = candidate_version
+
+          Chef::Log.debug("#{new_resource} candidate version is #{@candidate_version}") if @candidate_version
+
+          current_resource
+        end
+
+        def install_package(name, version)
+          unless current_resource.version == version
+            brew('install', new_resource.options, name)
+          end
+        end
+
+        def upgrade_package(name, version)
+          current_version = current_resource.version
+
+          if current_version.nil? or current_version.empty?
+            install_package(name, version)
+          elsif current_version != version
+            brew('upgrade', new_resource.options, name)
+          end
+        end
+
+        def remove_package(name, version)
+          if current_resource.version
+            brew('uninstall', new_resource.options, name)
+          end
+        end
+
+        # Homebrew doesn't really have a notion of purging, do a "force remove"
+        def purge_package(name, version)
+          new_resource.options((new_resource.options || '') << ' --force').strip
+          remove_package(name, version)
+        end
+
+        def brew(*args)
+          get_response_from_command("brew #{args.join(' ')}")
+        end
+
+        # We implement a querying method that returns the JSON-as-Hash
+        # data for a formula per the Homebrew documentation. Previous
+        # implementations of this provider in the homebrew cookbook
+        # performed a bit of magic with the load path to get this
+        # information, but that is not any more robust than using the
+        # command-line interface that returns the same thing.
+        #
+        # https://github.com/Homebrew/homebrew/wiki/Querying-Brew
+        def brew_info
+          @brew_info ||= Chef::JSONCompat.from_json(brew('info', '--json=v1', new_resource.package_name)).first
+        end
+
+        # Some packages (formula) are "keg only" and aren't linked,
+        # because multiple versions installed can cause conflicts. We
+        # handle this by using the last installed version as the
+        # "current" (as in latest). Otherwise, we will use the version
+        # that brew thinks is linked as the current version.
+        #
+        def current_installed_version
+          brew_info['keg_only'] ? brew_info['installed'].last['version'] : brew_info['linked_keg']
+        end
+
+        # Packages (formula) available to install should have a
+        # "stable" version, per the Homebrew project's acceptable
+        # formula documentation, so we will rely on that being the
+        # case. Older implementations of this provider in the homebrew
+        # cookbook would fall back to +brew_info['version']+, but the
+        # schema has changed, and homebrew is a constantly rolling
+        # forward project.
+        #
+        # https://github.com/Homebrew/homebrew/wiki/Acceptable-Formulae#stable-versions
+        def candidate_version
+          brew_info['versions']['stable']
+        end
+
+        private
+
+        def get_response_from_command(command)
+          homebrew_uid = find_homebrew_uid(new_resource.respond_to?(:homebrew_user) && new_resource.homebrew_user)
+          homebrew_user = Etc.getpwuid(homebrew_uid)
+
+          Chef::Log.debug "Executing '#{command}' as user '#{homebrew_user.name}'"
+          output = shell_out!(command, :timeout => 1800, :user => homebrew_uid, :environment => { 'HOME' => homebrew_user.dir, 'RUBYOPT' => nil })
+          output.stdout.chomp
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/provider/package/ips.rb

@@ -27,6 +27,8 @@ class Chef
     class Package
       class Ips < Chef::Provider::Package
 
+        provides :ips_package, os: "solaris2"
+
         attr_accessor :virtual
 
         def define_resource_requirements

data/lib/chef/provider/package/macports.rb

@@ -2,6 +2,9 @@ class Chef
   class Provider
     class Package
       class Macports < Chef::Provider::Package
+
+        provides :macports_package, os: "mac_os_x"
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)

data/lib/chef/provider/package/pacman.rb

@@ -25,6 +25,8 @@ class Chef
     class Package
       class Pacman < Chef::Provider::Package
 
+        provides :pacman_package, os: "linux"
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
@@ -34,7 +36,6 @@ class Chef
           Chef::Log.debug("#{@new_resource} checking pacman for #{@new_resource.package_name}")
           status = popen4("pacman -Qi #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
-              line.force_encoding(Encoding::UTF_8) if line.respond_to?(:force_encoding)
               case line
               when /^Version(\s?)*: (.+)$/
                 Chef::Log.debug("#{@new_resource} current version is #{$2}")
@@ -62,11 +63,11 @@ class Chef
 
           package_repos = repos.map {|r| Regexp.escape(r) }.join('|')
 
-          status = popen4("pacman -Ss #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+          status = popen4("pacman -Sl") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
-                when /^(#{package_repos})\/#{Regexp.escape(@new_resource.package_name)} (.+)$/
-                  # $2 contains a string like "4.4.0-1 (kde kdenetwork)" or "3.10-4 (base)"
+                when /^(#{package_repos}) #{Regexp.escape(@new_resource.package_name)} (.+)$/
+                  # $2 contains a string like "4.4.0-1" or "3.10-4 [installed]"
                   # simply split by space and use first token
                   @candidate_version = $2.split(" ").first
               end

data/lib/chef/provider/package/paludis.rb

@@ -24,6 +24,8 @@ class Chef
     class Package
       class Paludis < Chef::Provider::Package
 
+        provides :paludis_package, os: "linux"
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.package_name)
           @current_resource.package_name(@new_resource.package_name)
@@ -34,7 +36,7 @@ class Chef
           installed = false
           re = Regexp.new('(.*)[[:blank:]](.*)[[:blank:]](.*)$')
 
-          shell_out!("cave -L warning print-ids -M none -m \"*/#{@new_resource.package_name.split('/').last}\" -f \"%c/%p %v %r\n\"").stdout.each_line do |line|
+          shell_out!("cave -L warning print-ids -M none -m \"#{@new_resource.package_name}\" -f \"%c/%p %v %r\n\"").stdout.each_line do |line|
             res = re.match(line)
             unless res.nil?
               case res[3]
@@ -45,7 +47,7 @@ class Chef
                 @current_resource.version(res[2])
               else
                 @candidate_version = res[2]
-                @current_resource.version(nil)              
+                @current_resource.version(nil)
               end
             end
           end

data/lib/chef/provider/package/portage.rb

@@ -19,6 +19,7 @@
 require 'chef/provider/package'
 require 'chef/mixin/command'
 require 'chef/resource/package'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
@@ -34,7 +35,9 @@ class Chef
 
           category, pkg = %r{^#{PACKAGE_NAME_PATTERN}$}.match(@new_resource.package_name)[1,2]
 
-          possibilities = Dir["/var/db/pkg/#{category || "*"}/#{pkg}-*"].map {|d| d.sub(%r{/var/db/pkg/}, "") }
+          globsafe_category = category ? Chef::Util::PathHelper.escape_glob(category) : nil
+          globsafe_pkg = Chef::Util::PathHelper.escape_glob(pkg)
+          possibilities = Dir["/var/db/pkg/#{globsafe_category || "*"}/#{globsafe_pkg}-*"].map {|d| d.sub(%r{/var/db/pkg/}, "") }
           versions = possibilities.map do |entry|
             if(entry =~ %r{[^/]+/#{Regexp.escape(pkg)}\-(\d[\.\d]*((_(alpha|beta|pre|rc|p)\d*)*)?(-r\d+)?)})
               [$&, $1]

data/lib/chef/provider/package/rpm.rb

@@ -25,6 +25,8 @@ class Chef
     class Package
       class Rpm < Chef::Provider::Package
 
+        provides :rpm_package, os: [ "linux", "aix" ]
+
         include Chef::Mixin::GetSourceFromPackage
 
         def define_resource_requirements