dyndoc-ruby 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f13ef78daad4f7cab557c33988cf7da1100320cdb7a19ab211ee99abde8f8bf
-  data.tar.gz: af4977f95ec0bc87dde2656419de2168f908cc65433eb0f6e0a2b0f447ab7226
+  metadata.gz: 8723bdb859aae5e91938015ec532b9fb896f20acef9ffa6e035e54e48debd7f3
+  data.tar.gz: e3e6db01504a19b2b50318ad7ce985711eebee860f8b3dfd7875216eee4fb04c
 SHA512:
-  metadata.gz: 239ba8a18e7282920922051dad37a42a8fc8d3bb836aad7a42bb75176a056db398668d7cfb99afcc4a2f02b9bcb63b852486bfa41b1a453c6b5cd5334885a6ea
-  data.tar.gz: 532883f4d9a29d228bdd7169699bad36b7dbe48fe369b535bf5f92dce0486ef683bd254a19de7a3c64d1c036fddc23890d4c34fb4ee18d462fe93e2821fca756
+  metadata.gz: 0cd8c4aa4ec42053a1c1227fad45122d77f96780f6b853998c63565f090cb99a6e2e470a89c016dcae1db250c00618e1fad3b52493267e73847bc33a1df2c20a
+  data.tar.gz: 235cabc8a20637344b9ae44960e6a55f8292bd8739167919cebcc2c31a8667ad95199719af12006af7e3b9d76a2e7b2eeda2b9e56ec2a967662e8f2bc76a8686

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]
@@ -245,6 +248,23 @@ module Dyndoc
       Thin::Runner.new(arg).run!
     end
 
+    def HtmlServers.create_html_page(dyn_file,html_file,opts,pages_root)
+
+      Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
+      ## fix html_file for _rmd, _adoc and _ttm
+      if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
+        html_file = $1+".html"
+      end
+      if html_file =~ /^(.*)_erb\.html$/
+        erb_page=File.join(pages_root,$1)
+        if File.exists? erb_page+"_erb.html"
+          FileUtils.mv erb_page+"_erb.html",erb_page+".erb"
+        end
+        html_file = "erb"+$1
+      end
+    
+    end
+
     def HtmlServers.dyn_html_filewatcher(cfg={}) #cfg
       require 'dyndoc-convert'
       require 'dyndoc-edit'
@@ -270,10 +290,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?
@@ -304,27 +325,30 @@ module Dyndoc
 
                 html_file=opts[:html_files][opts[:current_doc_tag]] # No more default # || html_files[""]
                 ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
-                Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
-                ## fix html_file for _rmd, _adoc and _ttm
-                if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
-                  html_file = $1+".html"
-                end
-                if html_file =~ /^(.*)_erb\.html$/
-                  erb_page=File.join(pages_root,$1)
-                  if File.exists? erb_page+"_erb.html"
-                    FileUtils.mv erb_page+"_erb.html",erb_page+".erb"
+                state=""
+                begin
+                  HtmlServers.create_html_page(dyn_file,html_file,opts,pages_root)
+
+                  puts dyn_file[1..-1]+(dyn_public_edit_file.empty? ? "" : "*")+" processed => "+html_file+" created!"
+                  options[:first] = html_file != old_html_file
+                  if html_file != old_html_file
+                    old_html_file = html_file
+                    url=File.join(base_url,html_file)
+                    ## p [:url,url]
+                    Dyndoc::Browser.load(url)
+                  else
+                    Dyndoc::Browser.reload
+                  end
+                rescue => e
+                  state="error: #{e.message} =>"
+                ensure
+                  notify_file=filename.split("/")
+                  if (ind=notify_file.index ".edit")
+                    notify_file=notify_file[0..ind].join("/")
+                    File.open(notify_file+"/notify.out","w") do |f|
+                      f << state + filename
+                    end
                   end
-                  html_file = "erb"+$1
-                end
-                puts dyn_file[1..-1]+(dyn_public_edit_file.empty? ? "" : "*")+" processed => "+html_file+" created!"
-                options[:first] = html_file != old_html_file
-                if html_file != old_html_file
-                  old_html_file = html_file
-                  url=File.join(base_url,html_file)
-                  ## p [:url,url]
-                  Dyndoc::Browser.load(url)
-                else
-                  Dyndoc::Browser.reload
                 end
               end
             end

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/lib/dyndoc-world.rb

