lib/ohai/plugins/scala.rb in ohai-8.26.1 vs lib/ohai/plugins/scala.rb in ohai-13.0.0

- old
+ new

@@ -13,11 +13,11 @@ # 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" + provides "languages/scala" depends "languages" collect_data(:default) do scala = Mash.new begin @@ -28,21 +28,9 @@ if so.exitstatus == 0 scala[:version] = so.stderr.match(/.*version (\S*)/)[1] end rescue Ohai::Exceptions::Exec Ohai::Log.debug('Plugin Scala: Could not shell_out "scala -version". Skipping data') - end - - # Check for sbt - begin - # sbt launcher version 0.13.7 - so = shell_out("sbt --version", timeout: 5) - if so.exitstatus == 0 - scala[:sbt] = Mash.new - scala[:sbt][:version] = so.stdout.split[3] - end - rescue Ohai::Exceptions::Exec - Ohai::Log.debug('Plugin Scala: Could not shell_out "sbt --version". Skipping data') end languages[:scala] = scala unless scala.empty? end end