ohai 14.2.0 → 14.3.0

data/spec/unit/plugins/digital_ocean_spec.rb

@@ -62,9 +62,9 @@ describe Ohai::System, "plugin digital_ocean" do
     end
 
     it "should fetch and properly parse json metadata" do
-      expect(@http_client).to receive(:get).
-        with("/metadata/v1.json").
-        and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+      expect(@http_client).to receive(:get)
+        .with("/metadata/v1.json")
+        .and_return(double("Net::HTTP Response", body: body, code: "200"))
       plugin.run
 
       expect(plugin[:digital_ocean]).not_to be_nil
@@ -73,9 +73,9 @@ describe Ohai::System, "plugin digital_ocean" do
     end
 
     it "should complete the run despite unavailable metadata" do
-      expect(@http_client).to receive(:get).
-        with("/metadata/v1.json").
-        and_return(double("Net::HTTP Response", :body => "", :code => "404"))
+      expect(@http_client).to receive(:get)
+        .with("/metadata/v1.json")
+        .and_return(double("Net::HTTP Response", body: "", code: "404"))
       plugin.run
 
       expect(plugin[:digitalocean]).to be_nil
@@ -98,7 +98,7 @@ describe Ohai::System, "plugin digital_ocean" do
     it_should_behave_like "digital_ocean"
 
     before(:each) do
-      plugin[:dmi] = { :bios => { :all_records => [ { :Vendor => "DigitalOcean" } ] } }
+      plugin[:dmi] = { bios: { all_records: [ { Vendor: "DigitalOcean" } ] } }
     end
   end
 end

data/spec/unit/plugins/dmi_spec.rb

@@ -19,85 +19,85 @@
 require_relative "../../spec_helper.rb"
 
 # NOTE: These data lines must be prefixed with one or two tabs, not spaces.
-DMI_OUT = <<-EOS
-# dmidecode 2.9
-SMBIOS 2.4 present.
-98 structures occupying 3699 bytes.
-Table at 0x000E0010.
+DMI_OUT = <<~EOS.freeze
+  # dmidecode 2.9
+  SMBIOS 2.4 present.
+  98 structures occupying 3699 bytes.
+  Table at 0x000E0010.
 
-Handle 0x0000, DMI type 0, 24 bytes
-BIOS Information
-	Vendor: Phoenix Technologies LTD
-	Version: 6.00
-	Release Date: 12/31/2009
-	Address: 0xEA2E0
-	Runtime Size: 89376 bytes
-	ROM Size: 64 kB
-	Characteristics:
-		ISA is supported
-		PCI is supported
-		PC Card (PCMCIA) is supported
-		PNP is supported
-		APM is supported
-		BIOS is upgradeable
-		BIOS shadowing is allowed
-		ESCD support is available
-		USB legacy is supported
-		Smart battery is supported
-		BIOS boot specification is supported
-		Targeted content distribution is supported
-	BIOS Revision: 4.6
-	Firmware Revision: 0.0
+  Handle 0x0000, DMI type 0, 24 bytes
+  BIOS Information
+  	Vendor: Phoenix Technologies LTD
+  	Version: 6.00
+  	Release Date: 12/31/2009
+  	Address: 0xEA2E0
+  	Runtime Size: 89376 bytes
+  	ROM Size: 64 kB
+  	Characteristics:
+  		ISA is supported
+  		PCI is supported
+  		PC Card (PCMCIA) is supported
+  		PNP is supported
+  		APM is supported
+  		BIOS is upgradeable
+  		BIOS shadowing is allowed
+  		ESCD support is available
+  		USB legacy is supported
+  		Smart battery is supported
+  		BIOS boot specification is supported
+  		Targeted content distribution is supported
+  	BIOS Revision: 4.6
+  	Firmware Revision: 0.0
 
-Handle 0x0001, DMI type 1, 27 bytes
-System Information
-	Manufacturer: VMware, Inc.
-	Product Name: VMware Virtual Platform
-	Version: None
-	Serial Number: VMware-56 4d 71 d1 65 70 83 a8-df c8 14 12 19 41 71 45
-	UUID: 564D71D1-6570-83A8-DFC8-141219417145
-	Wake-up Type: Power Switch
-	SKU Number: Not Specified
-	Family: Not Specified
+  Handle 0x0001, DMI type 1, 27 bytes
+  System Information
+  	Manufacturer: VMware, Inc.
+  	Product Name: VMware Virtual Platform
+  	Version: None
+  	Serial Number: VMware-56 4d 71 d1 65 70 83 a8-df c8 14 12 19 41 71 45
+  	UUID: 564D71D1-6570-83A8-DFC8-141219417145
+  	Wake-up Type: Power Switch
+  	SKU Number: Not Specified
+  	Family: Not Specified
 