@@ -0,0 +1,75 @@
+require 'yaml'
+
+module DyndocWorld
+
+	@@root=nil
+	@@public=nil
+
+	def DyndocWorld.root(root=nil)
+		@@root=root if root
+		return @@root
+	end
+
+	def DyndocWorld.public_root(public_root=nil)
+		@@public=public_root if public_root
+		return @@public
+	end
+
+	def DyndocWorld.cfg(admin=nil)
+		cfg={}
+		secret = File.join(DyndocWorld.root,admin ? ".admin.yml" : ".secret.yml")
+		cfg = YAML::load_file(secret) if DyndocWorld.root and File.exists? secret
+		return cfg
+	end
+
+	## access ##
+	## prj is to give access for a user or a group of users
+	## if prj or prj/secret is undefined it is accessible
+	def DyndocWorld.yml?(prj,yml)
+		admin=(prj=="admin")
+		cfg=DyndocWorld.cfg(admin)
+		cfg=cfg[prj] unless admin
+		return true unless cfg
+		##DEBUG: p [:"yml?", cfg, yml, (cfg and yml and ((cfg["secret"] || "none") == (yml["secret"] || "none")) and yml["file"] and !(yml["file"].include? "../"))]
+		return (cfg and yml and ((cfg["secret"] || "none") == (yml["secret"] || "none")) and yml["file"] and !(yml["file"].include? "../"))
+	end
+
+	## file ##
+	## from yml
+	## ex: public/<user>/<pathname>
+	##     edit/<user>/<pathname>
+	##     dynworld/<user>/<pathname>
+	def DyndocWorld.prj_file(yml,content)
+		success,prj_file=false,""
+		parts=yml["file"].split("/")
+		p [:parts,parts]
+		root=parts.shift
+		p [:root,root]
+		if ["public","edit","dynworld"].include? root
+			user=parts.shift
+			case root
+			when "public"
+				prj_file=File.join(DyndocWorld.public_root,"users",user)
+				prj_file=(Dir.exists? prj_file) ? File.join(prj_file,parts) : ""
+			when "edit"
+				prj_file=File.join(DyndocWorld.public_root,"users",user,".edit")
+				prj_file=(Dir.exists? prj_file) ? File.join(prj_file,parts) : ""
+			when "dynworld"
+				prj_file=File.join(DyndocWorld.root,user,parts)
+			end
+		end
+		p [:prj_file,prj_file]
+		unless prj_file.empty? 
+			FileUtils.mkdir_p File.dirname prj_file
+			File.open(prj_file,"w") {|f|
+				if root == "edit"
+					f << yml.to_yaml
+					f << "---\n"
+				end
+				f << content.strip
+			}
+			success=true
+		end
+		return success
+	end
+end

data/share/html-srv/dyn-html-srv.ru

@@ -10,12 +10,10 @@ cfg.merge! YAML::load_file(cfg_yml) if File.exist? cfg_yml
 root = cfg["root"] || File.join(ENV["HOME"],"RCqls","RodaServer")
 $public_root = cfg["public_root"] || File.join(root ,"public")
 ##p [:public_root,$public_root]
-$dynworld_root=cfg["dynworld_root"] || File.join(ENV["HOME"],".dyndoc-world")
-$dynworld_tools=cfg["dynworld_tools"] || File.join(ENV["HOME"],"Gogs","dynworld")
-if Dir.exists? $dynworld_tools
-  require File.join($dynworld_tools,"tools.rb") 
-  puts "Dynworld activated"
-end
+
+require 'dyndoc-world'
+DyndocWorld.root(cfg["dynworld_root"] || File.join(ENV["HOME"],".dyndoc-world"))
+DyndocWorld.public_root($public_root)
 
 class App < Roda
   use Rack::Session::Cookie, :secret => (secret="Thanks like!")
@@ -45,24 +43,19 @@ class App < Roda
 
       r.post "file-save" do
         puts "file-save"
-        prj,yml,@file,@content=r['prj'].strip,r['yml'].strip,r['file'].strip,r['content']
-        p [prj,yml,@file,@content]
+        prj,yml,@content=r['prj'].strip,r['yml'].strip,r['content']
+        p [prj,yml,@content]
         success=false
         unless yml.empty?
           yml="---\n" + yml unless yml[0,4] == "---\n"
           yml=YAML::load(yml)
           p [:yml, yml]
           require 'fileutils'
-          if @file and !(@file.include? "../") and (DyndocWorld.yml?(prj,yml)) 
-            if Dir.exists? $dynworld_root
-              prj_dir=DyndocWorld.prj_dir(prj,yml)
-              dynworld_file=File.join($dynworld_root,prj_dir,@file)
-              FileUtils.mkdir_p File.dirname dynworld_file
-              File.open(dynworld_file,"w") {|f| f << @content.strip} 
-              success=true
-            end
+          if DyndocWorld.yml?(prj,yml)
+            success=DyndocWorld.prj_file(yml,@content)
           end
         end
+        p [:success, "{success: " + success.to_s + "}"]
         "{success: " + success.to_s + "}"
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -217,6 +217,7 @@ files:
 - lib/dyndoc-html-servers.rb
 - lib/dyndoc-linter.rb
 - lib/dyndoc-tasks.rb
+- lib/dyndoc-world.rb
 - lib/dyndoc/cli/interactive-client.rb
 - lib/dyndoc/srv/interactive-server.rb
 - lib/dyndoc/srv/tilt.rb
@@ -229,7 +230,6 @@ files:
 - share/demo/testBeamer.dyn
 - share/demo/testBeamer_lib.dyn
 - share/demo/test_atom.dyn
-- 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/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