chef 15.1.36 → 15.2.20

data/spec/unit/run_context/cookbook_compiler_spec.rb

@@ -115,11 +115,11 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_libraries
-      expect(LibraryLoadOrder.load_order).to eq(["dependency1", "dependency2", "test-with-deps", "circular-dep2", "circular-dep1", "test-with-circular-deps"])
+      expect(LibraryLoadOrder.load_order).to eq(%w{dependency1 dependency2 test-with-deps circular-dep2 circular-dep1 test-with-circular-deps})
 
       # additionally test that we only load them once
       compiler.compile_libraries
-      expect(LibraryLoadOrder.load_order).to eq(["dependency1", "dependency2", "test-with-deps", "circular-dep2", "circular-dep1", "test-with-circular-deps"])
+      expect(LibraryLoadOrder.load_order).to eq(%w{dependency1 dependency2 test-with-deps circular-dep2 circular-dep1 test-with-circular-deps})
     end
   end
 
@@ -133,18 +133,18 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_lwrps
-      expect(LibraryLoadOrder.load_order).to eq(["dependency1-provider",
-                                             "dependency1-resource",
-                                             "dependency2-provider",
-                                             "dependency2-resource",
-                                             "test-with-deps-provider",
-                                             "test-with-deps-resource",
-                                             "circular-dep2-provider",
-                                             "circular-dep2-resource",
-                                             "circular-dep1-provider",
-                                             "circular-dep1-resource",
-                                             "test-with-circular-deps-provider",
-                                             "test-with-circular-deps-resource"])
+      expect(LibraryLoadOrder.load_order).to eq(%w{dependency1-provider
+                                             dependency1-resource
+                                             dependency2-provider
+                                             dependency2-resource
+                                             test-with-deps-provider
+                                             test-with-deps-resource
+                                             circular-dep2-provider
+                                             circular-dep2-resource
+                                             circular-dep1-provider
+                                             circular-dep1-resource
+                                             test-with-circular-deps-provider
+                                             test-with-circular-deps-resource})
     end
   end
 
@@ -159,12 +159,12 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_resource_definitions
-      expect(LibraryLoadOrder.load_order).to eq(["dependency1-definition",
-                                             "dependency2-definition",
-                                             "test-with-deps-definition",
-                                             "circular-dep2-definition",
-                                             "circular-dep1-definition",
-                                             "test-with-circular-deps-definition"])
+      expect(LibraryLoadOrder.load_order).to eq(%w{dependency1-definition
+                                             dependency2-definition
+                                             test-with-deps-definition
+                                             circular-dep2-definition
+                                             circular-dep1-definition
+                                             test-with-circular-deps-definition})
     end
 
   end
@@ -217,14 +217,14 @@ describe Chef::RunContext::CookbookCompiler do
     it "should return an array of cookbook names as symbols without duplicates" do
       node.run_list("test-with-circular-deps::default", "circular-dep1::default", "circular-dep2::default")
 
-      expect(compiler.cookbook_order).to eq([:"circular-dep2",
-                                         :"circular-dep1",
-                                         :"test-with-circular-deps"])
+      expect(compiler.cookbook_order).to eq(%i{circular-dep2
+                                         circular-dep1
+                                         test-with-circular-deps})
     end
 
     it "determines if a cookbook is in the list of cookbooks reachable by dependency" do
       node.run_list("test-with-deps::default", "test-with-deps::server")
-      expect(compiler.cookbook_order).to eq([:dependency1, :dependency2, :"test-with-deps"])
+      expect(compiler.cookbook_order).to eq(%i{dependency1 dependency2 test-with-deps})
       expect(compiler.unreachable_cookbook?(:dependency1)).to be_falsey
       expect(compiler.unreachable_cookbook?(:dependency2)).to be_falsey
       expect(compiler.unreachable_cookbook?(:'test-with-deps')).to be_falsey

data/spec/unit/run_list/run_list_expansion_spec.rb

@@ -94,12 +94,15 @@ describe Chef::RunList::RunListExpansion do
       allow(@expansion).to receive(:fetch_role).and_return(@first_role, @second_role)
       @expansion.expand
       @json = '{"id":"_default","run_list":[{"type":"recipe","name":"lobster::mastercookbook","version":"0.1.0",'
