ohai 8.12.1 → 8.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 208b36d310e98c13c42fb16458c84aaf025e43cc
-  data.tar.gz: d7b8842a2b4d0c24fcc24ffa8d00972b663960f5
+  metadata.gz: 653220934f733f38ccf77e2995b60dafff3a8cb4
+  data.tar.gz: d853852c8a1bb4912970a3562e60c9a91636a5de
 SHA512:
-  metadata.gz: acb301a3349269fef3990aa7c7f5bef95e845b617de0822013dcb4b390083b20c1cc4228608b95bd768f55a2c13c3237ff694d5b97d2e9eb5cfc8124181d9b7e
-  data.tar.gz: 8d659b17aa4341e995e511244c2c8d1406a82f75f68db43baf506717b4203d4ab4e77ea5f7942f68bf68f4e761edae7e2ed365fa9bba61d0cfb136bb404b023d
+  metadata.gz: e03fdd75bfde725021994265b3ba2ed5474c9d37f5409886e4cc29656616bb7647e199db6efbea708e446391ca410692d69fcc95072ba3ca8a936dee6321b8e3
+  data.tar.gz: 36ed710e0d3813f796dbf2fd3b970583610e4731c8ed53e203de69cf1abc170aed18942ed999d571fd4547cac87f94e0d7c3071e5604020b49fa5ec6e938cafa

data/Gemfile

@@ -3,8 +3,6 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chef", github: "chef/chef", branch: "master"
-
   gem "sigar", :platform => "ruby"
 
   gem "chefstyle", "= 0.3.0"

data/lib/ohai/plugins/scala.rb

@@ -0,0 +1,43 @@
+# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
+# © Copyright IBM Corporation 2015.
+# 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.
+
+Ohai.plugin(:Scala) do
+  provides "languages/scala", "languages/scala/sbt"
+
+  depends "languages"
+
+  collect_data(:default) do
+    # Check for scala
+    output = nil
+
+    scala = Mash.new
+    so = shell_out("scala -version")
+    if so.exitstatus == 0
+      output = so.stdout.split
+      scala[:version] = output[4]
+      languages[:scala] = scala if scala[:version]
+    end
+
+    # Check for sbt
+    output = nil
+
+    so = shell_out("sbt --version")
+    if so.exitstatus == 0
+      output = so.stdout.split
+      scala[:sbt] = output[3] if scala[:version]
+    end
+  end
+end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "8.12.1"
+  VERSION = "8.13.0"
 end

data/ohai.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-config", "~> 2.0"
   s.add_dependency "mixlib-log"
   s.add_dependency "mixlib-shellout", "~> 2.0"
-  s.add_dependency "plist"
+  s.add_dependency "plist", "~> 3.1"
   s.add_dependency "ipaddress"
   s.add_dependency "wmi-lite", "~> 1.0"
   s.add_dependency "ffi", "~> 1.9"

data/spec/unit/plugins/scala_spec.rb

@@ -0,0 +1,83 @@
+# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
+# © Copyright IBM Corporation 2015.
+# 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.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+
+describe Ohai::System, "plugin scala" do
+
+  let(:plugin) do
+    plugin = get_plugin("scala").tap do |plugin|
+      plugin[:languages] = Mash.new
+    end
+  end
+
+  let(:scala_out) { "Scala code runner version 2.11.6 -- Copyright 2002-2013, LAMP/EPFL" }
+  let(:sbt_out) { "sbt launcher version 0.13.8" }
+
+  def setup_plugin
+    allow(plugin).to receive(:shell_out)
+      .with("scala -version")
+      .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
+    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")
+    end
+  end
+
+  context "if sbt is installed" do
+
+    before(:each) do
+      setup_plugin
+      plugin.run
+    end
+
+    it "should set languages[:sbt][:version]" do
+      expect(plugin.languages[:scala][:sbt]).to eql("0.13.8")
+    end
+  end
+
+  context "if scala is not installed" do
+
+    before(:each) do
+      allow(plugin).to receive(:shell_out)
+        .with("scala -version")
+        .and_raise( Errno::ENOENT)
+
+      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)
+    end
+
+    it "should not set the languages[:scala][:sbt] if sbt command fails" do
+      expect(plugin.languages).not_to have_key(:sbt)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.12.1
+  version: 8.13.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -98,16 +98,16 @@ dependencies:
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -404,6 +404,7 @@ files:
 - lib/ohai/plugins/root_group.rb
 - lib/ohai/plugins/ruby.rb
 - lib/ohai/plugins/rust.rb
+- lib/ohai/plugins/scala.rb
 - lib/ohai/plugins/sigar/cpu.rb
 - lib/ohai/plugins/sigar/filesystem.rb
 - lib/ohai/plugins/sigar/memory.rb
@@ -575,6 +576,7 @@ files:
 - spec/unit/plugins/root_group_spec.rb
 - spec/unit/plugins/ruby_spec.rb
 - spec/unit/plugins/rust_spec.rb
+- spec/unit/plugins/scala_spec.rb
 - spec/unit/plugins/sigar/network_route_spec.rb
 - spec/unit/plugins/softlayer_spec.rb
 - spec/unit/plugins/solaris2/cpu_spec.rb
@@ -618,7 +620,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON