chef 14.14.29 → 14.15.6

data/spec/unit/mixin/windows_architecture_helper_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Mixin::WindowsArchitectureHelper do
   include Chef::Mixin::WindowsArchitectureHelper
 
   before do
-    @valid_architectures = [ :i386, :x86_64 ]
+    @valid_architectures = %i{i386 x86_64}
     @invalid_architectures = [ "i386", "x86_64", :x64, :x86, :arm ]
 
     @node_i386 = Chef::Node.new
@@ -67,14 +67,14 @@ describe Chef::Mixin::WindowsArchitectureHelper do
   it "returns true only when forced_32bit_override_required? has 64-bit node architecture and 32-bit desired architecture" do
     with_node_architecture_combinations do |node, desired_arch|
       expect(forced_32bit_override_required?(node, desired_arch)).to be true if (node_windows_architecture(node) == :x86_64) && (desired_arch == :i386) && !is_i386_process_on_x86_64_windows?
-      expect(forced_32bit_override_required?(node, desired_arch)).to be false if ! ((node_windows_architecture(node) == :x86_64) && (desired_arch == :i386))
+      expect(forced_32bit_override_required?(node, desired_arch)).to be false unless (node_windows_architecture(node) == :x86_64) && (desired_arch == :i386)
     end
   end
 
   def with_node_architecture_combinations
     @valid_architectures.each do |node_architecture|
       new_node = Chef::Node.new
-      new_node.default["kernel"] = Hash.new
+      new_node.default["kernel"] = {}
       new_node.default["kernel"][:machine] = node_architecture.to_s
 
       @valid_architectures.each do |architecture|

data/spec/unit/node/attribute_spec.rb

@@ -63,16 +63,16 @@ describe Chef::Node::Attribute do
                                                      "mtu" => "1280",
                                                      "type" => "gif",
                                                      "encapsulation" => "IPIP" },
-                                         "vmnet8" =>         { "flags" => %w{UP BROADCAST SMART RUNNING SIMPLEX MULTICAST},
-                                                               "number" => "8",
-                                                               "addresses" => { "192.168.4.1" => { "broadcast" => "192.168.4.255",
-                                                                                                   "netmask" => "255.255.255.0",
-                                                                                                   "family" => "inet" },
-                                                                                "00:50:56:c0:00:08" => { "family" => "lladdr" } },
-                                                               "mtu" => "1500",
-                                                               "type" => "vmnet",
-                                                               "arp" => { "192.168.4.255" => "ff:ff:ff:ff:ff:ff" },
-                                                               "encapsulation" => "Ethernet" },
+                                         "vmnet8" => { "flags" => %w{UP BROADCAST SMART RUNNING SIMPLEX MULTICAST},
+                                                       "number" => "8",
+                                                       "addresses" => { "192.168.4.1" => { "broadcast" => "192.168.4.255",
+                                                                                           "netmask" => "255.255.255.0",
+                                                                                           "family" => "inet" },
+                                                                        "00:50:56:c0:00:08" => { "family" => "lladdr" } },
+                                                       "mtu" => "1500",
+                                                       "type" => "vmnet",
+                                                       "arp" => { "192.168.4.255" => "ff:ff:ff:ff:ff:ff" },
+                                                       "encapsulation" => "Ethernet" },
                                          "en0" => { "status" => "inactive",
                                                     "flags" => %w{UP BROADCAST SMART RUNNING SIMPLEX MULTICAST},
                                                     "number" => "0",
@@ -80,9 +80,9 @@ describe Chef::Node::Attribute do
                                                     "mtu" => "1500",
                                                     "media" => { "supported" => { "autoselect" => { "options" => [] },
                                                                                   "none" => { "options" => [] },
-                                                                                  "1000baseT" => { "options" => ["full-duplex", "flow-control", "hw-loopback"] },
-                                                                                  "10baseT/UTP" =>               { "options" => ["half-duplex", "full-duplex", "flow-control", "hw-loopback"] },
-                                                                                  "100baseTX" =>                 { "options" => ["half-duplex", "full-duplex", "flow-control", "hw-loopback"] } },
+                                                                                  "1000baseT" => { "options" => %w{full-duplex flow-control hw-loopback} },
+                                                                                  "10baseT/UTP" => { "options" => %w{half-duplex full-duplex flow-control hw-loopback} },
+                                                                                  "100baseTX" => { "options" => %w{half-duplex full-duplex flow-control hw-loopback} } },
                                                                  "selected" => { "autoselect" => { "options" => [] } } },
                                                     "type" => "en",
                                                     "encapsulation" => "Ethernet" },