-Handle 0x0002, DMI type 2, 15 bytes
-Base Board Information
-	Manufacturer: Intel Corporation
-	Product Name: 440BX Desktop Reference Platform
-	Version: None
-	Serial Number: None
-	Asset Tag: Not Specified
-	Features: None
-	Location In Chassis: Not Specified
-	Chassis Handle: 0x0000
-	Type: Unknown
-	Contained Object Handles: 0
+  Handle 0x0002, DMI type 2, 15 bytes
+  Base Board Information
+  	Manufacturer: Intel Corporation
+  	Product Name: 440BX Desktop Reference Platform
+  	Version: None
+  	Serial Number: None
+  	Asset Tag: Not Specified
+  	Features: None
+  	Location In Chassis: Not Specified
+  	Chassis Handle: 0x0000
+  	Type: Unknown
+  	Contained Object Handles: 0
 
-Handle 0x1000, DMI type 16, 15 bytes
-Physical Memory Array
-	Location: Other
-	Use: System Memory
-	Error Correction Type: Multi-bit ECC
-	Maximum Capacity: 2 GB
-	Error Information Handle: Not Provided
-	Number Of Devices: 1
+  Handle 0x1000, DMI type 16, 15 bytes
+  Physical Memory Array
+  	Location: Other
+  	Use: System Memory
+  	Error Correction Type: Multi-bit ECC
+  	Maximum Capacity: 2 GB
+  	Error Information Handle: Not Provided
+  	Number Of Devices: 1
 
-Handle 0x0003, DMI type 3, 21 bytes
-Chassis Information
-	Manufacturer: No Enclosure
-	Type: Other
-	Lock: Not Present
-	Version: N/A
-	Serial Number: None
-	Asset Tag: No Asset Tag
-	Boot-up State: Safe
-	Power Supply State: Safe
-	Thermal State: Safe
-	Security Status: None
-	OEM Information: 0x00001234
-	Height: Unspecified
-	Number Of Power Cords: Unspecified
-	Contained Elements: 0
+  Handle 0x0003, DMI type 3, 21 bytes
+  Chassis Information
+  	Manufacturer: No Enclosure
+  	Type: Other
+  	Lock: Not Present
+  	Version: N/A
+  	Serial Number: None
+  	Asset Tag: No Asset Tag
+  	Boot-up State: Safe
+  	Power Supply State: Safe
+  	Thermal State: Safe
+  	Security Status: None
+  	OEM Information: 0x00001234
+  	Height: Unspecified
+  	Number Of Power Cords: Unspecified
+  	Contained Elements: 0
 EOS
 
 describe Ohai::System, "plugin dmi" do
