chef 15.2.20-universal-mingw32 → 15.3.14-universal-mingw32

data/spec/unit/provider/user/dscl_spec.rb

@@ -35,6 +35,7 @@ describe Chef::Provider::User::Dscl do
   let(:node) do
     Chef::Node.new.tap do |node|
       node.automatic["os"] = "darwin"
+      node.automatic["platform_version"] = "10.13.0"
     end
   end
 

data/spec/unit/provider/user/mac_spec.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Ryan Cragun (<ryan@chef.io>)
+# Copyright:: Copyright (c) 2019 Chef Software, 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 "spec_helper"
+
+describe Chef::Provider::User::MacUser do
+  before do
+    allow(ChefConfig).to receive(:windows?) { false }
+  end
+
+  let(:new_resource) { Chef::Resource::User::MacUser.new("jane") }
+
+  let(:provider) do
+    node = Chef::Node.new
+    events = Chef::EventDispatch::Dispatcher.new
+    run_context = Chef::RunContext.new(node, {}, events)
+    described_class.new(new_resource, run_context)
+  end
+
+  it "responds to load_current_resource" do
+    expect(provider).to respond_to(:load_current_resource)
+  end
+end

data/spec/unit/provider/user_spec.rb

@@ -444,35 +444,51 @@ describe Chef::Provider::User do
 
   describe "convert_group_name" do
     before do
-      @new_resource.gid("999")
       @group = EtcGrnamIsh.new("wheel", "*", 999, [])
     end
 
-    it "should lookup the group name locally" do
-      expect(Etc).to receive(:getgrnam).with("999").and_return(@group)
-      expect(@provider.convert_group_name).to eq(999)
-    end
+    context "when user passes group name in gid" do
+      before do
+        @new_resource.gid("wheel")
+      end
 
-    it "should raise an error if we can't translate the group name during resource assertions" do
-      expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
-      @provider.action = :create
-      @provider.define_resource_requirements
-      @provider.convert_group_name
-      expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::User)
-    end
+      it "should lookup the group name locally" do
+        expect(Etc).to receive(:getgrnam).with("wheel").and_return(@group)
+        expect(@provider.convert_group_name).to eq(999)
+      end
+
+      it "should raise an error if we can't translate the group name during resource assertions" do
+        expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
+        @provider.action = :create
+        @provider.define_resource_requirements
+        @provider.convert_group_name
+        expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::User)
+      end
 
-    it "does not raise an error if we can't translate the group name during resource assertions if we are removing the user" do
-      expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
-      @provider.action = :remove
-      @provider.define_resource_requirements
-      @provider.convert_group_name
-      expect { @provider.process_resource_requirements }.not_to raise_error
+      it "does not raise an error if we can't translate the group name during resource assertions if we are removing the user" do
+        expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
+        @provider.action = :remove
+        @provider.define_resource_requirements
+        @provider.convert_group_name
+        expect { @provider.process_resource_requirements }.not_to raise_error
+      end
+
+      it "should set the new resources gid to the integerized version if available" do
+        expect(Etc).to receive(:getgrnam).with("wheel").and_return(@group)
+        @provider.convert_group_name
+        expect(@new_resource.gid).to eq(999)
+      end
     end
 
-    it "should set the new resources gid to the integerized version if available" do
-      expect(Etc).to receive(:getgrnam).with("999").and_return(@group)
-      @provider.convert_group_name
-      expect(@new_resource.gid).to eq(999)
+    context "when user passes group id in gid" do
+      before do
+        @new_resource.gid(999)
+      end
+
+      it "should not call getgrnam" do
+        expect(Etc).not_to receive(:getgrnam)
+        @provider.convert_group_name
+      end
     end
   end
 end

data/tasks/docs.rb

@@ -156,6 +156,7 @@ namespace :docs_site do
 
         Notifications
         -----------------------------------------------------
+
         ``notifies``
           **Ruby Type:** Symbol, 'Chef::Resource[String]'
 
@@ -167,13 +168,13 @@ namespace :docs_site do
 
         .. tag resources_common_notification_timers
 
