lib/ohai/plugins/scala.rb in ohai-8.15.1 vs lib/ohai/plugins/scala.rb in ohai-8.16.0
- old
+ new
@@ -14,25 +14,23 @@
# 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
scala = Mash.new
-
- # Check for scala
begin
- # Scala code runner version 2.11.8 -- Copyright 2002-2016, LAMP/EPFL
so = shell_out("scala -version")
+ # Sample output:
+ # Scala code runner version 2.11.8 -- Copyright 2002-2016, LAMP/EPFL
if so.exitstatus == 0
scala[:version] = so.stderr.split[4]
end
rescue Ohai::Exceptions::Exec
- # ignore shell_out failures
+ Ohai::Log.debug('Scala plugin: Could not shell_out "scala -version". Skipping data')
end
# Check for sbt
begin
# sbt launcher version 0.13.7
@@ -40,10 +38,10 @@
if so.exitstatus == 0
scala[:sbt] = Mash.new
scala[:sbt][:version] = so.stdout.split[3]
end
rescue Ohai::Exceptions::Exec
- # ignore shell_out failures
+ Ohai::Log.debug('Scala plugin: Could not shell_out "sbt --version". Skipping data')
end
languages[:scala] = scala unless scala.empty?
end
end