@@ -115,17 +115,17 @@ describe Ohai::System, "plugin dmi" do
 
   # Test some simple sample data
   {
-    :bios => {
-      :vendor => "Phoenix Technologies LTD",
-      :release_date => "12/31/2009",
+    bios: {
+      vendor: "Phoenix Technologies LTD",
+      release_date: "12/31/2009",
     },
-    :system => {
-      :manufacturer => "VMware, Inc.",
-      :product_name => "VMware Virtual Platform",
+    system: {
+      manufacturer: "VMware, Inc.",
+      product_name: "VMware Virtual Platform",
     },
-    :chassis => {
-      :lock => "Not Present",
-      :asset_tag => "No Asset Tag",
+    chassis: {
+      lock: "Not Present",
+      asset_tag: "No Asset Tag",
     },
   }.each do |id, data|
     data.each do |attribute, value|

data/spec/unit/plugins/docker_spec.rb

@@ -16,8 +16,8 @@
 
 require_relative "../../spec_helper.rb"
 
-docker_output = <<EOF
-{"ID":"KZET:VDFN:2V2G:JS5Z:HAKO:SOGI:AFSZ:HDMT:GVEM:V2NT:DUSW:J3Z6","Containers":11,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":11,"Images":30,"Driver":"overlay2","DriverStatus":[["Backing Filesystem","extfs"],["Supports d_type","true"],["Native Overlay Diff","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","ipvlan","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":21,"OomKillDisable":true,"NGoroutines":39,"SystemTime":"2018-02-15T19:12:40.214106068Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":2,"KernelVersion":"4.9.60-linuxkit-aufs","OperatingSystem":"Docker for Mac","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":[],"AllowNondistributableArtifactsHostnames":[],"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":[],"Secure":true,"Official":true}},"Mirrors":[]},"NCPU":4,"MemTotal":2095816704,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"docker.for.mac.http.internal:3128","HttpsProxy":"docker.for.mac.http.internal:3129","NoProxy":"","Name":"linuxkit-025000000001","Labels":[],"ExperimentalBuild":true,"ServerVersion":"17.12.0-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"89623f28b87a6004d4b785663257362d1658a729","Expected":"89623f28b87a6004d4b785663257362d1658a729"},"RuncCommit":{"ID":"b2567b37d7b75eb4cf325b77297b140ea686ce8f","Expected":"b2567b37d7b75eb4cf325b77297b140ea686ce8f"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=seccomp,profile=default"]}
+docker_output = <<~EOF
+  {"ID":"KZET:VDFN:2V2G:JS5Z:HAKO:SOGI:AFSZ:HDMT:GVEM:V2NT:DUSW:J3Z6","Containers":11,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":11,"Images":30,"Driver":"overlay2","DriverStatus":[["Backing Filesystem","extfs"],["Supports d_type","true"],["Native Overlay Diff","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","ipvlan","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":21,"OomKillDisable":true,"NGoroutines":39,"SystemTime":"2018-02-15T19:12:40.214106068Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":2,"KernelVersion":"4.9.60-linuxkit-aufs","OperatingSystem":"Docker for Mac","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":[],"AllowNondistributableArtifactsHostnames":[],"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":[],"Secure":true,"Official":true}},"Mirrors":[]},"NCPU":4,"MemTotal":2095816704,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"docker.for.mac.http.internal:3128","HttpsProxy":"docker.for.mac.http.internal:3129","NoProxy":"","Name":"linuxkit-025000000001","Labels":[],"ExperimentalBuild":true,"ServerVersion":"17.12.0-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"89623f28b87a6004d4b785663257362d1658a729","Expected":"89623f28b87a6004d4b785663257362d1658a729"},"RuncCommit":{"ID":"b2567b37d7b75eb4cf325b77297b140ea686ce8f","Expected":"b2567b37d7b75eb4cf325b77297b140ea686ce8f"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=seccomp,profile=default"]}
 EOF
 
 expected_output = {

data/spec/unit/plugins/ec2_spec.rb

@@ -48,9 +48,9 @@ describe Ohai::System, "plugin ec2" do
       t = double("connection")
       allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
       allow(Socket).to receive(:new).and_return(t)
-      expect(@http_client).to receive(:get).
-        with("/").
-        and_return(double("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
+      expect(@http_client).to receive(:get)
+        .with("/")
+        .and_return(double("Net::HTTP Response", body: "2012-01-12", code: "200"))
     end
 
     context "with common metadata paths" do
@@ -64,16 +64,16 @@ describe Ohai::System, "plugin ec2" do
 
       it "recursively fetches all the ec2 metadata" do
         paths.each do |name, body|
-          expect(@http_client).to receive(:get).
-            with("/2012-01-12/#{name}").
-            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+          expect(@http_client).to receive(:get)
+            .with("/2012-01-12/#{name}")
+            .and_return(double("Net::HTTP Response", body: body, code: "200"))
         end
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/user-data/").
-          and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/dynamic/instance-identity/document/").
-          and_return(double("Net::HTTP Response", :body => "{\"accountId\":\"4815162342\"}", :code => "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/user-data/")
+          .and_return(double("Net::HTTP Response", body: "By the pricking of my thumb...", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/dynamic/instance-identity/document/")
+          .and_return(double("Net::HTTP Response", body: "{\"accountId\":\"4815162342\"}", code: "200"))
 
         plugin.run
 
@@ -85,16 +85,16 @@ describe Ohai::System, "plugin ec2" do
 
       it "fetches binary userdata opaquely" do
         paths.each do |name, body|
-          expect(@http_client).to receive(:get).
-            with("/2012-01-12/#{name}").
-            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+          expect(@http_client).to receive(:get)
+            .with("/2012-01-12/#{name}")
+            .and_return(double("Net::HTTP Response", body: body, code: "200"))
         end
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/user-data/").
-          and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/dynamic/instance-identity/document/").
-          and_return(double("Net::HTTP Response", :body => "{\"accountId\":\"4815162342\"}", :code => "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/user-data/")
+          .and_return(double("Net::HTTP Response", body: "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/dynamic/instance-identity/document/")
+          .and_return(double("Net::HTTP Response", body: "{\"accountId\":\"4815162342\"}", code: "200"))
 
         plugin.run
 
@@ -107,16 +107,16 @@ describe Ohai::System, "plugin ec2" do
 
       it "fetches AWS account id" do
         paths.each do |name, body|
-          expect(@http_client).to receive(:get).
-            with("/2012-01-12/#{name}").
-            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+          expect(@http_client).to receive(:get)
+            .with("/2012-01-12/#{name}")
+            .and_return(double("Net::HTTP Response", body: body, code: "200"))
         end
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/user-data/").
-          and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/dynamic/instance-identity/document/").
-          and_return(double("Net::HTTP Response", :body => "{\"accountId\":\"4815162342\"}", :code => "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/user-data/")
+          .and_return(double("Net::HTTP Response", body: "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/dynamic/instance-identity/document/")
+          .and_return(double("Net::HTTP Response", body: "{\"accountId\":\"4815162342\"}", code: "200"))
 
         plugin.run
 
@@ -129,16 +129,16 @@ describe Ohai::System, "plugin ec2" do
 
       it "fetches AWS region" do
         paths.each do |name, body|
-          expect(@http_client).to receive(:get).
-            with("/2012-01-12/#{name}").
-            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+          expect(@http_client).to receive(:get)
+            .with("/2012-01-12/#{name}")
+            .and_return(double("Net::HTTP Response", body: body, code: "200"))
         end
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/user-data/").
-          and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/dynamic/instance-identity/document/").
-          and_return(double("Net::HTTP Response", :body => "{\"region\":\"us-east-1\"}", :code => "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/user-data/")
+          .and_return(double("Net::HTTP Response", body: "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/dynamic/instance-identity/document/")
+          .and_return(double("Net::HTTP Response", body: "{\"region\":\"us-east-1\"}", code: "200"))
 
         plugin.run
 
@@ -151,16 +151,16 @@ describe Ohai::System, "plugin ec2" do
 
       it "fetches AWS availability zone" do
         paths.each do |name, body|
-          expect(@http_client).to receive(:get).
-            with("/2012-01-12/#{name}").
-            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+          expect(@http_client).to receive(:get)
+            .with("/2012-01-12/#{name}")
+            .and_return(double("Net::HTTP Response", body: body, code: "200"))
         end
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/user-data/").
-          and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/dynamic/instance-identity/document/").
-          and_return(double("Net::HTTP Response", :body => "{\"availabilityZone\":\"us-east-1d\"}", :code => "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/user-data/")
+          .and_return(double("Net::HTTP Response", body: "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/dynamic/instance-identity/document/")
+          .and_return(double("Net::HTTP Response", body: "{\"availabilityZone\":\"us-east-1d\"}", code: "200"))
 
         plugin.run
 
@@ -173,30 +173,30 @@ describe Ohai::System, "plugin ec2" do
     end
 
     it "parses ec2 network/ directory as a multi-level hash" do
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/").
-        and_return(double("Net::HTTP Response", :body => "network/", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/network/").
-        and_return(double("Net::HTTP Response", :body => "interfaces/", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/network/interfaces/").
-        and_return(double("Net::HTTP Response", :body => "macs/", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/network/interfaces/macs/").
-        and_return(double("Net::HTTP Response", :body => "12:34:56:78:9a:bc/", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/network/interfaces/macs/12:34:56:78:9a:bc/").
-        and_return(double("Net::HTTP Response", :body => "public_hostname", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/network/interfaces/macs/12:34:56:78:9a:bc/public_hostname").
-        and_return(double("Net::HTTP Response", :body => "server17.opscode.com", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/user-data/").
-        and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/dynamic/instance-identity/document/").
-        and_return(double("Net::HTTP Response", :body => "{\"accountId\":\"4815162342\"}", :code => "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/")
+        .and_return(double("Net::HTTP Response", body: "network/", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/network/")
+        .and_return(double("Net::HTTP Response", body: "interfaces/", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/network/interfaces/")
+        .and_return(double("Net::HTTP Response", body: "macs/", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/network/interfaces/macs/")
+        .and_return(double("Net::HTTP Response", body: "12:34:56:78:9a:bc/", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/network/interfaces/macs/12:34:56:78:9a:bc/")
+        .and_return(double("Net::HTTP Response", body: "public_hostname", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/network/interfaces/macs/12:34:56:78:9a:bc/public_hostname")
+        .and_return(double("Net::HTTP Response", body: "server17.opscode.com", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/user-data/")
+        .and_return(double("Net::HTTP Response", body: "By the pricking of my thumb...", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/dynamic/instance-identity/document/")
+        .and_return(double("Net::HTTP Response", body: "{\"accountId\":\"4815162342\"}", code: "200"))
 
       plugin.run
 
@@ -210,24 +210,24 @@ describe Ohai::System, "plugin ec2" do
       end
 
       it "parses ec2 iam/ directory and collect iam/security-credentials/" do
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/meta-data/").
-          and_return(double("Net::HTTP Response", :body => "iam/", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/meta-data/iam/").
-          and_return(double("Net::HTTP Response", :body => "security-credentials/", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/meta-data/iam/security-credentials/").
-          and_return(double("Net::HTTP Response", :body => "MyRole", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/meta-data/iam/security-credentials/MyRole").
-          and_return(double("Net::HTTP Response", :body => "{\n  \"Code\" : \"Success\",\n  \"LastUpdated\" : \"2012-08-22T07:47:22Z\",\n  \"Type\" : \"AWS-HMAC\",\n  \"AccessKeyId\" : \"AAAAAAAA\",\n  \"SecretAccessKey\" : \"SSSSSSSS\",\n  \"Token\" : \"12345678\",\n  \"Expiration\" : \"2012-08-22T11:25:52Z\"\n}", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/user-data/").
-          and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/dynamic/instance-identity/document/").
-          and_return(double("Net::HTTP Response", :body => "{\"accountId\":\"4815162342\"}", :code => "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/meta-data/")
+          .and_return(double("Net::HTTP Response", body: "iam/", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/meta-data/iam/")
+          .and_return(double("Net::HTTP Response", body: "security-credentials/", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/meta-data/iam/security-credentials/")
+          .and_return(double("Net::HTTP Response", body: "MyRole", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/meta-data/iam/security-credentials/MyRole")
+          .and_return(double("Net::HTTP Response", body: "{\n  \"Code\" : \"Success\",\n  \"LastUpdated\" : \"2012-08-22T07:47:22Z\",\n  \"Type\" : \"AWS-HMAC\",\n  \"AccessKeyId\" : \"AAAAAAAA\",\n  \"SecretAccessKey\" : \"SSSSSSSS\",\n  \"Token\" : \"12345678\",\n  \"Expiration\" : \"2012-08-22T11:25:52Z\"\n}", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/user-data/")
+          .and_return(double("Net::HTTP Response", body: "By the pricking of my thumb...", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/dynamic/instance-identity/document/")
+          .and_return(double("Net::HTTP Response", body: "{\"accountId\":\"4815162342\"}", code: "200"))
 
         plugin.run
 
@@ -243,24 +243,24 @@ describe Ohai::System, "plugin ec2" do
       end
 
       it "parses ec2 iam/ directory and NOT collect iam/security-credentials/" do
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/meta-data/").
-          and_return(double("Net::HTTP Response", :body => "iam/", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/meta-data/iam/").
-          and_return(double("Net::HTTP Response", :body => "security-credentials/", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/meta-data/iam/security-credentials/").
-          and_return(double("Net::HTTP Response", :body => "MyRole", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/meta-data/iam/security-credentials/MyRole").
-          and_return(double("Net::HTTP Response", :body => "{\n  \"Code\" : \"Success\",\n  \"LastUpdated\" : \"2012-08-22T07:47:22Z\",\n  \"Type\" : \"AWS-HMAC\",\n  \"AccessKeyId\" : \"AAAAAAAA\",\n  \"SecretAccessKey\" : \"SSSSSSSS\",\n  \"Token\" : \"12345678\",\n  \"Expiration\" : \"2012-08-22T11:25:52Z\"\n}", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/user-data/").
-          and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/dynamic/instance-identity/document/").
-          and_return(double("Net::HTTP Response", :body => "{\"accountId\":\"4815162342\"}", :code => "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/meta-data/")
+          .and_return(double("Net::HTTP Response", body: "iam/", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/meta-data/iam/")
+          .and_return(double("Net::HTTP Response", body: "security-credentials/", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/meta-data/iam/security-credentials/")
+          .and_return(double("Net::HTTP Response", body: "MyRole", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/meta-data/iam/security-credentials/MyRole")
+          .and_return(double("Net::HTTP Response", body: "{\n  \"Code\" : \"Success\",\n  \"LastUpdated\" : \"2012-08-22T07:47:22Z\",\n  \"Type\" : \"AWS-HMAC\",\n  \"AccessKeyId\" : \"AAAAAAAA\",\n  \"SecretAccessKey\" : \"SSSSSSSS\",\n  \"Token\" : \"12345678\",\n  \"Expiration\" : \"2012-08-22T11:25:52Z\"\n}", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/user-data/")
+          .and_return(double("Net::HTTP Response", body: "By the pricking of my thumb...", code: "200"))
+        expect(@http_client).to receive(:get)
+          .with("/2012-01-12/dynamic/instance-identity/document/")
+          .and_return(double("Net::HTTP Response", body: "{\"accountId\":\"4815162342\"}", code: "200"))
 
         plugin.run
 
@@ -270,39 +270,39 @@ describe Ohai::System, "plugin ec2" do
     end
 
     it "ignores \"./\" and \"../\" on ec2 metadata paths to avoid infinity loops" do
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/").
-        and_return(double("Net::HTTP Response", :body => ".\n./\n..\n../\npath1/.\npath2/./\npath3/..\npath4/../", :code => "200"))
-
-      expect(@http_client).not_to receive(:get).
-        with("/2012-01-12/meta-data/.")
-      expect(@http_client).not_to receive(:get).
-        with("/2012-01-12/meta-data/./")
-      expect(@http_client).not_to receive(:get).
-        with("/2012-01-12/meta-data/..")
-      expect(@http_client).not_to receive(:get).
-        with("/2012-01-12/meta-data/../")
-      expect(@http_client).not_to receive(:get).
-        with("/2012-01-12/meta-data/path1/..")
-
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/path1/").
-        and_return(double("Net::HTTP Response", :body => "", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/path2/").
-        and_return(double("Net::HTTP Response", :body => "", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/path3/").
-        and_return(double("Net::HTTP Response", :body => "", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/path4/").
-        and_return(double("Net::HTTP Response", :body => "", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/user-data/").
-        and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/dynamic/instance-identity/document/").
-        and_return(double("Net::HTTP Response", :body => "{\"accountId\":\"4815162342\"}", :code => "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/")
+        .and_return(double("Net::HTTP Response", body: ".\n./\n..\n../\npath1/.\npath2/./\npath3/..\npath4/../", code: "200"))
+
+      expect(@http_client).not_to receive(:get)
+        .with("/2012-01-12/meta-data/.")
+      expect(@http_client).not_to receive(:get)
+        .with("/2012-01-12/meta-data/./")
+      expect(@http_client).not_to receive(:get)
+        .with("/2012-01-12/meta-data/..")
+      expect(@http_client).not_to receive(:get)
+        .with("/2012-01-12/meta-data/../")
+      expect(@http_client).not_to receive(:get)
+        .with("/2012-01-12/meta-data/path1/..")
+
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/path1/")
+        .and_return(double("Net::HTTP Response", body: "", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/path2/")
+        .and_return(double("Net::HTTP Response", body: "", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/path3/")
+        .and_return(double("Net::HTTP Response", body: "", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/path4/")
+        .and_return(double("Net::HTTP Response", body: "", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/user-data/")
+        .and_return(double("Net::HTTP Response", body: "By the pricking of my thumb...", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/dynamic/instance-identity/document/")
+        .and_return(double("Net::HTTP Response", body: "{\"accountId\":\"4815162342\"}", code: "200"))
 
       plugin.run
 
@@ -310,21 +310,21 @@ describe Ohai::System, "plugin ec2" do
     end
 
     it "completes the run despite unavailable metadata" do
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/").
-        and_return(double("Net::HTTP Response", :body => "metrics/", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/metrics/").
-        and_return(double("Net::HTTP Response", :body => "vhostmd", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/metrics/vhostmd").
-        and_return(double("Net::HTTP Response", :body => "", :code => "404"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/user-data/").
-        and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/dynamic/instance-identity/document/").
-        and_return(double("Net::HTTP Response", :body => "{\"accountId\":\"4815162342\"}", :code => "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/")
+        .and_return(double("Net::HTTP Response", body: "metrics/", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/metrics/")
+        .and_return(double("Net::HTTP Response", body: "vhostmd", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/metrics/vhostmd")
+        .and_return(double("Net::HTTP Response", body: "", code: "404"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/user-data/")
+        .and_return(double("Net::HTTP Response", body: "By the pricking of my thumb...", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/dynamic/instance-identity/document/")
+        .and_return(double("Net::HTTP Response", body: "{\"accountId\":\"4815162342\"}", code: "200"))
 
       plugin.run