dyndoc-ruby 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e134057e655c0154df49f4518d6964d373efd163adde55ac057f734649c677b
-  data.tar.gz: 6f92db285fbbb590d952480e9ba1b8a1fc099c6924861b87a548e097b1188e55
+  metadata.gz: 874ff2bfd3cfd0a3cbc30680e7ddadb68be8a3c417d85582e05c699855a96cec
+  data.tar.gz: c47643d6023b0c525a23944127f578eb4c519cc19d35302deb7fdc4724f248f7
 SHA512:
-  metadata.gz: 673b82c1efc5b4e1f6a16e9f394ff35cba499353050043351c13037ef49e6ee24be0a75acb1d1ef378ad6decf741859aa9b15920eee2f5936b78d6ab17e46417
-  data.tar.gz: d1b541c745c7dab4ee9c8372f71d9f7524c6b438ad8c0d101e5adf6de0a6581b4674f735dbf601daaf0af124cb0466abdb631440d0a708c84a36c298dbe22f60
+  metadata.gz: 43fc0de9ab39f1dbee93acd2d3bedc272b21b154227dfe5a3c2c943816ae3f23a0e1b8372b2fd773181c5bd033d022d681900baf88c3c1ab64d686ca8ad698ad
+  data.tar.gz: 0ead492497f229e9b37b04196336e3910db2611c1af3bd9d8fcf23a2943c7703b3e9def436ede1b3c0753e32670931dd7c0bc08bbb7eda3db40b3c39abbbd301

data/lib/dyndoc-html-servers.rb

@@ -228,7 +228,10 @@ module Dyndoc
 
     def HtmlServers.dyn_http_server(host=nil,port=nil)
       require 'thin'
-      dyn_html_srv_ru=File.expand_path("../../share/html-srv/dyn-html-srv.ru",__FILE__)
+      dyn_html_srv_ru="/home/ubuntu/tools/dyn-html/srv.ru" # DyndocDockerSite guest-tools folder
+      dyn_html_srv_ru=File.join(ENV["HOME"],"dyndoc","html-srv","dyn.ru") unless File.exists? dyn_html_srv_ru
+      dyn_html_srv_ru=File.expand_path("../../share/html-srv/dyn-html-srv.ru",__FILE__) unless File.exists? dyn_html_srv_ru
+      
       arg=["-R",dyn_html_srv_ru]
       if HtmlServers.cfg["html-srv-port"]
         arg += ["-p",HtmlServers.cfg["html-srv-port"].to_s]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -230,11 +230,6 @@ 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
 - share/dyntasks/clean_task.dyn

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

@@ -1,54 +0,0 @@
-#!/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

@@ -1,31 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

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

