ohai 7.2.0.alpha.0 → 7.2.0.rc.0

data/spec/unit/plugins/linux/filesystem_spec.rb

@@ -24,6 +24,7 @@ describe Ohai::System, "Linux filesystem plugin" do
     @plugin.stub(:collect_os).and_return(:linux)
 
     @plugin.stub(:shell_out).with("df -P").and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("df -i").and_return(mock_shell_out(0, "", ""))
     @plugin.stub(:shell_out).with("mount").and_return(mock_shell_out(0, "", ""))
     @plugin.stub(:shell_out).with("blkid -s TYPE").and_return(mock_shell_out(0, "", ""))
     @plugin.stub(:shell_out).with("blkid -s UUID").and_return(mock_shell_out(0, "", ""))
@@ -48,10 +49,21 @@ tmpfs                  2030944      2960   2027984       1% /dev/shm
 /dev/md0                960492     36388    875312       4% /boot
 DF
       @plugin.stub(:shell_out).with("df -P").and_return(mock_shell_out(0, @stdout, ""))
+      
+      @inode_stdout = <<-DFi
+Filesystem      Inodes  IUsed   IFree IUse% Mounted on
+/dev/xvda1     1310720 107407 1203313    9% /
+/dev/mapper/sys.vg-special.lv            124865    380  124485    1% /special
+tmpfs           126922    273  126649    1% /run
+none            126922      1  126921    1% /run/lock
+none            126922      1  126921    1% /run/shm
+DFi
+      @plugin.stub(:shell_out).with("df -i").and_return(mock_shell_out(0, @inode_stdout, ""))
     end
 
-    it "should run df -P" do
-      @plugin.should_receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @stdout, ""))
+    it "should run df -P and df -i" do
+      @plugin.should_receive(:shell_out).ordered.with("df -P").and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.should_receive(:shell_out).ordered.with("df -i").and_return(mock_shell_out(0, @inode_stdout, ""))
       @plugin.run
     end
 
@@ -79,6 +91,21 @@ DF
       @plugin.run
       @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
     end
+    
+    it "should set total_inodes to value from df -i" do
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:total_inodes].should be == "124865"
+    end
+    
+    it "should set inodes_used to value from df -i" do
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:inodes_used].should be == "380"
+    end
+    
+    it "should set inodes_available to value from df -i" do
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:inodes_available].should be == "124485"
+    end
   end
 
   describe "when gathering mounted filesystem data from mount" do

data/spec/unit/plugins/network_spec.rb

@@ -18,15 +18,32 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-def it_does_not_fail
-  it "doesn't fail" do
+def it_doesnt_fail
+  it "doesnt fail" do
     Ohai::Log.stub(:warn)
     Ohai::Log.should_not_receive(:debug).with(/^Plugin network threw exception/)
     @plugin.run
-    %w{ ipaddress macaddress ip6address }.each do |attribute|
-      @plugin.should have_key(attribute)
+  end
+end
+
+def it_populates_ipaddress_attributes
+
+  source = caller[0]
+
+  it "populates ipaddress, macaddress and ip6address" do
+    begin
+      Ohai::Log.stub(:warn)
+      Ohai::Log.should_not_receive(:debug).with(/^Plugin network threw exception/)
+      @plugin.run
+      %w{ ipaddress macaddress ip6address }.each do |attribute|
+        @plugin.should have_key(attribute)
+      end
+    rescue Exception
+      puts "RSpec context: #{source}"
+      raise
     end
   end
+
 end
 
 describe Ohai::System, "Network Plugin" do
@@ -292,7 +309,7 @@ describe Ohai::System, "Network Plugin" do
 
     describe "when the linux::network plugin hasn't set any of {ip,ip6,mac}address attributes" do
       describe "simple setup" do
-        it_does_not_fail
+        it_populates_ipaddress_attributes
 
         it "detects {ip,ip6,mac}address" do
           @plugin.run
@@ -309,7 +326,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["default_inet6_interface"] = "eth1"
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "detects {ip,ip6}address" do
             @plugin.run
@@ -338,7 +355,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["default_inet6_interface"] = "eth1"
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "detects {ip,ip6}address" do
             @plugin.run