-        A timer specifies the point during the Chef Infra Client run at which a notification is run. The following timers are available:
+        A timer specifies the point during a Chef Infra Client run at which a notification is run. The following timers are available:
 
         ``:before``
            Specifies that the action on a notified resource should be run before processing the resource block in which the notification is located.
 
         ``:delayed``
-           Default. Specifies that a notification should be queued up, and then executed at the end of the Chef Infra Client run.
+           Default. Specifies that a notification should be queued up, and then executed at the end of a Chef Infra Client run.
 
         ``:immediate``, ``:immediately``
            Specifies that a notification should be run immediately, per resource notified.
@@ -216,13 +217,13 @@ namespace :docs_site do
 
         .. tag resources_common_notification_timers
 
-        A timer specifies the point during the Chef Infra Client run at which a notification is run. The following timers are available:
+        A timer specifies the point during a Chef Infra Client run at which a notification is run. The following timers are available:
 
         ``:before``
            Specifies that the action on a notified resource should be run before processing the resource block in which the notification is located.
 
         ``:delayed``
-           Default. Specifies that a notification should be queued up, and then executed at the end of the Chef Infra Client run.
+           Default. Specifies that a notification should be queued up, and then executed at the end of a Chef Infra Client run.
 
         ``:immediate``, ``:immediately``
            Specifies that a notification should be run immediately, per resource notified.
@@ -244,17 +245,20 @@ namespace :docs_site do
 
         .. tag resources_common_guards
 
-        A guard property can be used to evaluate the state of a node during the execution phase of the Chef Infra Client run. Based on the results of this evaluation, a guard property is then used to tell the Chef Infra Client if it should continue executing a resource. A guard property accepts either a string value or a Ruby block value:
+        A guard property can be used to evaluate the state of a node during the execution phase of a Chef Infra Client run. Based on the results of this evaluation, a guard property is then used to tell Chef Infra Client if it should continue executing a resource. A guard property accepts either a string value or a Ruby block value:
 
         * A string is executed as a shell command. If the command returns ``0``, the guard is applied. If the command returns any other value, then the guard property is not applied. String guards in a **powershell_script** run Windows PowerShell commands and may return ``true`` in addition to ``0``.
         * A block is executed as Ruby code that must return either ``true`` or ``false``. If the block returns ``true``, the guard property is applied. If the block returns ``false``, the guard property is not applied.
 
-        A guard property is useful for ensuring that a resource is idempotent by allowing that resource to test for the desired state as it is being executed, and then if the desired state is present, for the Chef Infra Client to do nothing.
+        A guard property is useful for ensuring that a resource is idempotent by allowing that resource to test for the desired state as it is being executed, and then if the desired state is present, for Chef Infra Client to do nothing.
 
         .. end_tag
+
+        **Properties**
+
         .. tag resources_common_guards_properties
 
-        The following properties can be used to define a guard that is evaluated during the execution phase of the Chef Infra Client run:
+        The following properties can be used to define a guard that is evaluated during the execution phase of a Chef Infra Client run:
 
         ``not_if``
           Prevent a resource from executing when the condition returns ``true``.
@@ -305,7 +309,7 @@ The <%= @name %> resource has the following actions:
 ``:nothing``
    .. tag resources_common_actions_nothing
 
-   This resource block does not act unless notified by another resource to take action. Once notified, this resource block either runs immediately or is queued up to run at the end of the Chef Infra Client run.
+   This resource block does not act unless notified by another resource to take action. Once notified, this resource block either runs immediately or is queued up to run at the end of a Chef Infra Client run.
 
    .. end_tag
 
@@ -317,8 +321,8 @@ The <%= @name %> resource has the following properties:
 ``<%= p['name'] %>``
    **Ruby Type:** <%= friendly_types_list(p['is']) %><% unless pretty_default(p['default']).nil? %> | **Default Value:** ``<%= pretty_default(p['default']) %>``<% end %><% if p['required'] %> | ``REQUIRED``<% end %><% if p['deprecated'] %> | ``DEPRECATED``<% end %><% if p['name_property'] %> | **Default Value:** ``The resource block's name``<% end %>
 