-              .concat(
-'"skipped":false},{"type":"role","name":"rage","children":[{"type":"role","name":"mollusk","children":[],"missing":null,'
-      .concat(
-'"error":null,"skipped":null},{"type":"recipe","name":"crabrevenge","version":null,"skipped":false}],"missing":null,'
-      .concat(
-'"error":null,"skipped":null},{"type":"recipe","name":"fist","version":"0.1","skipped":false}]}')))
+        .concat(
+          '"skipped":false},{"type":"role","name":"rage","children":[{"type":"role","name":"mollusk","children":[],"missing":null,'
+                .concat(
+                  '"error":null,"skipped":null},{"type":"recipe","name":"crabrevenge","version":null,"skipped":false}],"missing":null,'
+                        .concat(
+                          '"error":null,"skipped":null},{"type":"recipe","name":"fist","version":"0.1","skipped":false}]}'
+                        )
+                )
+        )
 
     end
 

data/spec/unit/run_list_spec.rb

@@ -133,7 +133,7 @@ describe Chef::RunList do
     it "should yield each member to your block" do
       @run_list << "foo"
       @run_list << "bar"
-      seen = Array.new
+      seen = []
       @run_list.each { |r| seen << r }
       expect(seen).to be_include("recipe[foo]")
       expect(seen).to be_include("recipe[bar]")

data/spec/unit/runner_spec.rb

@@ -295,7 +295,7 @@ describe Chef::Runner do
       # execution, and schedule delayed actions :second and :third on the first
       # resource. The duplicate actions should "collapse" to a single notification
       # and order should be preserved.
-      expect(SnitchyProvider.all_actions_called).to eq([:first, :first, :second, :third])
+      expect(SnitchyProvider.all_actions_called).to eq(%i{first first second third})
     end
 
     it "executes delayed notifications in the order they were declared" do
@@ -321,7 +321,7 @@ describe Chef::Runner do
       third_resource.notifies(:third_action, first_resource, :delayed)
 
       runner.converge
-      expect(SnitchyProvider.all_actions_called).to eq([:first, :first, :second, :third])
+      expect(SnitchyProvider.all_actions_called).to eq(%i{first first second third})
     end
 
     it "does not fire notifications if the resource was not updated by the last action executed" do
@@ -347,7 +347,7 @@ describe Chef::Runner do
       runner.converge
 
       # All of the resources should only fire once:
-      expect(SnitchyProvider.all_actions_called).to eq([:first, :second, :third])
+      expect(SnitchyProvider.all_actions_called).to eq(%i{first second third})
 
       # all of the resources should be marked as updated for reporting purposes
       expect(first_resource).to be_updated

data/spec/unit/search/query_spec.rb

@@ -149,7 +149,8 @@ describe Chef::Search::Query do
       ],
       "start" => 0,
       "total" => 4,
-    } end
+    }
+    end
 
     let(:big_response_empty) do
       {
@@ -169,7 +170,7 @@ describe Chef::Search::Query do
     it "accepts a type as the first argument" do
       expect { query.search("node") }.not_to raise_error
       expect { query.search(:node) }.not_to raise_error
-      expect { query.search(Hash.new) }.to raise_error(Chef::Exceptions::InvalidSearchQuery, /(Hash)/)
+      expect { query.search({}) }.to raise_error(Chef::Exceptions::InvalidSearchQuery, /(Hash)/)
     end
 
     it "queries for every object of a type by default" do

data/spec/unit/shell/model_wrapper_spec.rb

@@ -57,7 +57,7 @@ describe Shell::ModelWrapper do
     end
 
     it "maps the listed nodes when given a block" do
-      expect(@wrapper.all { |n| n.name }.sort.reverse).to eq(%w{yummy sammich})
+      expect(@wrapper.all(&:name).sort.reverse).to eq(%w{yummy sammich})
     end
   end
 

data/spec/unit/shell/shell_session_spec.rb

@@ -57,8 +57,7 @@ describe Shell::ClientSession do
       load_node: true,
       build_node: true,
       register: true,
-      sync_cookbooks: {}
-    )
+      sync_cookbooks: {})
   end
 
   before do
@@ -94,8 +93,7 @@ describe Shell::SoloSession do
       load_node: true,
       build_node: true,
       register: true,
-      sync_cookbooks: {}
-    )
+      sync_cookbooks: {})
   end
 
   before do
@@ -132,8 +130,7 @@ describe Shell::StandAloneSession do
       load_node: true,
       build_node: true,
       register: true,