@@ -367,7 +384,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["default_inet6_interface"] = "eth1"
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "picks {ip,ip6,mac}address" do
             Ohai::Log.stub(:warn)
@@ -376,10 +393,10 @@ describe Ohai::System, "Network Plugin" do
             @plugin["macaddress"].should == "00:16:3E:2F:36:80"
             @plugin["ip6address"].should == "3ffe:1111:3333::1"
           end
-
+          
           it "warns about this conflict" do
-            Ohai::Log.should_receive(:warn).with(/^\[inet\] no ipaddress\/mask on eth1/).once
-            Ohai::Log.should_receive(:warn).with(/^\[inet6\] no ipaddress\/mask on eth1/).once
+            Ohai::Log.should_receive(:debug).with(/^\[inet\] no ipaddress\/mask on eth1/).once
+            Ohai::Log.should_receive(:debug).with(/^\[inet6\] no ipaddress\/mask on eth1/).once
             @plugin.run
           end
         end
@@ -405,7 +422,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["interfaces"]["eth0"]["addresses"].delete_if{|k,v| %w[inet inet6].include? v["family"]}
           end
 
-          it_does_not_fail
+          it_doesnt_fail
 
           it "doesn't detect {ip,ip6,mac}address" do
             Ohai::Log.stub(:warn)
@@ -436,7 +453,7 @@ describe Ohai::System, "Network Plugin" do
             end
           end
 
-          it_does_not_fail
+          it_doesnt_fail
 
           it "doesn't detect {ip,ip6,mac}address" do
             Ohai::Log.stub(:warn)
@@ -484,7 +501,7 @@ describe Ohai::System, "Network Plugin" do
             }
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "sets {ip,ip6,mac}address correctly" do
             @plugin.run
@@ -510,7 +527,7 @@ describe Ohai::System, "Network Plugin" do
             }
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "sets {ip,ip6,mac}address correctly" do
             @plugin.run
@@ -548,7 +565,7 @@ describe Ohai::System, "Network Plugin" do
             }
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "sets {ip,ip6,mac}address correctly" do
             @plugin.run
@@ -574,7 +591,7 @@ describe Ohai::System, "Network Plugin" do
             }
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "sets {ip,ip6,mac}address correctly" do
             @plugin.run
@@ -596,7 +613,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["interfaces"]["eth0"]["addresses"].delete_if{|k,v| %w[inet inet6].include? v["family"]}
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "picks {ip,mac,ip6}address from the first interface" do
             Ohai::Log.should_receive(:debug).with(/^\[inet\] no default interface/).once
@@ -619,7 +636,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["interfaces"]["eth0"]["addresses"].each{|k,v| v[:scope]="lInK" if %w[inet inet6].include? v["family"]}
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "prefers global scope addressses to set {ip,mac,ip6}address" do
             Ohai::Log.should_receive(:debug).with(/^\[inet\] no default interface/).once
@@ -642,7 +659,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["default_inet6_interface"] = "eth1"
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "picks {ip,mac,ip6}address from the default interface" do
             @plugin.run
@@ -657,7 +674,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["default_inet6_gateway"] = "fe80::1"
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "picks {ip,mac,ip6}address from the default interface" do
             @plugin.run
@@ -679,7 +696,7 @@ describe Ohai::System, "Network Plugin" do
             }
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "picks {ip,mac,ip6}address from the default interface" do
             @plugin.run
@@ -723,7 +740,7 @@ describe Ohai::System, "Network Plugin" do
           @plugin["network"]["default_inet6_interface"] = "eth2"
         end
 
-        it_does_not_fail
+        it_populates_ipaddress_attributes
 
         it "picks {ip,mac,ip6}address from the default interface" do
           @plugin.run
@@ -742,7 +759,7 @@ describe Ohai::System, "Network Plugin" do
           end
         end
 
-        it_does_not_fail
+        it_doesnt_fail
 
         it "can't detect ipaddress" do
           Ohai::Log.stub(:warn)
@@ -795,7 +812,7 @@ describe Ohai::System, "Network Plugin" do
             }
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "detects ip6address" do
             @plugin.run
@@ -829,7 +846,7 @@ describe Ohai::System, "Network Plugin" do
               }
             end
 
-            it_does_not_fail
+            it_populates_ipaddress_attributes
 
             it "detects {ip,mac}address" do
               @plugin.run
