lazar-gui 1.4.0.pre.0 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: b62bd400db67c63890b87da66fd39a5c409ae608
4
- data.tar.gz: 846c1c3f564c6591b82ccede408f211a7ca66aaf
2
+ SHA256:
3
+ metadata.gz: ad561aa97606a3fea005b3093d9b8bdd0ccb7246564f1124f5f70cbd3f9a5a67
4
+ data.tar.gz: 736f17abe8d0c6df86e256f37dffdffddd4e367adbb5db322aa8cfad5463db11
5
5
  SHA512:
6
- metadata.gz: 7d0b13b9618aa506941ea3a99ee59ee4e70ff7e539c3936562ae5b5ea23d4f68221bd41109947dd5b1b3255d6134abe21e227729632c0ae92afe914be1bf6ec7
7
- data.tar.gz: 8d75947e07ef2754bcdd9d318212f4696e1a6b6ec87cc6d330cb333dbb0c253399b84c6518fa704a8c729ce4f7dd97592ae75cf601b69046023fe54c2ba89f1a
6
+ metadata.gz: 3c918b6a66502ef6c9652a7fa40fa99abf6a5c12d51752cb36feea1cc58b267b37171cf4965d5074b9f9bf896d04ad69a1ee295b87ee8e7326622195b9b42c45
7
+ data.tar.gz: 96343339b9ed6326fb0bc525ea860ff07d184d39d9aadafea3916ea00106657b052828f674efad23b6c8ab29102ca8ed577d3552eb4c7b32832f84e7f5513507
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.4.0.pre.0
1
+ 1.4.0
@@ -27,7 +27,8 @@ end
27
27
  before do
28
28
  # use this hostname method instead to('/')
29
29
  # allowes to set https for xhr requests
30
- $host_with_port = request.host =~ /localhost/ ? request.host_with_port : request.host
30
+ #$host_with_port = request.host =~ /localhost/ ? request.host_with_port : request.host
31
+ $host_with_port = request.host_with_port
31
32
  $paths = [
32
33
  "api",
33
34
  "compound",
@@ -3,6 +3,7 @@ sudo mongod &
3
3
  R CMD Rserve --vanilla &
4
4
  LAZARPATH=$(gem path lazar-gui)
5
5
  cd $LAZARPATH
6
+ cd $(gem which "lazar-gui"|sed 's#/lib/lazar-gui.rb/##')
6
7
  unicorn -c unicorn.rb -E production
7
8
 
8
9
  exit 0
@@ -23,12 +23,17 @@ RUN pacman -Scc --noconfirm
23
23
 
24
24
  RUN R -e "install.packages('Rserve', repos='http://rforge.net/')"
25
25
  RUN pip install xlsx2csv
26
+
27
+ # install lazar-gui gem
28
+ RUN echo 'gem: --no-document' > /etc/gemrc
29
+ RUN gem install lazar-gui
30
+
26
31
  RUN useradd -ms /bin/bash ist
27
32
 
28
- # mongodb has been removed from main repositories
29
33
  USER ist
30
34
  WORKDIR /home/ist
31
35
  RUN mkdir data
36
+ # mongodb has been removed from main repositories, AUR installation
32
37
  RUN mkdir src
33
38
  WORKDIR /home/ist/src
34
39
  RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/mongodb-bin.tar.gz
@@ -36,38 +41,23 @@ RUN tar -xvzf mongodb-bin.tar.gz
36
41
  WORKDIR /home/ist/src/mongodb-bin
37
42
  RUN makepkg -s --noconfirm
38
43
 
39
- # installation requires root
40
- USER root
41
- RUN pacman -U --noconfirm /home/ist/src/mongodb-bin/mongodb-bin*.pkg.tar.xz
42
-
43
- # install lazar-gui gem
44
- RUN echo 'gem: --no-document' > /etc/gemrc
45
-
46
- #RUN gem install lazar-gui
47
- RUN gem install lazar
48
- RUN gem install qsar-report
49
- RUN gem install sinatra haml sass rdiscount unicorn
50
-
51
- USER ist
52
- WORKDIR /home/ist
53
- RUN rm -r src
54
-
55
- # lazar-gui
56
- RUN git clone https://git.in-silico.ch/lazar-gui
57
- WORKDIR lazar-gui
58
- RUN git checkout prerelease
59
-
60
- # SWAGGER for API
44
+ # rest api swagger gui
61
45
  WORKDIR /home/ist
62
46
  RUN git clone https://github.com/swagger-api/swagger-ui.git
63
47
  COPY swagger.html /home/ist/swagger-ui/dist/index.html
64
48
 
65
- # TODO adjust to lazar-gui gem path
66
- RUN ln -s /home/ist/swagger-ui/dist/swagger-ui-bundle.js /home/ist/lazar-gui/public/swagger-ui-bundle.js
67
- RUN ln -s /home/ist/swagger-ui/dist/swagger-ui-standalone-preset.js /home/ist/lazar-gui/public/swagger-ui-standalone-preset.js
68
- RUN ln -s /home/ist/swagger-ui/dist/swagger-ui.css /home/ist/lazar-gui/public/swagger-ui.css
69
-
70
49
  # start script
71
50
  COPY start.sh /home/ist/start.sh
72
51
 
52
+ # mongodb installation requires root
53
+ USER root
54
+ RUN pacman -U --noconfirm /home/ist/src/mongodb-bin/mongodb-bin*.pkg.tar.xz
55
+
56
+ # swagger links
57
+ RUN ln -s /home/ist/swagger-ui/dist/swagger-ui-bundle.js $(gem which "lazar-gui"|sed 's#/lib/lazar-gui.rb/##')/public/swagger-ui-bundle.js
58
+ RUN ln -s /home/ist/swagger-ui/dist/swagger-ui-standalone-preset.js $(gem which "lazar-gui"|sed 's#/lib/lazar-gui.rb/##')/public/swagger-ui-standalone-preset.js
59
+ RUN ln -s /home/ist/swagger-ui/dist/swagger-ui.css $(gem which "lazar-gui"|sed 's#/lib/lazar-gui.rb/##')/public/swagger-ui.css
60
+
61
+ USER ist
62
+ RUN rm -r /home/ist/src
73
63
  ENTRYPOINT ["/home/ist/start.sh"]
@@ -5,8 +5,8 @@ mongod --bind_ip 127.0.0.1 --dbpath ~/data &
5
5
  R CMD Rserve --vanilla &
6
6
 
7
7
  # import data
8
- ruby -e "require 'lazar'; include OpenTox; Import.public_data"
8
+ ruby -e "require 'lazar'; include OpenTox; Import.public_data if Model::Validation.all.empty?"
9
9
 
10
10
  # start lazar service
11
- cd $HOME/lazar-gui
11
+ cd $(gem which lazar-gui|sed 's#/lib/lazar-gui.rb/##')
12
12
  unicorn -p 8088 -E production
@@ -34,9 +34,7 @@
34
34
  %div.container-fluid
35
35
  %topline.alert
36
36
  %p
37
- Problems, bugs, ideas for improvements ? Please report at our
38
- %a{:href => 'https://github.com/opentox/lazar-gui/issues', :rel => "external"} issue tracker
39
- , check out the
37
+ Problems, bugs or ideas for improvements ? Please check the
40
38
  %a{:href=> "//#{$host_with_port}/predict/faq"} FAQ
41
39
  page or send us an email.
42
40
  %a{ :href=>"mailto:info@in-silico.ch?subject=[lazar v#{@version}]", :target=>"_top"}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lazar-gui
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0.pre.0
4
+ version: 1.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christoph Helma
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-09-02 00:00:00.000000000 Z
12
+ date: 2019-09-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: lazar
@@ -393,12 +393,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
393
393
  version: '0'
394
394
  required_rubygems_version: !ruby/object:Gem::Requirement
395
395
  requirements:
396
- - - ">"
396
+ - - ">="
397
397
  - !ruby/object:Gem::Version
398
- version: 1.3.1
398
+ version: '0'
399
399
  requirements: []
400
- rubyforge_project: lazar-gui
401
- rubygems_version: 2.5.2.3
400
+ rubygems_version: 3.0.6
402
401
  signing_key:
403
402
  specification_version: 4
404
403
  summary: lazar-gui