dyndoc-ruby 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f13ef78daad4f7cab557c33988cf7da1100320cdb7a19ab211ee99abde8f8bf
-  data.tar.gz: af4977f95ec0bc87dde2656419de2168f908cc65433eb0f6e0a2b0f447ab7226
+  metadata.gz: 2ec509c1bb4aa90c2960546ea660bb8c1b734d84e090cb7892738f4ec812972d
+  data.tar.gz: c58112a3f6326a0c2421058ca28df3fbbe286d3a8766859a9b3fecdd30ff57c4
 SHA512:
-  metadata.gz: 239ba8a18e7282920922051dad37a42a8fc8d3bb836aad7a42bb75176a056db398668d7cfb99afcc4a2f02b9bcb63b852486bfa41b1a453c6b5cd5334885a6ea
-  data.tar.gz: 532883f4d9a29d228bdd7169699bad36b7dbe48fe369b535bf5f92dce0486ef683bd254a19de7a3c64d1c036fddc23890d4c34fb4ee18d462fe93e2821fca756
+  metadata.gz: '045482d13e19620b809a07c60d27e2b0e20d55f97406d19aca29545b85d4b21d9bd7d69f28abb9eced64a93ead570a4546d57c2f4032fc7c39b930bc0f17904a'
+  data.tar.gz: 722057d19ff0d07762b5c6fffd8a5abf61405f63c3a2757f8592c41ffff023eaaea1806baaa0eb1835090c3b200fd8f13b19c93009427327c926ad24e60ba1a2

data/lib/dyndoc-html-servers.rb

@@ -270,10 +270,11 @@ module Dyndoc
         user: nil #current_email
       }
 
-      puts "watching "+ dyn_root+ " and " + dyn_public_edit_root
+      puts "watching "+ dyn_public_edit_root + " and " + dyn_root
       old_html_file=""
-      ::FileWatcher.new([dyn_root,dyn_public_edit_root]).watch() do |filename, event|
-        ##p [:filename,filename,event]
+      ::FileWatcher.new([dyn_public_edit_root,dyn_root]).watch() do |filename, event|
+        ##
+        p [:filename,filename,event]
         if [:changed,:updated,:new].include? event and File.extname(filename) == ".dyn"
           ##p [:filename_event,event,filename]
           if (lint_error=Dyndoc::Linter.check_file(filename)).empty?

data/lib/dyndoc-tasks.rb

@@ -83,6 +83,10 @@ def DyndocTasks.dyn_yml(doc)
 		dyntaskname += "_task.dyn" unless dyntaskname=~/_task.dyn$/
 		dyntaskpath=dyntaskname
 		is_dyntask=File.exists? dyntaskpath
+		unless is_dyntask
+			dyntaskpath=File.join(ENV["HOME"],".dyndoc-world","tasks",dyntaskname)
+			is_dyntask=File.exists? dyntaskpath
+		end
 		unless is_dyntask
 			dyntaskpath=File.join(ENV["HOME"],"dyndoc","tasks",dyntaskname)
 			is_dyntask=File.exists? dyntaskpath

data/share/dyn-site/docker/dyn-site.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+cmd=$1
+script="bin/.action.sh"
+
+RootSrv=/home/ubuntu/RodaSrv 
+
+echo "## do not modify since automatically generated" > $script
+
+case $cmd in
+first)
+## Not necessary for docker
+#mkdir -p ../../RodaSrv/edit
+#mkdir -p ../../RodaSrv/public/users
+;;
+init)
+## Create the RodaSrv folder
+echo "mkdir -p /home/ubuntu/RodaSrv/edit" >>  $script
+echo "mkdir -p /home/ubuntu/RodaSrv/public" >>  $script
+echo "mkdir -p /home/ubuntu/RodaSrv/system" >>  $script
+## Config file
+echo "echo '---' > /home/ubuntu/dyndoc/etc/dyn-html.yml" >> $script
+echo "echo 'root: /home/ubuntu/RodaSrv' >> /home/ubuntu/dyndoc/etc/dyn-html.yml" >> $script
+docker-compose exec --user ubuntu website bash /home/ubuntu/bin/.action.sh
+;;
+add)
+# get RodaWebUser from environment variable
+RodaWebUser=$2
+if [ "$RodaWebUser" != "" ]; then
+    echo "mkdir -p ${RootSrv}/edit/${RodaWebUser}" >>  $script 
+    echo "mkdir -p ${RootSrv}/public/pages" >>  $script
+    echo "mkdir -p ${RootSrv}/public/users/${RodaWebUser}/pages/${RodaWebUser}" >>  $script
+    echo "cd ${RootSrv}/public/pages" >>  $script
+    echo "ln -s ../users/${RodaWebUser}/pages/${RodaWebUser} ${RodaWebUser}" >>  $script
+    docker-compose exec --user ubuntu website bash /home/ubuntu/bin/.action.sh
+fi
+;;
+status | start | stop)
+docker-compose exec --user ubuntu website bash -c "/usr/local/bin/dyn-ctl $cmd"
+;;
+bash)
+docker-compose exec --user ubuntu website bash
+;;
+build)
+docker-compose build dyndoc-ruby
+docker-compose build website
+;;
+up)
+docker-compose up -d website
+;;
+down)
+docker-compose down
+;;
+esac

data/share/dyn-site/docker/files/Dockerfile-dyndoc

@@ -0,0 +1,31 @@
+FROM ubuntu:$DyndocRubyUbuntu$
+MAINTAINER "Cqls Team"
+
+RUN groupadd -r ubuntu && useradd -r -g ubuntu ubuntu
+
+RUN apt-get update && \
+      apt-get -y install sudo
+
+RUN apt-get install -y curl wget locales
+
+RUN locale-gen fr_FR.UTF-8  
+ENV LANG fr_FR.UTF-8  
+ENV LANGUAGE fr_FR:fr  
+ENV LC_ALL fr_FR.UTF-8
+
+RUN bash -c "$(curl -fs https://cqls.dyndoc.fr/users/RCqls/Dyndoc/install/install-ubuntu16.sh)"
+
+EXPOSE 9294
+
+WORKDIR /home/ubuntu
+
+VOLUME ["/home/ubuntu/bin"]
+
+RUN chown -R ubuntu:ubuntu /home/ubuntu
+
+USER ubuntu
+
+RUN dyn-init
+
+RUN dpm install rcqls/DyndocWebTools.dyn
+RUN dpm link rcqls/DyndocWebTools.dyn

data/share/dyn-site/docker/files/Dockerfile-website

@@ -0,0 +1,9 @@
+FROM rcqls/dyndoc-ruby
+MAINTAINER "Cqls Team"
+
+USER ubuntu
+
+RUN mkdir -p /home/ubuntu/RodaSrv/public/edit
+RUN mkdir -p /home/ubuntu/RodaSrv/public/users
+
+ENTRYPOINT /usr/local/bin/dyn-ctl start && /bin/bash

data/share/dyn-site/docker/files/docker-compose.yml

@@ -0,0 +1,21 @@
+version: '2'
+
+services:
+  dyndoc-ruby:
+    build:
+      context: DockerFiles
+      dockerfile: Dockerfile-dyndoc
+    image: rcqls/dyndoc-ruby-$DyndocRubyUbuntu$
+
+  website:
+    build:
+      context: DockerFiles
+      dockerfile: Dockerfile-website
+    restart: always
+    volumes:
+      - $RodaSrvPublic$:/home/ubuntu/RodaSrv/public
+      - $RodaSrvSystem$:/home/ubuntu/RodaSrv/install
+      - ./bin:/home/ubuntu/bin
+    ports:
+      - $RodaSrvPort$:9294
+    tty: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -229,6 +229,10 @@ files:
 - share/demo/testBeamer.dyn
 - share/demo/testBeamer_lib.dyn
 - share/demo/test_atom.dyn
+- share/dyn-site/docker/dyn-site.sh
+- share/dyn-site/docker/files/Dockerfile-dyndoc
+- share/dyn-site/docker/files/Dockerfile-website
+- share/dyn-site/docker/files/docker-compose.yml
 - share/dyn-site/dyn-site.sh
 - share/dyndoc.yml/README.md
 - share/dyndoc.yml/example.dyndoc.yml