dyndoc-ruby 1.3.6 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1429abd256e9d0441df24744231a62ae8129a5274c3e8de413e700a81dfdc917
-  data.tar.gz: 21e08fa73d544abf8618461df13e40cdfc333a542e4c71185ae301ad12784ea7
+  metadata.gz: d255842b28ec56165e4afeaa4365023f907564018686c100ddaaa51a5da082d8
+  data.tar.gz: 0cfcbc668b436f90246754c516b2c6fe3ab7c8db9a1c0fa25f308fafbb994440
 SHA512:
-  metadata.gz: 1a02a9276665a3302bea5445e7d7b1f2b1129ae62ca5409464afc25180254ebf053046298cac9f46130a8e4b1d8ac282f5ddf01dd93066d29905942d8f1d534a
-  data.tar.gz: 3953bd8ce467a7e6dc5306085e0062152571af478634e3404eb057da0211d8d726091e88bf57e15ae0c3e854deeecef445c0d7c38df34f9f0fa5640f961e21b1
+  metadata.gz: 9d31008fa44284347b7cb449547b070c3fadff5d46502add8d765da72add3306d8b9aeb2395534e51b6f64be18cc7a7e6e94431f97c5ecc50c74e20e580b8d1e
+  data.tar.gz: cb6cdaac3ac2f79261eed45e915d1ca55adf438a27858fb302462466a34c1c0ee5c43e6bcdfcf6fb091330834c0b2ae586b3d9d42a4a7ca8b16fffe827a46a42

data/bin/dyn-ctl

@@ -6,6 +6,15 @@ SRVS=["dyn-srv","dyn-html","dyn-http","dyn-task"]
 CMD="dyn-ctl"
 DYNCTL_PLIST=File.expand_path("~/Library/LaunchAgents/local.dyn-ctl.plist")
 
+def srvs?(srvs)
+  if srvs
+    srvs=srvs.split(",",-1).map{|e| "dyn-"+e}
+  else 
+    srvs=SRVS.dup
+  end
+  return srvs
+end
+
 case (ARGV[0] || "start").downcase
 when "init"
   rodasrv=File.expand_path("~/RodaSrv")
@@ -58,7 +67,8 @@ when "unwatch"
   end
 
 when "start"
-  status=SRVS.map do |srv|
+  srvs=srvs?(ARGV[1])
+  status=srvs.map do |srv|
     `#{srv} status`.empty?
   end
   if status.any?
@@ -69,16 +79,18 @@ when "start"
       `osascript -e '#{cmd_to_display}'`
     end
     puts message
-    status.each_with_index { |e,i|  `#{SRVS[i]} start` if e }
+    status.each_with_index { |e,i|  `#{srvs[i]} start` if e }
   end
 
 when "stop"
-    SRVS.each {|srv| `#{srv} stop`}
+    srvs=srvs?(ARGV[1])
+    srvs.each {|srv| `#{srv} stop`}
 
 when "status"
-    SRVS.each {|srv| puts srv+(`#{srv} status`.empty? ? "stopped" : "running")}
+    srvs=srvs?(ARGV[1])
+    srvs.each {|srv| puts srv+(`#{srv} status`.empty? ? "stopped" : "running")}
 
-when "new"
+  when "new"
 
   if RUBY_PLATFORM =~ /darwin/
     ## launchctl seems to work but actually: dyn-srv, dyn-html and dyn-http started but noit properly

data/lib/dyndoc-html-servers.rb

@@ -2,6 +2,7 @@ require 'dyndoc/init/home'
 require 'pathname'
 require 'yaml'
 require 'filewatcher'
+require 'dyndoc-servers-cfg'
 
 #if RUBY_VERSION >= "2.4"
   class FileWatcher < Filewatcher
@@ -228,12 +229,16 @@ 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=File.join(ENV["HOME"],"RodaSrv","public","users",".dyn-html","srv.ru")
+      dyn_html_srv_ru="/home/ubuntu/tools/dyn-html/srv.ru" unless File.exists? 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]
       else
-        arg += ["-p",port || "9294"]
+        arg += ["-p",(port || DyndocServers.dyn_http_port?  || 9294).to_s]
       end
       if host
         arg += ["-a",host]
@@ -245,6 +250,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'
@@ -254,14 +276,14 @@ module Dyndoc
       $VERBOSE = nil
       options={first: true}
       ## To put inside yaml config file!