@@ -118,28 +118,28 @@ describe Chef::Node::Attribute do
                                                                  "selected" => { "autoselect" => { "options" => [] } } },
                                                     "type" => "en",
                                                     "encapsulation" => "Ethernet" },
-                                         "fw0" =>                       { "status" => "inactive",
-                                                                          "flags" => %w{BROADCAST SIMPLEX MULTICAST},
-                                                                          "number" => "0",
-                                                                          "addresses" => { "00:23:32:ff:fe:b0:32:f2" => { "family" => "lladdr" } },
-                                                                          "mtu" => "4078",
-                                                                          "media" => { "supported" => { "autoselect" => { "options" => ["full-duplex"] } },
-                                                                                       "selected" => { "autoselect" => { "options" => ["full-duplex"] } } },
-                                                                          "type" => "fw",
-                                                                          "encapsulation" => "1394" },
-                                         "en3" =>                       { "status" => "active",
-                                                                          "flags" => %w{UP BROADCAST SMART RUNNING SIMPLEX MULTICAST},
-                                                                          "number" => "3",
-                                                                          "addresses" => { "169.254.206.152" => { "broadcast" => "169.254.255.255",
-                                                                                                                  "netmask" => "255.255.0.0",
-                                                                                                                  "family" => "inet" },
-                                                                                           "00:1c:42:00:00:00" => { "family" => "lladdr" },
-                                                                                           "fe80::21c:42ff:fe00:0" => { "scope" => "Link", "prefixlen" => "64", "family" => "inet6" } },
-                                                                          "mtu" => "1500",
-                                                                          "media" => { "supported" => { "autoselect" => { "options" => [] } },
-                                                                                       "selected" => { "autoselect" => { "options" => [] } } },
-                                                                          "type" => "en",
-                                                                          "encapsulation" => "Ethernet" } } },
+                                         "fw0" => { "status" => "inactive",
+                                                    "flags" => %w{BROADCAST SIMPLEX MULTICAST},
+                                                    "number" => "0",
+                                                    "addresses" => { "00:23:32:ff:fe:b0:32:f2" => { "family" => "lladdr" } },
+                                                    "mtu" => "4078",
+                                                    "media" => { "supported" => { "autoselect" => { "options" => ["full-duplex"] } },
+                                                                 "selected" => { "autoselect" => { "options" => ["full-duplex"] } } },
+                                                    "type" => "fw",
+                                                    "encapsulation" => "1394" },
+                                         "en3" => { "status" => "active",
+                                                    "flags" => %w{UP BROADCAST SMART RUNNING SIMPLEX MULTICAST},
+                                                    "number" => "3",
+                                                    "addresses" => { "169.254.206.152" => { "broadcast" => "169.254.255.255",
+                                                                                            "netmask" => "255.255.0.0",
+                                                                                            "family" => "inet" },
+                                                                     "00:1c:42:00:00:00" => { "family" => "lladdr" },
+                                                                     "fe80::21c:42ff:fe00:0" => { "scope" => "Link", "prefixlen" => "64", "family" => "inet6" } },
+                                                    "mtu" => "1500",
+                                                    "media" => { "supported" => { "autoselect" => { "options" => [] } },
+                                                                 "selected" => { "autoselect" => { "options" => [] } } },
+                                                    "type" => "en",
+                                                    "encapsulation" => "Ethernet" } } },
         "fqdn" => "latte.local",
         "ohai_time" => 1249065590.90391,
         "domain" => "local",
@@ -182,7 +182,7 @@ describe Chef::Node::Attribute do
       expect { Chef::Node::Attribute.new({}, {}, {}, {}) }.not_to raise_error
     end
 
-    [ :normal, :default, :override, :automatic ].each do |accessor|
+    %i{normal default override automatic}.each do |accessor|
       it "should set #{accessor}" do
         na = Chef::Node::Attribute.new({ normal: true }, { default: true }, { override: true }, { automatic: true })
         expect(na.send(accessor)).to eq({ accessor.to_s => true })
@@ -546,7 +546,7 @@ describe Chef::Node::Attribute do
       expect(@attributes["music"]["this"]).not_to have_key("must")
     end
 
-    [:include?, :key?, :member?].each do |method|
+    %i{include? key? member?}.each do |method|
       it "should alias the method #{method} to itself" do
         expect(@attributes).to respond_to(method)
       end
@@ -572,8 +572,8 @@ describe Chef::Node::Attribute do
     before(:each) do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  { "two" => "three" },