-   <%= p['description'] %>
-<% unless p['introduced'].nil? -%>\n   *New in <%= branded_chef_client_name(@introduced) %> <%= p['introduced'] -%>.*<% end -%>
+<% unless p['description'].nil? %>   <%= p['description'].strip %><% end %>
+<% unless p['introduced'].nil? -%>\n\n   *New in <%= branded_chef_client_name(p['introduced']) %> <%= p['introduced'] -%>.*\n<% end -%>
 <% end %>
 <% if @properties.empty? %>This resource does not have any properties.\n<% end -%>
 <%= boilerplate_content %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 15.2.20
+  version: 15.3.14
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,34 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.2.20
+        version: 15.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.2.20
+        version: 15.3.14
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: train-winrm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 3.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -134,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 3.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -1297,6 +1305,7 @@ files:
 - lib/chef/provider/user/aix.rb
 - lib/chef/provider/user/dscl.rb
 - lib/chef/provider/user/linux.rb
+- lib/chef/provider/user/mac.rb
 - lib/chef/provider/user/pw.rb
 - lib/chef/provider/user/solaris.rb
 - lib/chef/provider/user/windows.rb
@@ -1429,6 +1438,7 @@ files:
 - lib/chef/resource/user/aix_user.rb
 - lib/chef/resource/user/dscl_user.rb
 - lib/chef/resource/user/linux_user.rb
+- lib/chef/resource/user/mac_user.rb
 - lib/chef/resource/user/pw_user.rb
 - lib/chef/resource/user/solaris_user.rb
 - lib/chef/resource/user/windows_user.rb
@@ -2028,6 +2038,7 @@ files:
 - spec/functional/resource/template_spec.rb
 - spec/functional/resource/timezone_spec.rb
 - spec/functional/resource/user/dscl_spec.rb
+- spec/functional/resource/user/mac_user_spec.rb
 - spec/functional/resource/user/windows_spec.rb
 - spec/functional/resource/windows_certificate_spec.rb
 - spec/functional/resource/windows_env_spec.rb
@@ -2129,6 +2140,7 @@ files:
 - spec/integration/recipes/resource_action_spec.rb
 - spec/integration/recipes/resource_converge_if_changed_spec.rb
 - spec/integration/recipes/resource_load_spec.rb
+- spec/integration/recipes/unified_mode_spec.rb
 - spec/integration/solo/solo_spec.rb
 - spec/rcov.opts
 - spec/scripts/ssl-serve.rb
@@ -2167,7 +2179,6 @@ files:
 - spec/support/shared/functional/securable_resource_with_reporting.rb
 - spec/support/shared/functional/win32_service.rb
 - spec/support/shared/functional/windows_script.rb
-- spec/support/shared/integration/app_server_support.rb
 - spec/support/shared/integration/integration_helper.rb
 - spec/support/shared/integration/knife_support.rb
 - spec/support/shared/matchers/exit_with_code.rb
@@ -2545,6 +2556,7 @@ files:
 - spec/unit/provider/user/aix_spec.rb
 - spec/unit/provider/user/dscl_spec.rb
 - spec/unit/provider/user/linux_spec.rb
+- spec/unit/provider/user/mac_spec.rb
 - spec/unit/provider/user/pw_spec.rb
 - spec/unit/provider/user/solaris_spec.rb
 - spec/unit/provider/user/windows_spec.rb

data/spec/support/shared/integration/app_server_support.rb

@@ -1,39 +0,0 @@
-#
-# Author:: John Keiser (<jkeiser@chef.io>)
-# Author:: Ho-Sheng Hsiao (<hosh@chef.io>)
-# Copyright:: Copyright 2012-2018, Chef Software 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 "rack"
-require "stringio"
-
-module AppServerSupport
-  def start_app_server(app, port)
-    server = nil
-    thread = Thread.new do
-      Rack::Handler::WEBrick.run(app,
-        Port: 9018,
-        AccessLog: [],
-        Logger: WEBrick::Log.new(StringIO.new, 7)) do |found_server|
-          server = found_server
-        end
-    end
-    Timeout.timeout(30) do
-      sleep(0.01) until server && server.status == :Running
-    end
-    thread
-  end
-end