chef 12.0.0.alpha.0-x86-mingw32 → 12.0.0.alpha.1-x86-mingw32

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

@@ -46,6 +46,7 @@ class Chef
         def remove_user
           command = [ "userdel" ]
           command << "-r" if managing_home_dir?
+          command << "-f" if new_resource.force
           command << new_resource.username
           shell_out!(*command)
         end

data/lib/chef/providers.rb

@@ -91,6 +91,7 @@ require 'chef/provider/user/pw'
 require 'chef/provider/user/useradd'
 require 'chef/provider/user/windows'
 require 'chef/provider/user/solaris'
+require 'chef/provider/user/aix'
 
 require 'chef/provider/group/aix'
 require 'chef/provider/group/dscl'

data/lib/chef/resource.rb

@@ -134,7 +134,6 @@ F
 
     extend Chef::Mixin::ConvertToClassName
 
-
     if Module.method(:const_defined?).arity == 1
       def self.strict_const_defined?(const)
         const_defined?(const)
@@ -277,7 +276,6 @@ F
       end
     end
 
-
     def updated=(true_or_false)
       Chef::Log.warn("Chef::Resource#updated=(true|false) is deprecated. Please call #updated_by_last_action(true|false) instead.")
       Chef::Log.warn("Called from:")
@@ -544,7 +542,7 @@ F
     # Serialize this object as a hash
     def to_json(*a)
       results = as_json
-      results.to_json(*a)
+      Chef::JSONCompat.to_json(results, *a)
     end
 
     def to_hash
@@ -662,6 +660,9 @@ F
         end
       ensure
         @elapsed_time = Time.now - start_time
+        # Reporting endpoint doesn't accept a negative resource duration so set it to 0.
+        # A negative value can occur when a resource changes the system time backwards
+        @elapsed_time = 0 if @elapsed_time < 0
         events.resource_completed(self)
       end
     end

data/lib/chef/resource/freebsd_package.rb

@@ -31,17 +31,26 @@ class Chef
 
       provides :package, :on_platforms => ["freebsd"]
 
+      attr_accessor :created_as_type
 
       def initialize(name, run_context=nil)
         super
         @resource_name = :freebsd_package
+        @created_as_type = "freebsd_package"
       end
 
       def after_created
         assign_provider
       end
 
-
+      # This resource can be invoked with multiple names package & freebsd_package.
+      # We override the to_s method to ensure the key in resource collection
+      # matches the type resource is declared as using created_as_type. This
+      # logic can be removed once Chef does this for all resource in Chef 12:
+      # https://github.com/opscode/chef/issues/1817
+      def to_s
+        "#{created_as_type}[#{name}]"
+      end
 
       private
 
@@ -68,4 +77,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/resource/paludis_package.rb

@@ -27,6 +27,7 @@ class Chef
         @resource_name = :paludis_package
         @provider = Chef::Provider::Package::Paludis
         @allowed_actions = [ :install, :remove, :upgrade ]
+        @timeout = 3600
       end
     end
   end

data/lib/chef/resource/scm.rb

@@ -40,6 +40,7 @@ class Chef
         @allowed_actions.push(:checkout, :export, :sync, :diff, :log)
         @action = [:sync]
         @checkout_branch = "deploy"
+        @environment = nil
       end
 
       def destination(arg=nil)
@@ -172,6 +173,15 @@ class Chef
         )
       end
 
+      def environment(arg=nil)
+        set_or_return(
+          :environment,
+          arg,
+          :kind_of => [ Hash ]
+        )
+      end
+
+      alias :env :environment
     end
   end
 end

data/lib/chef/resource/user.rb

@@ -38,12 +38,15 @@ class Chef
         @password = nil
         @system = false
         @manage_home = false
+        @force = false
         @non_unique = false
         @action = :create
         @supports = {
           :manage_home => false,
           :non_unique => false
         }
+        @iterations = 27855
+        @salt = nil
         @allowed_actions.push(:create, :remove, :modify, :manage, :lock, :unlock)
       end
 
@@ -105,6 +108,22 @@ class Chef
         )
       end
 
