chef 10.14.0.beta.3 → 10.14.0.rc.0

data/lib/chef/provider/file.rb

@@ -58,9 +58,15 @@ class Chef
 
       def diff_current source_path
         begin
-          # -N: Treat missing files as empty
+ 	  # Solaris diff doesn't support -N (treat missing files as empty) 
+          # For compatibility we'll create a temp file if the file does not exist
+          # and substitute it
+	  unless ::File.exists?(source_path) 
+	    altfile = Tempfile.new('chef-tempfile')
+            source_path = altfile.path
+          end
           # -u: Unified diff format
-          result = shell_out("diff -u -N #{@current_resource.path} #{source_path}" )
+          result = shell_out("diff -u #{@current_resource.path} #{source_path}" )
           # diff will set a non-zero return code even when there's 
           # valid stdout results, if it encounters something unexpected
           # So as long as we have output, we'll show it.
@@ -76,7 +82,7 @@ class Chef
         rescue Exception => e
           # Should *not* receive this, but in some circumstances it seems that 
           # an exception can be thrown even using shell_out instead of shell_out!
-          "Could not determine diff"
+          "Could not determine diff. Error: #{e.message}"
         end
       end 
 

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

@@ -35,11 +35,17 @@ class Chef
             a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/sbin/usermod for #{@new_resource}"
             # No whyrun alternative: this component should be available in the base install of any given system that uses it
           end
+
+          requirements.assert(:modify, :create) do |a|
+            a.assertion { @new_resource.members.empty? || @new_resource.append } 
+            a.failure_message Chef::Exceptions::Group, "setting group members directly is not supported by #{self.to_s}, must set append true in group"
+            # No whyrun alternative - this action is simply not supported.
+          end
         end
         
         def modify_group_members
           case node[:platform]
-          when "openbsd", "netbsd", "aix"
+          when "openbsd", "netbsd", "aix", "solaris2"
             append_flags = "-G"
           when "solaris"
             append_flags = "-a -G"
@@ -50,10 +56,7 @@ class Chef
               @new_resource.members.each do |member|
                 Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
                 run_command(:command => "usermod #{append_flags} #{@new_resource.group_name} #{member}" )
-
               end
-            else
-              raise Chef::Exceptions::Group, "setting group members directly is not supported by #{self.to_s}"
             end
           else
             Chef::Log.debug("#{@new_resource} not changing group members, the group has no members")

data/lib/chef/provider/mdadm.rb

@@ -39,13 +39,13 @@ class Chef
         @current_resource.raid_device(@new_resource.raid_device)
         Chef::Log.debug("#{@new_resource} checking for software raid device #{@current_resource.raid_device}")
 
-        mdadm = shell_out!("mdadm --detail --scan")
-        exists = mdadm.stdout.include?(@new_resource.raid_device)
+        device_not_found = 4
+        mdadm = shell_out!("mdadm --detail --test #{@new_resource.raid_device}", :returns => [0,device_not_found])
+        exists = (mdadm.status == 0)
         @current_resource.exists(exists)
       end
 
       def action_create
-
         unless @current_resource.exists
           converge_by("create RAID device #{new_resource.raid_device}") do 
             command = "yes | mdadm --create #{@new_resource.raid_device} --chunk=#{@new_resource.chunk} --level #{@new_resource.level}"

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

@@ -0,0 +1,101 @@
+#
+# Author:: Jason J. W. Williams (<williamsjj@digitar.com>)
+# Author:: Stephen Nelson-Smith (<sns@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 'open3'
+require 'chef/provider/package'
+require 'chef/mixin/command'
+require 'chef/resource/package'
+require 'chef/mixin/shell_out'
+
+class Chef
+  class Provider
+    class Package
+      class Ips < Chef::Provider::Package
+
+        include Chef::Mixin::ShellOut
+        attr_accessor :virtual
+
+        def define_resource_requirements
+          super
+        
+          requirements.assert(:all_actions) do |a|
+            a.assertion { ! @candidate_version.nil? }
+            a.failure_message Chef::Exceptions::Package, "Package #{@new_resource.package_name} not found"
+            a.whyrun "Assuming package #{@new_resource.package_name} would have been made available."
+          end 
+        end
+
+        def load_current_resource
+          @current_resource = Chef::Resource::Package.new(@new_resource.name)
+          @current_resource.package_name(@new_resource.name)
+          check_package_state(@new_resource.package_name)
+          @current_resource
+        end
+
+        def check_package_state(package)
+          Chef::Log.debug("Checking package status for #{package}")
+          installed = false
+          depends = false
+          
+          shell_out!("pkg info -r #{package}").stdout.each_line do |line|
+            case line
+            when /^\s+State: Installed/
+              installed = true
+            when /^\s+Version: (.*)/
+              @candidate_version = $1.split[0]
+              if installed
+                @current_resource.version($1)
+              else
+                @current_resource.version(nil)
+              end
+            end
+          end
+
+          return installed
+        end
+
+        def install_package(name, version)
+          package_name = "#{name}@#{version}"
+          normal_command = "pkg#{expand_options(@new_resource.options)} install -q #{package_name}"
+          if @new_resource.respond_to?(:accept_license) and @new_resource.accept_license
+            command = normal_command.gsub('-q', '-q --accept')
+          else
+            command = normal_command
+          end
+          begin
+            run_command_with_systems_locale(:command => command)
+          rescue
+          end
+        end
+
+        def upgrade_package(name, version)
+          install_package(name, version)
+        end
+
+        def remove_package(name, version)
+          package_name = "#{name}@#{version}"
+          run_command_with_systems_locale(
+            :command => "pkg#{expand_options(@new_resource.options)} uninstall -q #{package_name}"
+          )
+        end
+      end
+    end
+  end
+end
+

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

