ohai 8.14.0 → 8.15.0

data/spec/unit/plugins/scala_spec.rb

@@ -31,20 +31,20 @@ describe Ohai::System, "plugin scala" do
   def setup_plugin
     allow(plugin).to receive(:shell_out)
       .with("scala -version")
-      .and_return(mock_shell_out(0, scala_out, ""))
+      .and_return(mock_shell_out(0, "", scala_out))
     allow(plugin).to receive(:shell_out)
       .with("sbt --version")
       .and_return(mock_shell_out(0, sbt_out, ""))
   end
 
-  context " if scala is installed" do
+  context "if scala is installed" do
     before(:each) do
       setup_plugin
       plugin.run
     end
 
-    it "should set languages[:scala][:version]" do
-      expect(plugin.languages[:scala][:version]).to eql("2.11.6")
+    it "sets languages[:scala][:version]" do
+      expect(plugin[:languages][:scala][:version]).to eql("2.11.6")
     end
   end
 
@@ -55,29 +55,38 @@ describe Ohai::System, "plugin scala" do
       plugin.run
     end
 
-    it "should set languages[:sbt][:version]" do
-      expect(plugin.languages[:scala][:sbt]).to eql("0.13.8")
+    it "sets languages[:scala][:sbt][:version]" do
+      expect(plugin[:languages][:scala][:sbt][:version]).to eql("0.13.8")
     end
   end
 
-  context "if scala is not installed" do
+  context "if scala/sbt are not installed" do
 
+    before(:each) do
+      allow(plugin).to receive(:shell_out)
+        .and_raise( Ohai::Exceptions::Exec )
+      plugin.run
+    end
+
+    it "does NOT set the languages[:scala] if scala/sbts commands fails" do
+      expect(plugin[:languages]).not_to have_key(:scala)
+    end
+  end
+
+  context "if sbt is not installed" do
     before(:each) do
       allow(plugin).to receive(:shell_out)
         .with("scala -version")
-        .and_raise( Errno::ENOENT)
+        .and_return(mock_shell_out(0, "", scala_out))
 
       allow(plugin).to receive(:shell_out)
         .with("sbt --version")
-        .and_raise( Errno::ENOENT)
-    end
-
-    it "should not set the languages[:scala] if scala command fails" do
-      expect(plugin.languages).not_to have_key(:scala)
+        .and_raise( Ohai::Exceptions::Exec )
+      plugin.run
     end
 
-    it "should not set the languages[:scala][:sbt] if sbt command fails" do
-      expect(plugin.languages).not_to have_key(:sbt)
+    it "does NOT set the languages[:scala][:sbt] if sbt command fails" do
+      expect(plugin[:languages][:scala]).not_to have_key(:sbt)
     end
   end
 end

data/spec/unit/plugins/softlayer_spec.rb

@@ -23,7 +23,7 @@ describe Ohai::System, "plugin softlayer" do
   let(:plugin) { get_plugin("softlayer") }
 
   it "not create softlayer if hint file doesn't exists" do
-    allow(@plugin).to receive(:hint?).with("softlayer").and_return(false)
+    allow(plugin).to receive(:hint?).with("softlayer").and_return(false)
     plugin.run
     expect(plugin[:softlayer]).to be_nil
   end

data/spec/unit/plugins/windows/fips_spec.rb

@@ -0,0 +1,86 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 2016 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+
+describe Ohai::System, "plugin fips", :windows_only do
+  let(:enabled) { 0 }
+  let(:plugin) { get_plugin("windows/fips") }
+  let(:fips_key) { 'System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy' }
+  let(:win_reg_entry) { { "Enabled" => enabled } }
+
+  before(:each) do
+    allow(plugin).to receive(:collect_os).and_return(:windows)
+    allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with(fips_key, arch).and_yield(win_reg_entry)
+  end
+
+  shared_examples "fips_plugin" do
+    context "fips enabled key is set to 1" do
+      let(:enabled) { 1 }
+
+      it "sets fips plugin" do
+        plugin.run
+        expect(plugin["fips"]["kernel"]["enabled"]).to be(true)
+      end
+    end
+
+    context "fips enabled key is set to 0" do
+      let(:enabled) { 0 }
+
+      it "does not set fips plugin" do
+        plugin.run
+        expect(plugin["fips"]["kernel"]["enabled"]).to be(false)
+      end
+    end
+
+    context "fips key does not exist" do
+      before do
+        allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).and_raise(Win32::Registry::Error, 50)
+      end
+
+      it "does not set fips plugin" do
+        plugin.run
+        expect(plugin["fips"]["kernel"]["enabled"]).to be(false)
+      end
+    end
+  end
+
+  context "on 32 bit ruby" do
+    let(:arch) { Win32::Registry::KEY_READ | 0x100 }
+
+    before { stub_const("::RbConfig::CONFIG", { "target_cpu" => "i386" } ) }
+
+    it_behaves_like "fips_plugin"
+  end
+
+  context "on 64 bit ruby" do
+    let(:arch) { Win32::Registry::KEY_READ | 0x200 }
+
+    before { stub_const("::RbConfig::CONFIG", { "target_cpu" => "x86_64" } ) }
+
+    it_behaves_like "fips_plugin"
+  end
+
+  context "on unknown ruby" do
+    let(:arch) { Win32::Registry::KEY_READ }
+
+    before { stub_const("::RbConfig::CONFIG", { "target_cpu" => nil } ) }
+
+    it_behaves_like "fips_plugin"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.14.0
+  version: 8.15.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -368,6 +368,7 @@ files:
 - lib/ohai/plugins/linux/cpu.rb
 - lib/ohai/plugins/linux/filesystem.rb
 - lib/ohai/plugins/linux/filesystem2.rb
+- lib/ohai/plugins/linux/fips.rb
 - lib/ohai/plugins/linux/lsb.rb
 - lib/ohai/plugins/linux/mdadm.rb
 - lib/ohai/plugins/linux/memory.rb
@@ -428,6 +429,7 @@ files:
 - lib/ohai/plugins/windows/cpu.rb
 - lib/ohai/plugins/windows/drivers.rb
 - lib/ohai/plugins/windows/filesystem.rb
+- lib/ohai/plugins/windows/fips.rb
 - lib/ohai/plugins/windows/memory.rb
 - lib/ohai/plugins/windows/network.rb
 - lib/ohai/plugins/windows/platform.rb
@@ -541,6 +543,7 @@ files:
 - spec/unit/plugins/linux/cpu_spec.rb
 - spec/unit/plugins/linux/filesystem2_spec.rb
 - spec/unit/plugins/linux/filesystem_spec.rb
+- spec/unit/plugins/linux/fips_spec.rb
 - spec/unit/plugins/linux/hostname_spec.rb
 - spec/unit/plugins/linux/kernel_spec.rb
 - spec/unit/plugins/linux/lsb_spec.rb
@@ -593,6 +596,7 @@ files:
 - spec/unit/plugins/virtualbox_spec.rb
 - spec/unit/plugins/vmware_spec.rb
 - spec/unit/plugins/windows/cpu_spec.rb
+- spec/unit/plugins/windows/fips_spec.rb
 - spec/unit/plugins/windows/memory_spec.rb
 - spec/unit/plugins/windows/virtualization_spec.rb
 - spec/unit/provides_map_spec.rb
@@ -620,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON