Merge pull request #1189 from chef/cleanup

Misc minor cleanup

4 files changed, 7 insertions, 8 deletions

diff --git a/lib/ohai/mixin/seconds_to_human.rb b/lib/ohai/mixin/seconds_to_human.rb
index aa7bb1e7..ec8ac769 100644
--- a/lib/ohai/mixin/seconds_to_human.rb
+++ b/lib/ohai/mixin/seconds_to_human.rb
@@ -35,15 +35,15 @@ module Ohai
         seconds -= 60 * minutes
 
         if days > 1
-          return sprintf("%d days %02d hours %02d minutes %02d seconds", days, hours, minutes, seconds)
+          sprintf("%d days %02d hours %02d minutes %02d seconds", days, hours, minutes, seconds)
         elsif days == 1
-          return sprintf("%d day %02d hours %02d minutes %02d seconds", days, hours, minutes, seconds)
+          sprintf("%d day %02d hours %02d minutes %02d seconds", days, hours, minutes, seconds)
         elsif hours > 0
-          return sprintf("%d hours %02d minutes %02d seconds", hours, minutes, seconds)
+          sprintf("%d hours %02d minutes %02d seconds", hours, minutes, seconds)
         elsif minutes > 0
-          return sprintf("%d minutes %02d seconds", minutes, seconds)
+          sprintf("%d minutes %02d seconds", minutes, seconds)
         else
-          return sprintf("%02d seconds", seconds)
+          sprintf("%02d seconds", seconds)
         end
       end
     end
diff --git a/lib/ohai/plugins/linux/lspci.rb b/lib/ohai/plugins/linux/lspci.rb
index d9413a21..deb43b9d 100644
--- a/lib/ohai/plugins/linux/lspci.rb
+++ b/lib/ohai/plugins/linux/lspci.rb
@@ -68,7 +68,6 @@ Ohai.plugin(:Lspci) do
         standard_array(devices, d_id, "module", dev[1])
       when "SDevice"
         standard_form(devices, d_id, hhhh, "sdevice", dev[1])
-      else
       end
     end
 
diff --git a/lib/ohai/plugins/solaris2/cpu.rb b/lib/ohai/plugins/solaris2/cpu.rb
index 39dccc42..35322f72 100644
--- a/lib/ohai/plugins/solaris2/cpu.rb
+++ b/lib/ohai/plugins/solaris2/cpu.rb
@@ -30,7 +30,7 @@ Ohai.plugin(:CPU) do
     currentcpu = 0
     cpucores = Array.new
     cpusockets = Array.new
-    processor_info.each_with_index do |processor, i|
+    processor_info.each do |processor|
       _desc, instance, _record, keyvalue = processor.split(":")
       cpu[instance] ||= Mash.new
       if currentcpu != instance
diff --git a/spec/unit/system_spec.rb b/spec/unit/system_spec.rb
index c3798849..6604fd0f 100644
--- a/spec/unit/system_spec.rb
+++ b/spec/unit/system_spec.rb
@@ -225,7 +225,7 @@ EOF
 
       describe "when using :critical_plugins" do
         # if called from cli is true, we'll exit these tests
-        let(:ohai) { Ohai::System.new() }
+        let(:ohai) { Ohai::System.new }
 
         before do
           Ohai.config[:critical_plugins] = [ :Fails ]