diff options
author | gebele <gebele@in-silico.ch> | 2018-04-27 08:59:10 +0200 |
---|---|---|
committer | gebele <gebele@in-silico.ch> | 2018-04-27 08:59:10 +0200 |
commit | 3350d0327066e657247e3fc90686148ec671fe07 (patch) | |
tree | 44c98c08c617bb2036dff55089e742b337a6b12b /lib/model.rb | |
parent | 53e4ab6afd73258ca23fd4aedfb41d2375a1a0fd (diff) |
fixed version path
Diffstat (limited to 'lib/model.rb')
-rw-r--r-- | lib/model.rb | 11 |
1 files changed, 6 insertions, 5 deletions
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 |