-      sync_cookbooks: {}
-    )
+      sync_cookbooks: {})
   end
   let(:recipe) { Chef::Recipe.new(nil, nil, run_context) }
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
@@ -238,11 +235,11 @@ describe Shell::SoloLegacySession do
 
   it "passes the shell CLI args to the client" do
     @client = double("Chef::Client.new",
-                     run_ohai: true,
-                     load_node: true,
-                     build_node: true,
-                     register: true,
-                     sync_cookbooks: {})
+      run_ohai: true,
+      load_node: true,
+      build_node: true,
+      register: true,
+      sync_cookbooks: {})
     expect(Chef::Client).to receive(:new).with(json_attribs, Chef::Config[:shell_config]).and_return(@client)
     @session.json_configuration = json_attribs
     @session.send(:rebuild_node)

data/spec/unit/shell_spec.rb

@@ -30,8 +30,7 @@ ObjectTestHarness = Proc.new do
   end
 
   desc "rspecin'"
-  def rspec_method
-  end
+  def rspec_method; end
 end
 
 class TestJobManager

data/spec/unit/user_spec.rb

@@ -65,7 +65,7 @@ describe Chef::User do
     end
 
     it "should throw an ArgumentError if you feed it anything but a string" do
-      expect { @user.name Hash.new }.to raise_error(ArgumentError)
+      expect { @user.name({}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -84,7 +84,7 @@ describe Chef::User do
     end
 
     it "should throw an ArgumentError if you feed it anything but true or false" do
-      expect { @user.name Hash.new }.to raise_error(ArgumentError)
+      expect { @user.name({}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -99,7 +99,7 @@ describe Chef::User do
     end
 
     it "should throw an ArgumentError if you feed it something lame" do
-      expect { @user.public_key Hash.new }.to raise_error(ArgumentError)
+      expect { @user.public_key({}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -114,7 +114,7 @@ describe Chef::User do
     end
 
     it "should throw an ArgumentError if you feed it something lame" do
-      expect { @user.private_key Hash.new }.to raise_error(ArgumentError)
+      expect { @user.private_key({}) }.to raise_error(ArgumentError)
     end
   end
 

data/spec/unit/user_v1_spec.rb

@@ -37,7 +37,7 @@ describe Chef::UserV1 do
     end
 
     it "should throw an ArgumentError if you feed it something lame" do
-      expect { @user.send(method, Hash.new) }.to raise_error(ArgumentError)
+      expect { @user.send(method, {}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -57,7 +57,7 @@ describe Chef::UserV1 do
     end
 
     it "should throw an ArgumentError if you feed it anything but true or false" do
-      expect { @user.send(method, Hash.new) }.to raise_error(ArgumentError)
+      expect { @user.send(method, {}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -95,7 +95,7 @@ describe Chef::UserV1 do
     end
 
     it "should throw an ArgumentError if you feed it anything but a string" do
-      expect { @user.username Hash.new }.to raise_error(ArgumentError)
+      expect { @user.username({}) }.to raise_error(ArgumentError)
     end
   end
 

data/spec/unit/util/backup_spec.rb

@@ -110,7 +110,7 @@ describe Chef::Util::Backup do
     end
     it "should strip the drive letter off for windows" do
       expect(@backup).to receive(:path).and_return('c:\a\b\c.txt')
-      expect(@backup.send(:backup_filename)).to match(%r|^\\a\\b\\c.txt.chef-\d{14}.\d{6}$|)
+      expect(@backup.send(:backup_filename)).to match(/^\\a\\b\\c.txt.chef-\d{14}.\d{6}$/)
     end
     it "should strip the drive letter off for windows (with forwardslashes)" do
       expect(@backup).to receive(:path).and_return("c:/a/b/c.txt")

data/spec/unit/util/editor_spec.rb

@@ -9,7 +9,7 @@ describe Chef::Util::Editor do
     end
 
     it "makes a copy of an Array" do
-      array = Array.new
+      array = []
       editor = described_class.new(array)
       expect(editor.lines).to_not be(array)
     end

data/spec/unit/util/powershell/ps_credential_spec.rb

@@ -29,8 +29,9 @@ describe Chef::Util::Powershell::PSCredential do
       it "should create the script to create a PSCredential when calling" do
         allow(ps_credential).to receive(:encrypt).with(password).and_return("encrypted")
         expect(ps_credential.to_psobject).to eq(
-        "New-Object System.Management.Automation.PSCredential("\
-            "'#{username}',('encrypted' | ConvertTo-SecureString))")
+          "New-Object System.Management.Automation.PSCredential("\
+              "'#{username}',('encrypted' | ConvertTo-SecureString))"
+        )
       end
     end
 

data/spec/unit/util/threaded_job_queue_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Util::ThreadedJobQueue do
   let(:queue) { Chef::Util::ThreadedJobQueue.new }
 
   it "should pass mutex to jobs with an arity of 1" do
-    job = double()
+    job = double
     expect(job).to receive(:arity).at_least(:once).and_return(1)
     expect(job).to receive(:call).exactly(5).times.with(an_instance_of(Mutex))
 
@@ -31,7 +31,7 @@ describe Chef::Util::ThreadedJobQueue do
   end
 
   it "should pass nothing to jobs with an arity of 0" do
-    job = double()
+    job = double
     expect(job).to receive(:arity).at_least(:once).and_return(0)
     expect(job).to receive(:call).exactly(5).times.with(no_args)
 

data/spec/unit/version_class_spec.rb

@@ -105,7 +105,7 @@ describe Chef::Version do
       a = %w{0.0.0 0.0.1 0.1.0 0.1.1 1.0.0 1.1.0 1.1.1}.map do |s|
         Chef::Version.new(s)
       end
-      got = a.sort.map { |v| v.to_s }
+      got = a.sort.map(&:to_s)
       expect(got).to eq(%w{0.0.0 0.0.1 0.1.0 0.1.1 1.0.0 1.1.0 1.1.1})
     end
 
@@ -113,7 +113,7 @@ describe Chef::Version do
       a = %w{9.8.7 1.0.0 1.2.3 4.4.6 4.5.6 0.8.6 4.5.5 5.9.8 3.5.7}.map do |s|
         Chef::Version.new(s)
       end
-      got = a.sort.map { |v| v.to_s }
+      got = a.sort.map(&:to_s)
       expect(got).to eq(%w{0.8.6 1.0.0 1.2.3 3.5.7 4.4.6 4.5.5 4.5.6 5.9.8 9.8.7})
     end
 
@@ -160,9 +160,9 @@ describe Chef::Version do
        [ "1.2.2", :<=, "1.2.1", false ],
        [ "1.2.2", :<, "1.2.1", false ],
       ].each do |spec|
-        it "(#{spec.first(3).join(' ')}) should be #{spec[3]}" do
+        it "(#{spec.first(3).join(" ")}) should be #{spec[3]}" do
           got = Chef::Version.new(spec[0]).send(spec[1],
-                                                Chef::Version.new(spec[2]))
+            Chef::Version.new(spec[2]))
           expect(got).to eq(spec[3])
         end
       end

data/spec/unit/win32/registry_spec.rb

@@ -29,7 +29,7 @@ describe Chef::Win32::Registry do
   let(:key_to_delete) { "OpscodeNumbers" }
   let(:sub_key) { "OpscodePrimes" }
   let(:missing_key_path) { 'HKCU\Software' }
-  let(:registry) { Chef::Win32::Registry.new() }
+  let(:registry) { Chef::Win32::Registry.new }
   let(:hive_mock) { double("::Win32::Registry::KHKEY_CURRENT_USER") }
   let(:reg_mock) { double("reg") }
 
@@ -252,7 +252,7 @@ describe Chef::Win32::Registry do
       expect(registry).to receive(:key_exists!).with(key_path).and_return(true)
       expect(registry).to receive(:get_hive_and_key).with(key_path).and_return([hive_mock, key])
       expect(hive_mock).to receive(:open).with(key, ::Win32::Registry::KEY_READ | registry.registry_system_architecture).and_yield(reg_mock)
-      expect(reg_mock).to receive(:each_key).and_return(no_args())
+      expect(reg_mock).to receive(:each_key).and_return(no_args)
       expect(registry.has_subkeys?(key_path)).to eq(false)
     end
 
@@ -290,7 +290,7 @@ describe Chef::Win32::Registry do
       expect(registry).to receive(:key_exists!).with(key_path).and_return(true)
       expect(registry).to receive(:get_hive_and_key).with(key_path).and_return([hive_mock, key])
       expect(hive_mock).to receive(:open).with(key, ::Win32::Registry::KEY_READ | registry.registry_system_architecture).and_yield(reg_mock)
-      expect(reg_mock).to receive(:any?).and_yield(no_args())
+      expect(reg_mock).to receive(:any?).and_yield(no_args)
       registry.value_exists?(key_path, value1) == false
     end
   end
@@ -305,7 +305,7 @@ describe Chef::Win32::Registry do
       expect(registry).to receive(:key_exists!).with(key_path).and_return(true)
       expect(registry).to receive(:get_hive_and_key).with(key_path).and_return([hive_mock, key])
       expect(registry).to receive(:get_type_from_name).with(:string).and_return(1)
-      expect(reg_mock).to receive(:each).with(no_args()).and_yield("one", 1, "1")
+      expect(reg_mock).to receive(:each).with(no_args).and_yield("one", 1, "1")
       expect(hive_mock).to receive(:open).with(key, ::Win32::Registry::KEY_READ | registry.registry_system_architecture).and_yield(reg_mock)
       expect(registry.data_exists?(key_path, value1)).to eq(true)
     end
@@ -315,7 +315,7 @@ describe Chef::Win32::Registry do
       expect(registry).to receive(:get_hive_and_key).with(key_path).and_return([hive_mock, key])
       expect(hive_mock).to receive(:open).with(key, ::Win32::Registry::KEY_READ | registry.registry_system_architecture).and_yield(reg_mock)
       expect(registry).to receive(:get_type_from_name).with(:string).and_return(1)
-      expect(reg_mock).to receive(:each).with(no_args()).and_yield("one", 1, "2")
+      expect(reg_mock).to receive(:each).with(no_args).and_yield("one", 1, "2")
       expect(registry.data_exists?(key_path, value1)).to eq(false)
     end
   end

data/spec/unit/win32/security_spec.rb

@@ -98,7 +98,8 @@ describe "Chef::Win32::Security", :windows_only do
     let(:token) do
       Chef::ReservedNames::Win32::Security.open_process_token(
         Chef::ReservedNames::Win32::Process.get_current_process,
-        token_rights)
+        token_rights
+      )
     end
 
     it "raises error if GetTokenInformation fails" do

data/tasks/bin/run_external_test

@@ -17,7 +17,7 @@ include Chef::Mixin::ShellOut
 github_repo = ARGV.shift
 git_thing = ARGV.shift
 
-build_dir = File.expand_path(ENV["TRAVIS_BUILD_DIR"] || Dir.pwd)
+build_dir = Dir.pwd
 
 env = {
   "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'; " \

data/tasks/docs.rb

@@ -11,9 +11,18 @@ namespace :docs_site do
     require "erb"
     require "fileutils"
 
+    # @param version String
+    # @return String Chef Infra Client or Chef Client depending on version
+    def branded_chef_client_name(version)
+      return "Chef Infra Client" if Gem::Version.new(version) >= Gem::Version.new("15")
+
+      "Chef Client"
+    end
+
     # @return [String, nil] a pretty defaul value string or nil if we want to skip it
     def pretty_default(default)
       return nil if default.nil? || default == "" || default == "lazy default"
+
       if default.is_a?(String)
         return default.inspect unless default[0] == ":"
       end
@@ -29,13 +38,13 @@ namespace :docs_site do
       # build the resource string with property spacing between property names and comments
       text = "  #{resource_name} 'name' do\n"
       properties.each do |p|
-        text << "    #{p['name'].ljust(padding_size)}"
+        text << "    #{p["name"].ljust(padding_size)}"
         text << friendly_types_list(p["is"])
         text << " # default value: 'name' unless specified" if p["name_property"]
-        text << " # default value: #{pretty_default(p['default'])}" unless pretty_default(p["default"]).nil?
+        text << " # default value: #{pretty_default(p["default"])}" unless pretty_default(p["default"]).nil?
         text << "\n"
       end
-      text << "    #{'action'.ljust(padding_size)}Symbol # defaults to :#{@default_action.first} if not specified\n"
+      text << "    #{"action".ljust(padding_size)}Symbol # defaults to :#{@default_action.first} if not specified\n"
       text << "  end"
       text
     end
@@ -57,7 +66,7 @@ namespace :docs_site do
     def friendly_properly_list(arr)
       return nil if arr.empty? # resources w/o properties
 
-      props = arr.map { |x| "``#{x['name']}``" }
+      props = arr.map { |x| "``#{x["name"]}``" }
 
       # build the text string containing all properties bolded w/ punctuation
       if props.size > 1
@@ -91,11 +100,13 @@ namespace :docs_site do
     # @return String
     def bolded_description(name, description)
       return nil if description.nil? # handle resources missing descriptions
+
       description.gsub( "#{name} ", "**#{name}** ").split("Note: ").first.strip
     end
 
     def note_text(description)
       return nil if description.nil?
+
       note = description.split("Note: ")[1]
       if note
         <<-HEREDOC
@@ -139,7 +150,7 @@ namespace :docs_site do
         ``sensitive``
           **Ruby Type:** true, false | **Default Value:** ``false``
 
-          Ensure that sensitive resource data is not logged by the Chef Infra Client.
+          Ensure that sensitive resource data is not logged by Chef Infra Client.
 
         .. end_tag
 
@@ -256,66 +267,71 @@ namespace :docs_site do
     end
 
     template = %{=====================================================
-    <%= @name %> resource
-    =====================================================
-    `[edit on GitHub] <https://github.com/chef/chef-web-docs/blob/master/chef_master/source/resource_<%= @name %>.rst>`__
-
-    <%= bolded_description(@name, @description) %>
-    <%= note_text(@description) %>
-    <% unless @introduced.nil? %>
-    **New in Chef Infra Client <%= @introduced %>.**
-    <% end %>
-    Syntax
-    =====================================================
-    The <%= @name %> resource has the following syntax:
-
-    .. code-block:: ruby
-
-    <%= @resource_block %>
-
-    where:
-
-    * ``<%= @name %>`` is the resource.
-    * ``name`` is the name given to the resource block.
-    * ``action`` identifies which steps the Chef Infra Client will take to bring the node into the desired state.
-    <% unless @property_list.nil? %>* <%= @property_list %><% end %>
-
-    Actions
-    =====================================================
-
-    The <%= @name %> resource has the following actions:
-    <% @actions.each do |a| %>
-    ``:<%= a %>``
-       <% if a == @default_action %>Default. <% end %>Description here.
-    <% end %>
-    ``: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.
-
-       .. end_tag
-
-    Properties
-    =====================================================
-
-    The <%= @name %> resource has the following properties:
-    <% @properties.each do |p| %>
-    ``<%= 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 Chef Infra Client <%= p['introduced'] %>.*<% end %>
-    <% end %>
-    <% if @properties.empty? %>This resource does not have any properties.\n<% end %>
-    <%= boilerplate_content %>
-    Examples
-    ==========================================
-    }
+<%= @name %> resource
+=====================================================
+`[edit on GitHub] <https://github.com/chef/chef-web-docs/blob/master/chef_master/source/resource_<%= @name %>.rst>`__
+
+<%= bolded_description(@name, @description) %>
+<%= note_text(@description) -%>
+<% unless @introduced.nil? -%>
+
+**New in <%= branded_chef_client_name(@introduced) %> <%= @introduced %>.**
+<% end -%>
+
+Syntax
+=====================================================
+
+The <%= @name %> resource has the following syntax:
+
+.. code-block:: ruby
+
+<%= @resource_block %>
+
+where:
+
+* ``<%= @name %>`` is the resource.
+* ``name`` is the name given to the resource block.
+* ``action`` identifies which steps Chef Infra Client will take to bring the node into the desired state.
+<% unless @property_list.nil? %>* <%= @property_list %><% end %>
+
+Actions
+=====================================================
+
+The <%= @name %> resource has the following actions:
+<% @actions.each do |a| %>
+``:<%= a %>``
+   <% if a == @default_action %>Default. <% end %>Description here.
+<% end %>
+``: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.
+
+   .. end_tag
+
+Properties
+=====================================================
+
+The <%= @name %> resource has the following properties:
+<% @properties.each do |p| %>
+``<%= 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 -%>
+<% end %>
+<% if @properties.empty? %>This resource does not have any properties.\n<% end -%>
+<%= boilerplate_content %>
+Examples
+==========================================
+<%= @examples -%>
+}
 
     FileUtils.mkdir_p "docs_site"
     resources = Chef::JSONCompat.parse(ResourceInspector.inspect)
     resources.each do |resource, data|
       next if ["scm", "whyrun_safe_ruby_block", "l_w_r_p_base", "user_resource_abstract_base_class", "linux_user", "pw_user", "aix_user", "dscl_user", "solaris_user", "windows_user", ""].include?(resource)
+
       puts "Writing out #{resource}."
       @name = resource
       @description = data["description"]
@@ -327,8 +343,9 @@ namespace :docs_site do
       @properties = data["properties"].reject { |v| v["name"] == "name" }.sort_by! { |v| v["name"] }
       @resource_block = generate_resource_block(resource, @properties)
       @property_list = friendly_properly_list(@properties)
+      @examples = data["examples"]
 
-      t = ERB.new(template)
+      t = ERB.new(template, nil, "-")
       File.open("docs_site/resource_#{@name}.rst", "w") do |f|
         f.write t.result(binding)
       end