@@ -1,167 +0,0 @@
-#!/bin/bash
-
-
-RootSrv=$HOME/RodaSrv
-
-if [ "$1" = "--root" ];then
-    shift
-    RootSrv=$1
-	if [ $RootSrv = "cfg" ]; then
-		RootSrv=`ruby -e 'require "yaml";puts YAML::load_file(File.join(ENV["HOME"],"dyndoc/etc/dyn-html.yml"))["root"]'`
-	fi
-    shift
-fi
-
-Cmd=$1
-
-#echo "Command: $Cmd"
-
-if [ "$Cmd" = "" ]; then
-	Cmd="help"
-fi
-
-
-case $Cmd in
-set-root)
-    new-root=$2
-	## Config file
-	echo "---" > $HOME/dyndoc/etc/dyn-html.yml
-	echo "root: $new-root" >> $HOME/dyndoc/etc/dyn-html.yml
-;;
-help)
-	echo "Aide:"
-	echo "----"
-	echo "  dyn-site [--root <cfg|ROOT>] first (création de l'arborescence de base)"
-	echo "  dyn-site [--root <cfg|ROOT>] init [zip|link <PATH>](installation de tools et system)"
-	echo "  dyn-site [--root <cfg|ROOT>] add <User> (ajout d'un utilisateur <User>)"
-	echo "  dyn-site [--root <cfg|ROOT>] rebase <Conf> (cas de workshop où <Conf>=<User>)" 
-	echo "  dyn-site [--root <cfg|ROOT>] rebase-subdir <Subdir> <Prj> (Subdir=<User>/<PrjPath>)"
-	echo "  dyn-site vscode [--update] (install vscode plugin for dyndoc)"
-	## DANGEROUS!: echo "  dyn-site set-root <new-root>"
-	;;
-first)
-	## Not necessary for docker
-	mkdir -p $RootSrv/edit
-	mkdir -p $RootSrv/public/users
-	;;
-init)
-	installmode=$2
-	case $installmode in
-	zip)
-		## Install Specfic stuff inside 
-		mkdir -p $RootSrv/install/RodaSrvTools 
-		cd ${RootSrv}/install
-		if ! [ -d DynRodaSystem ]; then git clone https://toltex-gogs.dyndoc.fr/rcqls/DynRodaSystem.git; fi
-		if ! [ -f RodaSrvTools.zip ]; then 
-			wget https://toltex-seafile.dyndoc.fr/f/128ced4435/?raw=1 -O RodaSrvTools.zip
-			cd RodaSrvTools
-			unzip ../RodaSrvTools.zip
-		fi
-		## Create links
-		cd ${RootSrv}
-		ln -sf install/DynRodaSystem system
-		cd public
-		ln -sf ../install/RodaSrvTools tools
-		;;
-	link)
-		rodatools_path=$2
-		## Create links
-		cd ${RootSrv}
-		ln -sf $rodatools_path/system system
-		cd public
-		ln -sf $rodatools_path/tools tools
-	esac
-	;;
-add)
-	RodaWebUser=$2
-	if [ "$RodaWebUser" != "" ]; then
-		mkdir -p ${RootSrv}/edit/${RodaWebUser}
-		mkdir -p ${RootSrv}/public/pages
-		mkdir -p ${RootSrv}/public/users/${RodaWebUser}/.pages
-		cd ${RootSrv}/public/pages
-		ln -s ../users/${RodaWebUser}/.pages ${RodaWebUser}
-	fi
-	;;
-rebase)
-	Conf=$2
-	if [ "${Conf}" = "" ]; then
-		exit
-	fi
-	PUBLIC_ROOT="$HOME/RodaSrv/public/users/${Conf}"
-	SITE_ROOT="$HOME/RodaSrv/.site/$Conf"
-	PAGES_ROOT="$SITE_ROOT/pages"
-	mkdir -p ${SITE_ROOT}
-	cp -R  ${PUBLIC_ROOT}/* ${SITE_ROOT}/
-	cd ${PAGES_ROOT}
-	pages=$(ls *.html)
-	echo "pages to process: $pages"
-	for html in $pages
-	do
-		rebase_url --from /users/$Conf/ --to / $html
-		rebase_url --from /$Conf/ --to / $html
-		mv $html ..
-	done
-	cd $SITE_ROOT
-	rm -fr pages
-	;;
-rebase-subdir)
-	Subdir=$2
-	if [ "${Subdir}" = "" ]; then
-		echo "Subdir doit être non vide!"
-		exit
-	fi
-	Prj=$3
-	if [ "${Prj}" = "" ]; then
-		echo "Prj doit être non vide!"
-		exit
-	fi
-	PUBLIC_ASSETS="$HOME/RodaSrv/public/users/${Subdir}/${Prj}"
-	PUBLIC_PAGES="$HOME/RodaSrv/public/pages/${Subdir}/${Prj}"
-	SITE_ROOT="$HOME/RodaSrv/.site/$Prj"
-	PAGES_ROOT="$SITE_ROOT/pages"
-	if [ -d ${SITE_ROOT} ]; then
-		rm -fr ${SITE_ROOT}
-	fi
-	mkdir -p ${PAGES_ROOT}
-	cp -R ${PUBLIC_PAGES}/* ${PAGES_ROOT}/
-	cp -R  ${PUBLIC_ASSETS}/* ${SITE_ROOT}/
-	cd ${PAGES_ROOT}
-	pages=$(find . -name  '*.html')
-	echo "pages to process: $pages"
-	for html in $pages
-	do
-		rebase_url --from /users/${Subdir}/${Prj}/ --to / $html
-		rebase_url --from /${Subdir}/${Prj}/ --to / $html
-	done
-	cd $SITE_ROOT
-	mv pages/* .
-	rm -fr pages
-	;;
-vscode)
-    if [ -d ~/.vscode/extensions ]; then
-		cd ~/.vscode/extensions
-		mkdir tmp
-		cd tmp
-		git clone https://github.com/rcqls/dyndoc-syntax
-		cd ..
-		if [ -d dyndoc ]; then
-			if [ "$2" = "--update" ]; then
-				rm -fr dyndoc
-				mv tmp/dyndoc-syntax/vscode/dyndoc dyndoc
-				rm -fr tmp
-		  	fi
-		else
-			mv tmp/dyndoc-syntax/vscode/dyndoc dyndoc
-			rm -fr tmp
-		fi
-	fi
-	;;
-# deploy)
-# 	Conf=$2
-# 	url="sfdsmqrk@ftp.sfds.asso.fr:$Conf/"
-# 	if [ "$3" != "" ]; then
-# 		url="$3"
-# 	fi
-# 	rsync -az $SITE_ROOT/* $url
-# 	;;
-esac