@@ -855,7 +872,7 @@ describe Ohai::System, "Network Plugin" do
               @plugin["ip6address"] = "3ffe:8888:9999::1"
             end
 
-            it_does_not_fail
+            it_doesnt_fail
 
             it "can't detect ipaddress (ipv4)" do
               Ohai::Log.stub(:warn)
@@ -904,7 +921,7 @@ describe Ohai::System, "Network Plugin" do
               }
             end
 
-            it_does_not_fail
+            it_populates_ipaddress_attributes
 
             it "detects ipaddress and overwrite macaddress" do
               @plugin.run
@@ -931,7 +948,7 @@ describe Ohai::System, "Network Plugin" do
               @plugin["ip6address"] = "3ffe:8888:9999::1"
             end
 
-            it_does_not_fail
+            it_doesnt_fail
 
             it "can't set ipaddress" do
               Ohai::Log.stub(:warn)
@@ -955,7 +972,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["ip6address"] = "3ffe:8888:9999::1"
           end
 
-          it_does_not_fail
+          it_populates_ipaddress_attributes
 
           it "doesn't overwrite {ip,mac,ip6}address" do
             @plugin.run
@@ -971,7 +988,7 @@ describe Ohai::System, "Network Plugin" do
             @plugin["ip6address"] = "3ffe:8888:9999::1"
           end
 
-          it_does_not_fail
+          it_doesnt_fail
 
           it "doesn't overwrite {ip,mac,ip6}address" do
             @plugin.run

data/spec/unit/plugins/root_group_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/ohai/util/win32/group_helper.rb')
 
 describe Ohai::System, 'root_group' do
   before(:each) do
@@ -76,13 +77,12 @@ describe Ohai::System, 'root_group' do
     end
   end
 
-  describe 'windows', :windows_only do
-
-    # TODO: Not implemented on windows.
-    # See also:
-    #
-    # http://tickets.opscode.com/browse/OHAI-490
-    # http://tickets.opscode.com/browse/OHAI-491
-
+  describe 'windows platform' do
+    it 'should return the group administrators' do
+      stub_const('::RbConfig::CONFIG', { 'host_os' => 'windows'} )
+      Ohai::Util::Win32::GroupHelper.should_receive(:windows_root_group_name).and_return('administrators')
+      @plugin.run
+      @plugin[:root_group].should == 'administrators'
+    end
   end
 end

data/spec/unit/runner_spec.rb

@@ -113,7 +113,7 @@ describe Ohai::Runner, "run_plugin" do
 
     it "should run the plugin" do
       @runner.run_plugin(plugin)
-      plugin.has_run?.should be_true
+      plugin.has_run?.should be true
     end
 
     it "should add plugin data to Ohai::System.data" do
@@ -142,7 +142,7 @@ describe Ohai::Runner, "run_plugin" do
 
       it "should not run the plugin" do
         expect{ @runner.run_plugin(@plugin) }.to raise_error
-        @plugin.has_run?.should be_false
+        @plugin.has_run?.should be false
       end
     end
 
@@ -174,7 +174,7 @@ describe Ohai::Runner, "run_plugin" do
       it "should run the plugins" do
         @runner.run_plugin(@plugin2)
         @plugins.each do |plugin|
-          plugin.has_run?.should be_true
+          plugin.has_run?.should be true
         end
       end
     end
@@ -208,7 +208,7 @@ describe Ohai::Runner, "run_plugin" do
       it "should run the plugins" do
         @runner.run_plugin(@plugin3)
         @plugins.each do |plugin|
-          plugin.has_run?.should be_true
+          plugin.has_run?.should be true
         end
       end
     end
@@ -251,7 +251,7 @@ describe Ohai::Runner, "run_plugin" do
     it "should run the plugins" do
       @runner.run_plugin(@plugin3)
       @plugins.each do |plugin|
-        plugin.has_run?.should be_true
+        plugin.has_run?.should be true
       end
     end
   end
@@ -350,7 +350,7 @@ describe Ohai::Runner, "run_plugin" do
       @runner.run_plugin(@pluginA)
 
       @plugins.each do |plugin|
-        plugin.has_run?.should be_true
+        plugin.has_run?.should be true
       end
     end
 
