From 636f479fc97a752d96283501b949efdc202033fd Mon Sep 17 00:00:00 2001 From: gebele Date: Thu, 26 Apr 2018 17:24:25 +0200 Subject: add git or gem versioning to model --- lib/model.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/model.rb b/lib/model.rb index ba52c84..8284597 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -46,15 +46,17 @@ module OpenTox model.prediction_feature_id = prediction_feature.id model.training_dataset_id = training_dataset.id model.name = "#{prediction_feature.name} (#{training_dataset.name})" - # TODO: check if this works for gem version, add gem versioning? + # git or gem versioning dir = File.dirname(__FILE__) - 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 - if branch + 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 model.version = {:url => url, :branch => branch, :commit => commit} else - model.version = {:warning => "git is not installed"} + version = File.open(File.join(dir,"VERSION"), &:gets).chomp + url = "https://rubygems.org/gems/lazar/versions/"+version + model.version = {:url => url, :branch => "gem", :commit => version} end # set defaults# -- cgit v1.2.3