-      root ||= cfg["root"] || HtmlServers.cfg["root"] || File.join(ENV["HOME"],"RCqls","RodaServer")
+      root ||= cfg["root"] || HtmlServers.cfg["root"] || File.join(ENV["HOME"],"RodaSrv")
       dyn_root = cfg["dyn_root"] || HtmlServers.cfg["dyn_root"] || File.join(root ,"edit") 
       public_root = cfg["public_root"] || HtmlServers.cfg["public_root"] || File.join(root ,"public")
       dyn_public_edit_root = File.join(public_root,"users","*",".edit","**","*.dyn")
       pages_root = File.join(public_root ,"pages")
       current_email = cfg["email"] || HtmlServers.cfg["email"] || "rdrouilh@gmail.com" #default email user can be overriden by -u option
       host=(cfg["html-srv-host"] || HtmlServers.cfg["html-srv-host"] || "http://localhost").to_s
-      port=(cfg["html-srv-port"] || HtmlServers.cfg["html-srv-port"] || "9294").to_s
+      port=(cfg["html-srv-port"] || HtmlServers.cfg["html-srv-port"] || DyndocServers.dyn_http_port? || "9294").to_s
       base_url= host+":"+port
 
       opts = {
@@ -307,18 +329,8 @@ module Dyndoc
                 ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
                 state=""
                 begin
-                  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
+                  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
@@ -329,8 +341,8 @@ module Dyndoc
                   else
                     Dyndoc::Browser.reload
                   end
-                rescue
-                  state="error: "
+                rescue => e
+                  state="error: #{e.message} =>"
                 ensure
                   notify_file=filename.split("/")
                   if (ind=notify_file.index ".edit")

data/lib/dyndoc-servers-cfg.rb

@@ -0,0 +1,24 @@
+require 'yaml'
+module DyndocServers
+	@@cfg=nil
+	@@servers_cfg_file=File.join(ENV["HOME"],".dyndoc-servers.yml")
+	def DyndocServers.cfg
+      unless @@cfg
+        @@cfg=(File.exist? @@servers_cfg_file) ? ::YAML::load_file(@@servers_cfg_file) : {}
+      end
+      @@cfg
+	end
+
+	def DyndocServers.dyn_cli_port?
+		DyndocServers.cfg["ports"] ? @@cfg["ports"]["dyn-cli"] : nil
+	end
+
+	def DyndocServers.dyn_srv_port?
+		DyndocServers.cfg["ports"] ? @@cfg["ports"]["dyn-srv"] : nil
+	end
+
+	def DyndocServers.dyn_http_port?
+		DyndocServers.cfg["ports"] ? @@cfg["ports"]["dyn-http"] : nil
+	end
+
+end

data/lib/dyndoc-tasks.rb

@@ -98,9 +98,9 @@ def DyndocTasks.dyn_yml(doc)
 		end
 		if is_dyntask
 			dynfile=docname+".dyn"
-		FileUtils.cp dyntaskpath, dynfile
-		$params=cfg_yml["params"]
-		$dyntask=dyntaskname
+			FileUtils.cp dyntaskpath, dynfile
+			$params=cfg_yml["params"]
+			$dyntask=dyntaskname
 			cfg_yml["params"].each do |key,val|
 				Settings["cfg_dyn.user_input"] << [key,val]
 			end
@@ -126,8 +126,16 @@ def DyndocTasks.filewatcher(cfg={}) #cfg
 	::FileWatcher.new(dyntasks_root).watch() do |filename, event|
 	  ##DEBUG: 
 	  puts filename + "->" + event.to_s+"\n"
-	  if [:changed,:updated,:new].include? event and File.extname(filename) == ".yml"
-		DyndocTasks.dyn_yml filename
+	  if [:changed,:updated,:new].include? event 
+		case File.extname(filename)
+		when ".yml"
+			DyndocTasks.dyn_yml filename
+		when ".rb"
+			system("/usr/bin/env ruby "+filename)
+		when ".sh"
+			system("/usr/bin/env bash "+filename)
+		end
+
 	  end
 	end
 end

data/lib/dyndoc-world.rb

@@ -1,11 +1,81 @@
+require 'yaml'
+
 module DyndocWorld
 
-	def DyndocWorld.yml?(prj,yml)
-			true
+	@@root=nil
+	@@public=nil
+
+	def DyndocWorld.root(root=nil)
+		@@root=root if root
+		return @@root
 	end
 
-	def DyndocWorld.prj_dir(prj,yml)
-			prj
+	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.prj_file?(yml)
+		prj=yml["prj"] || yml["project"] || "default" 
+		admin=(prj=="admin")
+		cfg=DyndocWorld.cfg(admin)
+		cfg=cfg[prj] unless admin
+		return nil unless cfg and yml["file"]
+		parts=yml["file"].split("/")
+		p [:parts,parts]
+		root=parts.shift
+		p [:root,root]
+		user=parts.shift
+		##DEBUG: p [:"yml?", cfg, yml, (cfg and yml and ((cfg["secret"] || "none") == (yml["secret"] || "none")) and yml["file"] and !(yml["file"].include? "../"))]
+		if (cfg and yml and ((cfg["secret"] || "none") == (yml["secret"] || "none")) and yml["file"] and !(yml["file"].include? "../")) and ((cfg["users"] || []).include? user)
+			prj_file=nil
+			if ["public","edit","dynworld"].include? root
+				prj_subdir=cfg["subdir"] || ""
+				case root
+				when "public"
+					prj_file=File.join(DyndocWorld.public_root,"users",user)
+					prj_file=(Dir.exists? prj_file) ? File.join(prj_file,prj_subdir,parts) : ""
+				when "edit"
+					prj_file=File.join(DyndocWorld.public_root,"users",user,".edit")
+					prj_file=(Dir.exists? prj_file) ? File.join(prj_file,prj_subdir,parts) : ""
+				when "dynworld"
+					prj_file=File.join(DyndocWorld.root,user,prj_subdir,parts)
+				end
+			end
+		end
+		p [:prj_file,prj_file]
+		return prj_file
+		
+	end
+
+	## file ##
+	## from yml
+	## ex: public/<user>/<pathname>
+	##     edit/<user>/<pathname>
+	##     dynworld/<user>/<pathname>
+	def DyndocWorld.save_prj_file(prj_file,content)
+		FileUtils.mkdir_p File.dirname prj_file
+		File.open(prj_file,"w") {|f|
+			f << content.strip
+		}
+	end
+
+	def DyndocWorld.open_prj_file(prj_file)
+		res={success: false}
+		if File.exists? prj_file
+			res[:content]=File.read(prj_file)
+			res[:success]=true
+		end
+		return res
+	end
 end

data/lib/dyndoc/cli/interactive-client.rb

@@ -1,4 +1,5 @@
 require "socket"
+require 'dyndoc-servers-cfg'
 
 module Dyndoc
 
@@ -11,7 +12,7 @@ module Dyndoc
 		## reinit is an array
 		def initialize(cmd,tmpl_filename,addr="127.0.0.1",reinit=[],port=7777)
 
-			@addr,@port,@cmd,@tmpl_filename=addr,port,cmd,tmpl_filename
+			@addr,@port,@cmd,@tmpl_filename=addr,DyndocServers.dyn_cli_port? || port,cmd,tmpl_filename
 			##p [:tmpl_filename,@tmpl_filename,@cmd]
 			## The layout needs to be reintailized for new dyndoc file but not for the layout (of course)!
 			dyndoc_cmd="dyndoc"

data/lib/dyndoc/srv/interactive-server.rb

@@ -1,6 +1,7 @@
 require 'socket'                # Get sockets from stdlib
 require "dyndoc-core"
 require 'dyndoc-converter'
+require 'dyndoc-servers-cfg'
 
 
 module Dyndoc
@@ -67,7 +68,7 @@ module Dyndoc
     end
 
     def init_server
-      @server = TCPServer.new('0.0.0.0',7777)
+      @server = TCPServer.new('0.0.0.0',DyndocServers.dyn_srv_port? || 7777)
     end
 
     def run

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

@@ -10,9 +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")
 
 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!")
@@ -42,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.6
+  version: 1.4.5
 platform: ruby
 authors:
 - RCqls
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -188,7 +188,6 @@ executables:
 - dyn-4ever
 - dyn-yml
 - dyn-rebase-url
-- dyn-site
 extensions: []
 extra_rdoc_files: []
 files:
@@ -204,7 +203,6 @@ files:
 - bin/dyn-lint
 - bin/dyn-rebase-url
 - bin/dyn-scan
-- bin/dyn-site
 - bin/dyn-srv
 - bin/dyn-task
 - bin/dyn-x
@@ -216,6 +214,7 @@ files:
 - lib/dyndoc-edit.rb
 - lib/dyndoc-html-servers.rb
 - lib/dyndoc-linter.rb
+- lib/dyndoc-servers-cfg.rb
 - lib/dyndoc-tasks.rb
 - lib/dyndoc-world.rb
 - lib/dyndoc/cli/interactive-client.rb
@@ -230,11 +229,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
@@ -499,7 +493,7 @@ licenses:
 - MIT
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -516,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: R and Ruby in text document
 test_files: []

data/bin/dyn-site

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-cmd=::File.expand_path('../../share/dyn-site/dyn-site.sh',  __FILE__)+" "+ARGV.join(" ")
-
-out=`/bin/bash -c "#{cmd}"`
-
-puts out unless out.empty?

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