summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2018-04-26 17:30:31 +0200
committergebele <gebele@in-silico.ch>2018-04-26 17:30:31 +0200
commit4d40733b1ec686dceae5a1635739731d07a1e761 (patch)
tree3300347489a56f1c8ab095b679ad9faa2c4e0bc0
parent966f43e6e1e2956aadad3ebf73709201a14d7260 (diff)
parent636f479fc97a752d96283501b949efdc202033fd (diff)
Merge branch 'development'
-rw-r--r--lib/model.rb14
1 files 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#