From 3350d0327066e657247e3fc90686148ec671fe07 Mon Sep 17 00:00:00 2001 From: gebele Date: Fri, 27 Apr 2018 08:59:10 +0200 Subject: fixed version path --- lib/model.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/model.rb b/lib/model.rb index 8284597..fd62115 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -48,13 +48,14 @@ module OpenTox model.name = "#{prediction_feature.name} (#{training_dataset.name})" # git or gem versioning dir = File.dirname(__FILE__) - if Dir.exists?("#{dir}/.git") - commit = `cd #{dir}; git rev-parse HEAD`.chomp - branch = `cd #{dir}; git rev-parse --abbrev-ref HEAD`.chomp - url = `cd #{dir}; git config --get remote.origin.url`.chomp + path = File.expand_path("../", File.expand_path(dir)) + if Dir.exists?(dir+"/.git") + commit = `git rev-parse HEAD`.chomp + branch = `git rev-parse --abbrev-ref HEAD`.chomp + url = `git config --get remote.origin.url`.chomp model.version = {:url => url, :branch => branch, :commit => commit} else - version = File.open(File.join(dir,"VERSION"), &:gets).chomp + version = File.open(path+"/VERSION"), &:gets).chomp url = "https://rubygems.org/gems/lazar/versions/"+version model.version = {:url => url, :branch => "gem", :commit => version} end -- cgit v1.2.3