-          "hut" =>  { "two" => "three" },
+          "one" => { "two" => "three" },
+          "hut" => { "two" => "three" },
           "place" => {},
         },
         {
@@ -589,7 +589,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should yield each top level key" do
-      collect = Array.new
+      collect = []
       @attributes.each_key do |k|
         collect << k
       end
@@ -602,7 +602,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should yield lower if we go deeper" do
-      collect = Array.new
+      collect = []
       @attributes["one"].each_key do |k|
         collect << k
       end
@@ -621,11 +621,11 @@ describe Chef::Node::Attribute do
     before(:each) do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -637,7 +637,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should yield each top level key and value, post merge rules" do
-      collect = Hash.new
+      collect = {}
       @attributes.each do |k, v|
         collect[k] = v
       end
@@ -659,11 +659,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -679,7 +679,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should yield each top level key, post merge rules" do
-      collect = Array.new
+      collect = []
       @attributes.each_key do |k|
         collect << k
       end
@@ -695,11 +695,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -715,7 +715,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should yield each top level key and value pair, post merge rules" do
-      collect = Hash.new
+      collect = {}
       @attributes.each_pair do |k, v|
         collect[k] = v
       end
@@ -731,11 +731,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -751,7 +751,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should yield each value, post merge rules" do
-      collect = Array.new
+      collect = []
       @attributes.each_value do |v|
         collect << v
       end
@@ -762,7 +762,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should yield four elements" do
-      collect = Array.new
+      collect = []
       @attributes.each_value do |v|
         collect << v
       end
@@ -775,11 +775,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -809,11 +809,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -866,11 +866,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -911,11 +911,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -952,11 +952,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -988,11 +988,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {
@@ -1038,11 +1038,11 @@ describe Chef::Node::Attribute do
     before do
       @attributes = Chef::Node::Attribute.new(
         {
-          "one" =>  "two",
-          "hut" =>  "three",
+          "one" => "two",
+          "hut" => "three",
         },
         {
-          "one" =>  "four",
+          "one" => "four",
           "snakes" => "on a plane",
         },
         {

data/spec/unit/node/immutable_collections_spec.rb

@@ -145,25 +145,25 @@ describe Chef::Node::ImmutableMash do
     end
   end
 
-  [
-    :[]=,
-    :clear,
-    :default=,
-    :default_proc=,
-    :delete,
-    :delete_if,
-    :keep_if,
-    :merge!,
-    :update,
-    :reject!,
-    :replace,
-    :select!,
-    :shift,
-    :write,
-    :write!,
-    :unlink,
-    :unlink!,
-  ].each do |mutator|
+  %i{
+    []=
+    clear
+    default=
+    default_proc=
+    delete
+    delete_if
+    keep_if
+    merge!
+    update
+    reject!
+    replace
+    select!
+    shift
+    write
+    write!
+    unlink
+    unlink!
+  }.each do |mutator|
     it "doesn't allow mutation via `#{mutator}'" do
       expect { @immutable_mash.send(mutator) }.to raise_error(Chef::Exceptions::ImmutableAttributeModification)
     end
@@ -190,37 +190,37 @@ describe Chef::Node::ImmutableArray do
   # with ImmutableMash, above
   ###
 
-  [
-    :<<,
-    :[]=,
-    :clear,
-    :collect!,
-    :compact!,
-    :default=,
-    :default_proc=,
-    :delete,
-    :delete_at,
-    :delete_if,
-    :fill,
-    :flatten!,
-    :insert,
-    :keep_if,
-    :map!,
-    :merge!,
-    :pop,
-    :push,
-    :update,
-    :reject!,
-    :reverse!,
-    :replace,
-    :select!,
-    :shift,
-    :slice!,
-    :sort!,
-    :sort_by!,
-    :uniq!,
-    :unshift,
-  ].each do |mutator|
+  %i{
+    <<
+    []=
+    clear
+    collect!
+    compact!
+    default=
+    default_proc=
+    delete
+    delete_at
+    delete_if
+    fill
+    flatten!
+    insert
+    keep_if
+    map!
+    merge!
+    pop
+    push
+    update
+    reject!
+    reverse!
+    replace
+    select!
+    shift
+    slice!
+    sort!
+    sort_by!
+    uniq!
+    unshift
+  }.each do |mutator|
     it "does not allow mutation via `#{mutator}" do
       expect { @immutable_array.send(mutator) }.to raise_error(Chef::Exceptions::ImmutableAttributeModification)
     end