From 7b5ea0296826173ed71c2dedcff1a5c981286d94 Mon Sep 17 00:00:00 2001 From: gebele Date: Mon, 15 Jan 2018 12:05:43 +0000 Subject: added R packages test --- lib/lazar.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/lazar.rb b/lib/lazar.rb index fff5598..32f0317 100644 --- a/lib/lazar.rb +++ b/lib/lazar.rb @@ -50,6 +50,7 @@ rlib = File.expand_path(File.join(File.dirname(__FILE__),"..","R")) # http://stackoverflow.com/questions/19619582/number-of-processors-cores-in-command-line NR_CORES = `getconf _NPROCESSORS_ONLN`.to_i R = Rserve::Connection.new +R.eval ".libPaths('#{rlib}')" R.eval " suppressPackageStartupMessages({ library(labeling,lib=\"#{rlib}\") -- cgit v1.2.3 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(-) (limited to 'lib') 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 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 From e1c8e082e19917c208b53edcb5a8b9b657d2ace0 Mon Sep 17 00:00:00 2001 From: gebele Date: Fri, 27 Apr 2018 09:01:42 +0200 Subject: fixed version path --- lib/model.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/model.rb b/lib/model.rb index fd62115..dce53a9 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -55,7 +55,7 @@ module OpenTox url = `git config --get remote.origin.url`.chomp model.version = {:url => url, :branch => branch, :commit => commit} else - version = File.open(path+"/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