@@ -31,6 +31,18 @@ class Chef
         #   super
         #   @current_resource = Chef::Resource::Package.new(@new_resource.name)
         # end
+        def define_resource_requirements
+          super
+          requirements.assert(:install) do |a| 
+            a.assertion { @new_resource.source }
+            a.failure_message Chef::Exceptions::Package, "Source for package #{@new_resource.name} required for action install"
+          end
+          requirements.assert(:all_actions) do |a| 
+            a.assertion { !@new_resource.source || @package_source_found } 
+            a.failure_message Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
+            a.whyrun "would assume #{@new_resource.source} would be have previously been made available"
+          end
+        end
 
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
@@ -38,21 +50,18 @@ class Chef
           @new_resource.version(nil)
 
           if @new_resource.source
-            unless ::File.exists?(@new_resource.source)
-              raise Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
-            end
-
-            Chef::Log.debug("#{@new_resource} checking pkg status")
-            status = popen4("pkginfo -l -d #{@new_resource.source} #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
-              stdout.each do |line|
-                case line
-                when /VERSION:\s+(.+)/
-                  @new_resource.version($1)
+            @package_source_found = ::File.exists?(@new_resource.source)
+            if @package_source_found 
+              Chef::Log.debug("#{@new_resource} checking pkg status")
+              status = popen4("pkginfo -l -d #{@new_resource.source} #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+                stdout.each do |line|
+                  case line
+                  when /VERSION:\s+(.+)/
+                    @new_resource.version($1)
+                  end
                 end
               end
             end
-          elsif Array(@new_resource.action).include?(:install)
-            raise Chef::Exceptions::Package, "Source for package #{@new_resource.name} required for action install"
           end
 
           Chef::Log.debug("#{@new_resource} checking install state")

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

@@ -30,9 +30,6 @@ class Chef
           @status_command = "/bin/svcs -l"
         end
         
-        def whyrun_supported?
-          false
-        end
 
         def load_current_resource
           @current_resource = Chef::Resource::Service.new(@new_resource.name)

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

@@ -164,7 +164,7 @@ class Chef
           dscl_create_user    if diverged?(:username)
           dscl_create_comment if diverged?(:comment)
           set_uid             if diverged?(:uid)
-          dscl_set_gid        if diverged?(:uid)
+          dscl_set_gid        if diverged?(:gid)
           modify_home         if diverged?(:home)
           dscl_set_shell      if diverged?(:shell)
           modify_password     if diverged?(:password)

data/lib/chef/providers.rb

@@ -52,6 +52,7 @@ require 'chef/provider/package/apt'
 require 'chef/provider/package/dpkg'
 require 'chef/provider/package/easy_install'
 require 'chef/provider/package/freebsd'
+require 'chef/provider/package/ips'
 require 'chef/provider/package/macports'
 require 'chef/provider/package/pacman'
 require 'chef/provider/package/portage'

data/lib/chef/resource/ips_package.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Jason Williams (<williamsjj@digitar.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/resource/package'
+require 'chef/provider/package/ips'
+
+class Chef
+  class Resource
+    class IpsPackage < ::Chef::Resource::Package
+      def initialize(name, run_context = nil)
+        super(name, run_context)
+        @resource_name = :ips_package
+        @provider      = Chef::Provider::Package::Ips
+        @allowed_actions = [ :install, :remove, :upgrade ]
+        @accept_license = false
+      end
+
+      def accept_license(arg=nil)
+        set_or_return(
+          :purge,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+    end
+  end
+end

data/lib/chef/resource/package.rb

@@ -28,15 +28,15 @@ class Chef
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :package
-        @package_name = name
-        @version = nil
+        @action = :install
+        @allowed_actions.push(:install, :upgrade, :remove, :purge, :reconfig)
         @candidate_version = nil
+        @options = nil
+        @package_name = name
+        @resource_name = :package
         @response_file = nil
         @source = nil
-        @action = :install
-        @options = nil
-        @allowed_actions.push(:install, :upgrade, :remove, :purge, :reconfig)
+        @version = nil
       end
 
       def package_name(arg=nil)
@@ -78,7 +78,6 @@ class Chef
 	  :kind_of => [ String ]
 	)
       end
-
     end
   end
 end

data/lib/chef/resources.rb

@@ -33,6 +33,7 @@ require 'chef/resource/erl_call'
 require 'chef/resource/execute'
 require 'chef/resource/file'
 require 'chef/resource/freebsd_package'
+require 'chef/resource/ips_package'
 require 'chef/resource/gem_package'
 require 'chef/resource/git'
 require 'chef/resource/group'

data/lib/chef/rest/auth_credentials.rb

@@ -43,9 +43,10 @@ class Chef
         Chef::Log.debug("Signing the request as #{client_name}")
 
         # params_in = {:http_method => :GET, :path => "/clients", :body => "", :host => "localhost"}
-        request_params             = request_params.dup
-        request_params[:timestamp] = Time.now.utc.iso8601
-        request_params[:user_id]   = client_name
+        request_params                 = request_params.dup
+        request_params[:timestamp]     = Time.now.utc.iso8601
+        request_params[:user_id]       = client_name
+        request_params[:proto_version] = Chef::Config[:authentication_protocol_version]
         host = request_params.delete(:host) || "localhost"
 
         sign_obj = Mixlib::Authentication::SignedHeaderAuth.signing_object(request_params)

data/lib/chef/scan_access_control.rb

@@ -65,9 +65,7 @@ class Chef
 
     def current_owner
       case new_resource.owner
-      when nil
-        nil
-      when String
+      when String, nil
         lookup_uid
       when Integer
         stat.uid
@@ -90,9 +88,7 @@ class Chef
 
     def current_group
       case new_resource.group
-      when nil
-        nil
-      when String
+      when String, nil
         lookup_gid
       when Integer
         stat.gid
@@ -114,9 +110,7 @@ class Chef
 
     def current_mode
       case new_resource.mode
-      when nil
-        nil
-      when String
+      when String, nil
         (stat.mode & 007777).to_s(8)
       when Integer
         stat.mode & 007777

data/lib/chef/shef/ext.rb

@@ -510,6 +510,28 @@ E
         @named_databags_wrappers[databag_name] ||= Shef::NamedDataBagWrapper.new(databag_name)
       end
 
+      desc "Find and edit environments via the API"
+      explain(<<-E)
+## SUMMARY ##
+  +environments+ allows you to query and edit environments on your Chef server.
+
+## SUBCOMMANDS ##
+  * all       (list)
+  * show      (load)
+  * search    (find)
+  * transform (bulk_edit)
+
+## SEE ALSO ##
+  See the help for +nodes+ for more information about the subcommands.
+E
+      subcommands :all        => "list all environments",
+                  :show       => "load an environment by name",
+                  :search     => "search for environments",
+                  :transform  => "edit all environments via a code block and save them"
+      def environments
+        @environments ||= Shef::ModelWrapper.new(Chef::Environment)
+      end
+
       desc "A REST Client configured to authenticate with the API"
       def api
         @rest = Shef::ShefREST.new(Chef::Config[:chef_server_url])

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '10.14.0.beta.3'
+  VERSION = '10.14.0.rc.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/functional/knife/cookbook_delete_spec.rb

@@ -21,6 +21,8 @@ require 'tiny_server'
 
 describe Chef::Knife::CookbookDelete do
   before(:all) do
+    @original_config = Chef::Config.hash_dup
+
     Thin::Logging.silent = true
 
     @server = TinyServer::Manager.new
@@ -32,12 +34,13 @@ describe Chef::Knife::CookbookDelete do
     @api = TinyServer::API.instance
     @api.clear
 
-    Chef::Config[:node_name] = false
-    Chef::Config[:client_key] = false
+    Chef::Config[:node_name] = nil
+    Chef::Config[:client_key] = nil
     Chef::Config[:chef_server_url] = 'http://localhost:9000'
   end
 
   after(:all) do
+    Chef::Config.configuration = @original_config
     @server.stop
   end