+      def salt(arg=nil)
+        set_or_return(
+          :salt,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def iterations(arg=nil)
+        set_or_return(
+          :iterations,
+          arg,
+          :kind_of => [ Integer ]
+        )
+      end
+
       def system(arg=nil)
         set_or_return(
           :system,
@@ -121,6 +140,14 @@ class Chef
         )
       end
 
+      def force(arg=nil)
+        set_or_return(
+          :force,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
       def non_unique(arg=nil)
         set_or_return(
           :non_unique,

data/lib/chef/resource/windows_service.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2014 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 'chef/resource/service'
+
+class Chef
+  class Resource
+    class WindowsService < Chef::Resource::Service
+
+      # Until #1773 is resolved, you need to manually specify the windows_service resource
+      # to use action :configure_startup and attribute startup_type
+
+      # provides :service, :on_platforms => ["windows"]
+
+      identity_attr :service_name
+
+      state_attrs :enabled, :running
+
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :windows_service
+        @provider = Chef::Provider::Service::Windows
+        @allowed_actions.push(:configure_startup)
+        @startup_type = :automatic
+      end
+
+      def startup_type(arg=nil)
+        # Set-Service arguments are automatic and manual
+        # Win32::Service returns 'auto start' or 'demand start' respectively, which the provider currently uses
+        set_or_return(
+          :startup_type,
+          arg,
+          :equal_to => [ :automatic, :manual, :disabled ]
+        )
+      end
+    end
+  end
+end

data/lib/chef/resource_collection.rb

@@ -67,24 +67,33 @@ class Chef
     alias_method :push, :<<
 
     def insert(resource)
-      is_chef_resource(resource)
       if @insert_after_idx
         # in the middle of executing a run, so any resources inserted now should
         # be placed after the most recent addition done by the currently executing
         # resource
-        @resources.insert(@insert_after_idx + 1, resource)
-        # update name -> location mappings and register new resource
-        @resources_by_name.each_key do |key|
-          @resources_by_name[key] += 1 if @resources_by_name[key] > @insert_after_idx
-        end
-        @resources_by_name[resource.to_s] = @insert_after_idx + 1
+        insert_at(@insert_after_idx + 1, resource)
         @insert_after_idx += 1
       else
+        is_chef_resource(resource)
         @resources << resource
         @resources_by_name[resource.to_s] = @resources.length - 1
       end
     end
 
+    def insert_at(insert_at_index, *resources)
+      resources.each do |resource|
+        is_chef_resource(resource)
+      end
+      @resources.insert(insert_at_index, *resources)
+      # update name -> location mappings and register new resource
+      @resources_by_name.each_key do |key|
+        @resources_by_name[key] += resources.size if @resources_by_name[key] >= insert_at_index
+      end
+      resources.each_with_index do |resource, i|
+        @resources_by_name[resource.to_s] = insert_at_index + i
+      end
+    end
+
     def each
       @resources.each do |resource|
         yield resource
@@ -158,7 +167,6 @@ class Chef
     # compat.
     alias_method :resources, :find
 
-
     # Returns true if +query_object+ is a valid string for looking up a
     # resource, or raises InvalidResourceSpecification if not.
     # === Arguments
@@ -189,16 +197,19 @@ class Chef
     end
 
     # Serialize this object as a hash
-    def to_json(*a)
+    def to_hash
       instance_vars = Hash.new
       self.instance_variables.each do |iv|
         instance_vars[iv] = self.instance_variable_get(iv)
       end
-      results = {
+      {
         'json_class' => self.class.name,
         'instance_vars' => instance_vars
       }
-      results.to_json(*a)
+    end
+
+    def to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
     end
 
     def self.json_create(o)
@@ -247,7 +258,7 @@ class Chef
 
       def is_chef_resource(arg)
         unless arg.kind_of?(Chef::Resource)
-          raise ArgumentError, "Members must be Chef::Resource's"
+          raise ArgumentError, "Cannot insert a #{arg.class} into a resource collection: must be a subclass of Chef::Resource"
         end
         true
       end

data/lib/chef/resource_reporter.rb

@@ -230,18 +230,18 @@ class Chef
         resource_history_url = "reports/nodes/#{node_name}/runs/#{run_id}"
         Chef::Log.info("Sending resource update report (run-id: #{run_id})")
         Chef::Log.debug run_data.inspect
-        compressed_data = encode_gzip(run_data.to_json)
+        compressed_data = encode_gzip(Chef::JSONCompat.to_json(run_data))
+        Chef::Log.debug("Sending compressed run data...")
+        # Since we're posting compressed data we can not directly call post_rest which expects JSON
+        reporting_url = @rest_client.create_url(resource_history_url)
         begin
-          Chef::Log.debug("Sending compressed run data...")
-          # Since we're posting compressed data we can not directly call post_rest which expects JSON
-          reporting_url = @rest_client.create_url(resource_history_url)
           @rest_client.raw_http_request(:POST, reporting_url, headers({'Content-Encoding' => 'gzip'}), compressed_data)
-        rescue Net::HTTPServerException => e
-          if e.response.code.to_s == "400"
+        rescue StandardError => e
+          if e.respond_to? :response
             Chef::FileCache.store("failed-reporting-data.json", Chef::JSONCompat.to_json_pretty(run_data), 0640)
-            Chef::Log.error("Failed to post reporting data to server (HTTP 400), saving to #{Chef::FileCache.load("failed-reporting-data.json", false)}")
+            Chef::Log.error("Failed to post reporting data to server (HTTP #{e.response.code}), saving to #{Chef::FileCache.load("failed-reporting-data.json", false)}")
           else
-            Chef::Log.error("Failed to post reporting data to server (HTTP #{e.response.code.to_s})")
+            Chef::Log.error("Failed to post reporting data to server (#{e})")
           end
         end
       else
@@ -273,7 +273,7 @@ class Chef
         resource_record.for_json
       end
       run_data["status"] = @status
-      run_data["run_list"] = @run_status.node.run_list.to_json
+      run_data["run_list"] = Chef::JSONCompat.to_json(@run_status.node.run_list)
       run_data["total_res_count"] = @total_res_count.to_s
       run_data["data"] = {}
       run_data["start_time"] = start_time.to_s
@@ -283,7 +283,7 @@ class Chef
         exception_data = {}
         exception_data["class"] = exception.inspect
         exception_data["message"] = exception.message
-        exception_data["backtrace"] = exception.backtrace.to_json
+        exception_data["backtrace"] = Chef::JSONCompat.to_json(exception.backtrace)
         exception_data["description"] =  @error_descriptions
         run_data["data"]["exception"] = exception_data
       end

data/lib/chef/resources.rb

@@ -64,6 +64,7 @@ require 'chef/resource/ruby_block'
 require 'chef/resource/scm'
 require 'chef/resource/script'
 require 'chef/resource/service'
+require 'chef/resource/windows_service'
 require 'chef/resource/subversion'
 require 'chef/resource/smartos_package'
 require 'chef/resource/template'

data/lib/chef/role.rb

@@ -143,7 +143,7 @@ class Chef
 
     # Serialize this object as a hash
     def to_json(*a)
-      to_hash.to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
     end
 
     def update_from!(o)
@@ -236,8 +236,8 @@ class Chef
       paths = Array(Chef::Config[:role_path])
       paths.each do |path|
         roles_files = Dir.glob(File.join(path, "**", "**"))
-        js_files = roles_files.select { |file| file.match /#{name}\.json$/ }
-        rb_files = roles_files.select { |file| file.match /#{name}\.rb$/ }
+        js_files = roles_files.select { |file| file.match /\/#{name}\.json$/ }
+        rb_files = roles_files.select { |file| file.match /\/#{name}\.rb$/ }
         if js_files.count > 1 or rb_files.count > 1
           raise Chef::Exceptions::DuplicateRole, "Multiple roles of same type found named #{name}"
         end

data/lib/chef/run_list.rb

@@ -85,8 +85,12 @@ class Chef
       @run_list_items.join(", ")
     end
 
-    def to_json(*args)
-      to_a.map { |item| item.to_s}.to_json(*args)
+    def for_json
+      to_a.map { |item| item.to_s }
+    end
+
+    def to_json(*a)
+      Chef::JSONCompat.to_json(for_json, *a)
     end
 
     def empty?
@@ -158,6 +162,5 @@ class Chef
       end
     end
 
-
   end
 end

data/lib/chef/user.rb

@@ -73,7 +73,7 @@ class Chef
     end
 
     def to_json(*a)
-      to_hash.to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
     end
 
     def destroy

data/lib/chef/util/diff.rb

@@ -82,7 +82,7 @@ class Chef
           end
         end
       end
-      
+
       # produces a unified-output-format diff with 3 lines of context
       # ChefFS uses udiff() directly
       def udiff(old_file, new_file)
@@ -185,4 +185,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '12.0.0.alpha.0'
+  VERSION = '12.0.0.alpha.1'
 end
 
 #

data/lib/chef/version_constraint.rb

@@ -24,7 +24,7 @@ class Chef
     PATTERN = /^(#{OPS.join('|')}) *([0-9].*)$/
     VERSION_CLASS = Chef::Version
 
-    attr_reader :op, :version, :raw_version
+    attr_reader :op, :version
 
     def initialize(constraint_spec=DEFAULT_CONSTRAINT)
       case constraint_spec
@@ -50,11 +50,11 @@ class Chef
     end
 
     def inspect
-      "(#{@op} #{@version})"
+      "(#{to_s})"
     end
 
     def to_s
-      "#{@op} #{@version}"
+      "#{@op} #{@raw_version}"
     end
 
     def eql?(o)
@@ -106,7 +106,7 @@ class Chef
         @op = $1
         @raw_version = $2
         @version = self.class::VERSION_CLASS.new(@raw_version)
-        if raw_version.split('.').size <= 2
+        if @raw_version.split('.').size <= 2
           @missing_patch_level = true
         end
       else