@@ -363,7 +363,7 @@ describe Ohai::Runner, "run_plugin" do
       @runner.run_plugin(@pluginA)
 
       @plugins.each do |plugin|
-        plugin.has_run?.should be_true
+        plugin.has_run?.should be true
       end
     end
   end

data/spec/unit/system_spec.rb

@@ -210,20 +210,20 @@ EOF
         # least code complexity in legacy v6 plugin format support. Once we
         # ship 7.0, though, we need to stick to the same behavior.
         it "runs v6 plugins" do
-          expect(v6_plugin.has_run?).to be_true
+          expect(v6_plugin.has_run?).to be true
         end
 
         it "runs plugins that provide the requested attributes" do
-          expect(primary_plugin.has_run?).to be_true
+          expect(primary_plugin.has_run?).to be true
         end
 
         it "runs dependencies of plugins that provide requested attributes" do
-          expect(dependency_plugin_one.has_run?).to be_true
-          expect(dependency_plugin_two.has_run?).to be_true
+          expect(dependency_plugin_one.has_run?).to be true
+          expect(dependency_plugin_two.has_run?).to be true
         end
 
         it "does not run plugins that are irrelevant to the requested attributes" do
-          expect(unrelated_plugin.has_run?).to be_false
+          expect(unrelated_plugin.has_run?).to be false
         end
 
       end

data/spec/unit/util/file_helper_spec.rb

@@ -39,7 +39,7 @@ describe "Ohai::Util::FileHelper" do
     end
 
     it "returns false if the executable is not in the path" do
-      expect(file_helper.which('the_cake')).to be_false
+      expect(file_helper.which('the_cake')).to be false
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.2.0.alpha.0
+  version: 7.2.0.rc.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -30,16 +30,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.6.4
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,44 +168,58 @@ dependencies:
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +296,7 @@ files:
 - lib/ohai/plugins/command.rb
 - lib/ohai/plugins/darwin/cpu.rb
 - lib/ohai/plugins/darwin/filesystem.rb
+- lib/ohai/plugins/darwin/memory.rb
 - lib/ohai/plugins/darwin/network.rb
 - lib/ohai/plugins/darwin/platform.rb
 - lib/ohai/plugins/darwin/system_profiler.rb
@@ -288,6 +317,7 @@ files:
 - lib/ohai/plugins/init_package.rb
 - lib/ohai/plugins/ip_scopes.rb
 - lib/ohai/plugins/java.rb
+- lib/ohai/plugins/joyent.rb
 - lib/ohai/plugins/kernel.rb
 - lib/ohai/plugins/keys.rb
 - lib/ohai/plugins/languages.rb
@@ -356,6 +386,8 @@ files:
 - lib/ohai/runner.rb
 - lib/ohai/system.rb
 - lib/ohai/util/file_helper.rb
+- lib/ohai/util/win32.rb
+- lib/ohai/util/win32/group_helper.rb
 - lib/ohai/version.rb
 - spec/data/plugins/___lib64___libc.so.6.output
 - spec/data/plugins/___lib___libc.so.6.output
@@ -378,6 +410,7 @@ files:
 - spec/data/plugins/v7message.rb
 - spec/data/plugins/what.output
 - spec/data/plugins/xlc.output
+- spec/functional/plugins/root_group_spec.rb
 - spec/ohai_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
@@ -404,6 +437,7 @@ files:
 - spec/unit/plugins/darwin/cpu_spec.rb
 - spec/unit/plugins/darwin/hostname_spec.rb
 - spec/unit/plugins/darwin/kernel_spec.rb
+- spec/unit/plugins/darwin/memory_spec.rb
 - spec/unit/plugins/darwin/network_spec.rb
 - spec/unit/plugins/darwin/platform_spec.rb
 - spec/unit/plugins/darwin/system_profiler_output.rb
@@ -425,6 +459,7 @@ files:
 - spec/unit/plugins/init_package_spec.rb
 - spec/unit/plugins/ip_scopes_spec.rb
 - spec/unit/plugins/java_spec.rb
+- spec/unit/plugins/joyent_spec.rb
 - spec/unit/plugins/kernel_spec.rb
 - spec/unit/plugins/linode_spec.rb
 - spec/unit/plugins/linux/cpu_spec.rb