dyndoc-ruby 1.0.22 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9ef3f36a75904bf13179607fbcf5b628c83aae92
-  data.tar.gz: 6519b24c52467f4aee93e917461c62d410ba55a5
+SHA256:
+  metadata.gz: de8974d835f1c28fe519e9dcad144c6df472418b1722e64c1170024a297463fb
+  data.tar.gz: 729c42dcf5a03ba6b23230547b48be9a184861fabb0b16445aafde9a2677e7ec
 SHA512:
-  metadata.gz: 77b99a8b292d97693fb25e158f8e4525b231c380e16a6caf7df2d9a840c37e53e8e515f72897c93116d7d0c22a2afb15be7bd1959984f9b8ce912226b1eb95f0
-  data.tar.gz: 57777f8f6d9d8dbdb2b41e99c739ed94dbb626f4a2239523fe3593649ac0ebc25c857283f7cc1649b3ef9327990d43171d5953f4d34a2f5cef6f9c7a162fb964
+  metadata.gz: 89fa832cd2e117b83373e5b2b40c18cd106034a7235cceceaa3f6c33ac417419814338ca7e8a66b94bfacda69b696a2fd4621cce847008559bd7cdb4614c57a5
+  data.tar.gz: 1ee53e1c3a5e452c2131591309c6cf2260f2474d8a679ee174b91c2dc957f30bc1c9433972f9ff7ed68e7d98fe6006af4acd1638adc1b7edb0d5aab33ca5e493

data/bin/dyn

@@ -2,6 +2,7 @@
 
 require 'dyndoc/document'
 
+puts "bin" ;p $0
 ## p Dyndoc.cfg_dir
 
 ## To be used for remote at the end
@@ -35,10 +36,15 @@ OptionParser.new do |opts|
 
   opts.on('-t','--tags TAGS',Array,'filter tags') {|t| Settings["cfg_dyn.tag_tmpl"] = t}
 
-  opts.on('-C',"--content-only", "content only mode (no header!)") do
+  opts.on('-C',"--content_only", "content only mode (no header!)") do
     Settings["cfg_dyn.model_doc"] = "Content"
   end
 
+  opts.on('-x',"--exec_only", "exec only mode (no document!)") do
+    Settings["cfg_dyn.model_doc"] = "Content"
+    Settings["cfg_dyn.exec_mode"] = "yes"
+  end
+
   opts.on('-c', '--cmd COMMAND','[a(rchive old)][r(emove old)][s(ave)][pdf(latex)]') {|c|
     cmd =[:make_content]
     cmd << :save_old if c.include? "a"
@@ -72,6 +78,10 @@ OptionParser.new do |opts|
     Settings['cfg_dyn.debug']=true
   end
 
+  opts.on('-r','--rb_only','ruby only mode') do
+    Settings['cfg_dyn.ruby_only']=true
+  end
+
   opts.on("-p", "--pandoc ", "filter for pandoc (tex2docx,...)") do |f|
     #p [:pandoc,f]
     Settings["cfg_dyn.pandoc_filter"] = f

data/bin/dyn-cli

@@ -3,8 +3,8 @@
 require 'dyndoc/cli/interactive-client.rb'
 
 # USAGE:
-# dyndoc-ruby-client.rb|dyn-cli test.dyn[@127.0.0.1] [output_filename.html]
-# dyndoc-ruby-client.rb|dyn-cli test.dyn,layout.dyn[@127.0.0.1] [output_filename.html]
+# dyn-cli test.dyn[@127.0.0.1] [output_filename.html]
+# dyn-cli test.dyn,layout.dyn[@127.0.0.1] [output_filename.html]
 
 next_i=0
 dyn_tag_tmpl=nil

data/bin/dyn-ctl

@@ -57,7 +57,6 @@ when "unwatch"
     Dyndoc::HtmlServers.unwatch_rm path
   end
 
-
 when "start"
   status=SRVS.map do |srv|
     `#{srv} status`.empty?
@@ -89,7 +88,7 @@ when "new"
     FileUtils.mkdir_p File.join(ENV["HOME"],"dyndoc",'log')
 
     unless File.exists? DYNCTL_PLIST
-      plist= <<-END.sub(/CMD/,CMD).sub(/DYN_CMD/,`which #{CMD}`.strip).sub(/ERR_FILE/,DYNCTL_ERR_FILE).sub(/OUT_FILE/,DYNCTL_OUT_FILE).sub(/DYN_PATH/,ENV["PATH"]).sub(/DYN_LANG/,ENV["LANG"]).sub(/DYN_JULIA_DIR/,ENV["JULIA_DIR"] || "")
+      plist= <<-END.sub(/CMD/,CMD).sub(/DYN_CMD/,`which #{CMD}`.strip).sub(/ERR_FILE/,DYNCTL_ERR_FILE).sub(/OUT_FILE/,DYNCTL_OUT_FILE).sub(/DYN_PATH/,ENV["PATH"]).sub(/DYN_LANG/,ENV["LANG"]).sub(/DYN_JULIA_DIR/,ENV["JULIA_DIR"] || "").sub(/DYN_JULIA_RUBYLIB_PATH/,ENV["JULIA_RUBYLIB_PATH"])
       <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
       <plist version="1.0">
@@ -102,6 +101,10 @@ when "new"
                   <string>DYN_LANG</string>
                   <key>JULIA_DIR</key>
                   <string>DYN_JULIA_DIR</string>
+                  <key>JULIA_RUBYLIB_PATH</key>
+                  <string>DYN_JULIA_RUBYLIB_PATH</string>
+                  <key>OBJC_DISABLE_INITIALIZE_FORK_SAFETY</key>
+                  <string>YES</string>
           </dict>
       <key>Label</key>
       <string>CMD</string>

data/bin/dyn-x

@@ -0,0 +1,134 @@
+#!/usr/bin/env ruby
+
+require 'dyndoc/cli/interactive-client.rb'
+
+# USAGE:
+# dyn-x test.dyn[@127.0.0.1]
+
+next_i=0
+dyn_tag_tmpl=nil
+## very limited tags system
+if ARGV[0] =~ /\-t\=/
+	next_i=1
+	dyn_tag_tmpl="[#<]{#opt]"+ARGV[0][3..-1].strip+"[#opt}"
+end
+
+arg=ARGV[next_i]
+dyn_output=ARGV[next_i + 1]
+
+
+
+if arg and arg.include? "@"
+	arg,addr=arg.split("@")
+else
+	addr="127.0.0.1"
+end
+
+dyn_file,dyn_layout,dyn_libs,dyn_pre_code,dyn_post_code=nil,nil,nil,nil,nil
+
+if arg and arg.include? ","
+	dyn_file,dyn_layout=arg.split(",")
+else
+	dyn_file=arg
+	if i=(dyn_file =~ /\_?(?:html|tex)?\.dyn$/)
+		dyn_layout=dyn_file[0...i]+"_layout.dyn" if File.exist? dyn_file[0...i]+"_layout.dyn"
+	end
+end
+
+if !dyn_layout and File.exist? ".dyn_layout"
+	dyn_layout=File.read(".dyn_layout").strip
+end
+
+# Can be extended to other output?
+if !dyn_layout and dyn_file =~ /\_(?:html|tex)(_[a-z,A-Z,0-9,-]*)\.dyn$/ # I guess this cpuld be very useful!
+	dyn_layout=$1 #layout class (not a path!) defined
+end
+
+# If you want a default layout put it inside ~/dyndoc/etc/dyn-cli/dyn_layout
+if !dyn_layout and File.exist?(etc_dyn_layout=File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","dyn_layout"))
+	dyn_layout=File.read(etc_dyn_layout).strip
+end
+
+# dyn library to require automatically
+if !dyn_libs and File.exist? ".dynlibs"
+	dyn_libs=File.read(".dynlibs").strip
+end
+
+if !dyn_libs and File.exist?(etc_dyn_libs=File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","dyn_libs"))
+	dyn_libs=File.read(etc_dyn_libs).strip
+end
+
+# very similar to dyn_libs but can preload any dyndoc
+if i=(dyn_file =~ /\_?(?:html|tex)?\.dyn$/)
+	dyn_pre_code=File.read(dyn_file[0...i]+"_pre.dyn") if File.exist? dyn_file[0...i]+"_pre.dyn"
+	dyn_post_code=File.read(dyn_file[0...i]+"_post.dyn") if File.exist? dyn_file[0...i]+"_post.dyn"
+end
+
+if !dyn_pre_code and File.exist?(etc_dyn_pre_code=".dyn_pre_code")
+	etc_dyn_pre_code=File.read(etc_dyn_pre_code).strip
+	dyn_pre_code=File.read(etc_dyn_pre_code) if File.exist? etc_dyn_pre_code
+end
+
+if !dyn_libs and File.exist?(etc_dyn_pre_code=File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","dyn_pre_code"))
+	etc_dyn_pre_code=File.read(etc_dyn_pre_code).strip
+	dyn_pre_code=File.read(etc_dyn_pre_code) if File.exist? etc_dyn_pre_code
+end
+
+# very similar to dyn_libs but can preload any dyndoc
+if i=(dyn_file =~ /\_?(?:html|tex)?\.dyn$/)
+	dyn_pre_code=File.read(dyn_file[0...i]+"_pre.dyn") if File.exist? dyn_file[0...i]+"_pre.dyn"
+	dyn_post_code=File.read(dyn_file[0...i]+"_post.dyn") if File.exist? dyn_file[0...i]+"_post.dyn"
+end
+
+# similar to pre_code but for post_code
+if !dyn_post_code and File.exist?(etc_dyn_post_code=".dyn_post_code")
+	etc_dyn_post_code=File.read(etc_dyn_post_code).strip
+	dyn_post_code=File.read(etc_dyn_post_code) if File.exist? etc_dyn_post_code
+end
+
+if !dyn_post_code and File.exist?(etc_dyn_post_code=File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","dyn_post_code"))
+	etc_dyn_post_code=File.read(etc_dyn_post_code).strip
+	dyn_post_code=File.read(etc_dyn_post_code) if File.exist? etc_dyn_post_code
+end
+
+
+dyn_file=nil unless dyn_file and File.exist? dyn_file
+if dyn_layout and !File.exist? dyn_layout
+	dyn_layout_path = ""
+	dyn_layout_path << File.read(etc_dyn_cli_layout_path).strip if File.exist?(etc_dyn_cli_layout_path=File.join(ENV["HOME"],"dyndoc","etc","dyn_cli_layout_path"))
+	dyn_layout_path << (dyn_layout_path.empty? ? "" : ";") << File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","layout")
+	dyn_layouts=dyn_layout_path.split(";").map{|p| (File.exists? (tmp=File.join(p,dyn_layout+".dyn"))) ? tmp : nil }.compact
+	dyn_layout=dyn_layouts[0] #can be nil!
+end
+
+if dyn_file
+	code=File.read(dyn_file)
+	if dyn_libs or dyn_pre_code
+		code_pre = ""
+		code_pre += dyn_pre_code + "\n" if dyn_pre_code
+		code_pre += '[#require]'+"\n"+dyn_libs if dyn_libs
+		code = code_pre + '[#main][#>]' + code
+	end
+	code += "\n" + dyn_post_code if dyn_post_code
+	code = dyn_tag_tmpl+code if dyn_tag_tmpl
+	dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
+	## tag tmpl attempt to communicate to the server
+	if dyn_tag_tmpl
+		##TODO: :dyndoc_tag_tmpl to add to dyndoc_start
+		## but also to dyndoc-server-simple.rb
+	end
+
+	cli=Dyndoc::InteractiveClient.new(code,File.expand_path(dyn_file),addr,dyndoc_start)
+
+	if dyn_layout
+	 	cli=Dyndoc::InteractiveClient.new(File.read(dyn_layout),"",addr) #File.expand_path(dyn_layout),addr)
+	end
+
+	if dyn_output and Dir.exist? File.dirname(dyn_output)
+		File.open(dyn_output,"w") do |f|
+			f << cli.content
+		end
+	else
+		puts cli.content
+	end
+end

data/bin/dyn-yml

@@ -0,0 +1,159 @@
+#!/usr/bin/env ruby
+
+require 'dyndoc/document'
+
+args=ARGV.select{|name|
+  if (name[0,2]!="--" and name.include? "=")
+    key,*val=name.split("=")
+    val=val.join("=")
+    Settings["cfg_dyn.user_input"] << [key,val]
+    false
+  else
+    true
+  end
+}
+
+args=["-h"] if args.empty?
+
+# Default for dyn-yml is without :R and :jl and :exec_mode activated since it is tailor-made for managing task
+# use option -R to activate :R (and :jl if declared in ~/.dyndoc.yml) 
+Settings['cfg_dyn.ruby_only']=true
+# use option -w (like write) to deactivate exec_mode
+Settings["cfg_dyn.model_doc"] = "Content"
+Settings["cfg_dyn.exec_mode"] = "yes"
+
+require 'optparse'
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: dyndoc-compile.rb [options]"
+
+  opts.on("-d", "--docs one,two,three", Array, "list of documents to compile") do |list|
+    Settings["cfg_dyn.doc_list"] = list
+  end
+
+  opts.on("-f", "--format ", "format of the dyndoc document") do |format|
+    Settings["cfg_dyn.format_doc"] = format.to_sym
+  end
+
+  opts.on('-t','--tags TAGS',Array,'filter tags') {|t| Settings["cfg_dyn.tag_tmpl"] = t}
+
+  opts.on('-C',"--content_only", "content only mode (no header!)") do
+    Settings["cfg_dyn.model_doc"] = "Content"
+  end
+
+  opts.on('-w',"--no_exec_only", "exec only mode (no document!)") do
+    Settings["cfg_dyn.model_doc"] = "default"
+    Settings["cfg_dyn.exec_mode"] = "no"
+  end
+
+  opts.on('-c', '--cmd COMMAND','[a(rchive old)][r(emove old)][s(ave)][pdf(latex)]') {|c|
+    cmd =[:make_content]
+    cmd << :save_old if c.include? "a"
+    cmd << :rm_old if c.include? "r"
+    cmd << :save if c.include? "s"
+    ## cmd << :cat if c.include? "c"
+    cmd << :pdf  if c =~ /(E)?pdf([1-3])?/ #if c.include? "pdf"
+    Settings["cfg_dyn.options.pdflatex_echo"]=true if $1 # useable for log sytem (to introduce possibly later)
+    Settings["cfg_dyn.options.pdflatex_nb_pass"]=$2.to_i if $2
+    ## cmd << :png if c.include? "png"
+    ## cmd << :view if c.include? "v"
+    ## cmd << :save << :view if c.include? "x"
+    ## cmd =[:cat] if cmd.empty? #and  cfg_dyn[:model_doc]=="content"
+    ## cmd = [:pdf] if c=="pdf" #only pdflatex
+    Settings["cfg_dyn.cmd_doc"] = cmd
+  }
+
+  opts.on("-l", "--list", "list of documents available") do
+    Settings["cfg_dyn.cmd_doc"] = [:list]
+  end
+
+  opts.on("-j", "--jl", "import julia") do
+    Settings["cfg_dyn.langs"] << :jl
+  end
+
+  # opts.on("-r", "--remote", "pandoc or pdflatex (dyn)task performed remotely") do
+  #   Settings["cfg_dyn.remote_dyntask"] = true
+  # end
+
+  opts.on('-D','--debug','debug mode') do
+    Settings['cfg_dyn.debug']=true
+  end
+
+  opts.on('-R','--no_rb_only','no ruby only mode') do
+    Settings['cfg_dyn.ruby_only']=false
+  end
+
+  opts.on("-p", "--pandoc ", "filter for pandoc (tex2docx,...)") do |f|
+    #p [:pandoc,f]
+    Settings["cfg_dyn.pandoc_filter"] = f
+  end
+
+  # opts.on('--docker',"docker mode") do
+  #     Settings["cfg_dyn.docker_mode"]=true
+  # end
+
+end.parse!(args)
+
+## ARGV is consumed before except
+doc=args[0]
+
+doc += "_dyn.yml" unless doc =~ /_dyn.yml$/
+require 'yaml'
+require 'fileutils'
+
+cfg_yml=YAML::load_file(doc)
+
+doc =~ /^(.*)_dyn\.yml$/
+docname=$1
+
+unless cfg_yml["dyntask"]
+  #attempt to know if format is the simplified one for workflow
+  ks=cfg_yml.keys
+  cfg2={"dyntask" => "workflow", "params" => {"id" => ks[0], "workdir" => cfg_yml[ks[0]]}}
+  tasks={}
+  ks[1..-1].each do |t|
+    kt,*pt=cfg_yml[t].strip.split("\n")
+    wt,tn=kt.strip.split("->").map{|e| e.strip if e}
+    if tn
+      tasks[t]={"dyntask" => tn}
+      wt="init" if wt.empty?
+      tasks[t]["wait"]=wt
+      pt=YAML::load(pt.join("\n"))  
+      tasks[t]["params"]=pt
+    else
+      puts "Warning: task "+ t + " not considered because malformed"
+    end
+  end
+  cfg2["params"]["tasks"]=tasks
+  cfg_yml=cfg2
+end
+
+dyntaskname=cfg_yml["dyntask"]
+
+if dyntaskname
+  puts dyntaskname
+  dyntaskname += "_task.dyn" unless dyntaskname=~/_task.dyn$/
+  dyntaskpath=dyntaskname
+  is_dyntask=File.exists? dyntaskpath
+  unless is_dyntask
+    dyntaskpath=File.join(ENV["HOME"],"dyndoc","tasks",dyntaskname)
+    is_dyntask=File.exists? dyntaskpath
+  end
+  unless is_dyntask
+    share_path=File.expand_path("../../share", __FILE__)
+    dyntaskpath=File.join(share_path,"dyntasks",dyntaskname)
+    is_dyntask=File.exists? dyntaskpath
+  end
+	if is_dyntask
+		dynfile=docname+".dyn"
+    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
+
+		d=Dyndoc::TemplateDocument.new(dynfile)
+		d.make_all
+	end
+end

data/lib/dyndoc-convert.rb

@@ -18,6 +18,9 @@ module Dyndoc
     if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
       html_file = $1+".html"
     end
+    if html_file =~ /^(.*)_erb\.html$/
+      html_file = $1+".erb"
+    end
 
     if html_file and Dir.exist? File.dirname(html_file)
       File.open(html_file,"w") do |f|

data/lib/dyndoc-html-servers.rb

@@ -3,10 +3,10 @@ require 'pathname'
 require 'yaml'
 require 'filewatcher'
 
-if RUBY_VERSION >= "2.4"
+#if RUBY_VERSION >= "2.4"
   class FileWatcher < Filewatcher
   end
-end
+#end
 
 module Dyndoc
   module Browser
@@ -296,11 +296,19 @@ module Dyndoc
                 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
                 puts dyn_file[1..-1]+" 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

data/lib/dyndoc-linter.rb

@@ -20,6 +20,11 @@ module Dyndoc
           Dyndoc::Linter.simplify_dyndoc_tags(tags)
           break
         end
+        if (tags[i][1] == "{@"+tags[i+1][1][2..-2]+"]" and tags[i+1][1] == "[@"+tags[i][1][2..-2]+"}") or (tags[i][1][0]=="{" and tags[i+1][1]=="[@}")
+          tags.delete_at i+1;tags.delete_at i
+          Dyndoc::Linter.simplify_dyndoc_tags(tags)
+          break
+        end
       end
       return tags
     end

data/share/dyntasks/clean_task.dyn

@@ -0,0 +1 @@
+[#rb<]$params["files"].each {|f| system("rm "+f)}

data/share/dyntasks/pdflatex_task.dyn

@@ -0,0 +1 @@
+[#rb<]system("pdflatex "+$params['input'])

data/share/dyntasks/workflow_task.dyn

@@ -0,0 +1,82 @@
+[#%]Création de tâches à lancer en mode asynchone (mode synchrone comme un cas particulier)
+
+L'idée est :
+* de créer des fichiers _dyn.yml qui seront en charge de définir les tâches à exécuter en asynchrone
+* de créer en même temps le script bash pour effectivement lancer ces tâches
+* puis en fin de lancer le script de tâche qui sera exécuté dans un répertoire de travail associé au projet
+
+[#?]!(wd=$params["workdir"]).empty? [#%]Rien à faire si pas de workdir
+[#=]prj_id[:{$params["id"]}]
+[#<]
+
+{#def]waitfor[#,]task[][#,]cond[] [#,]cpt_max[20] [#,]lag[.5]
+[#rb<]
+prj=$params["id"]
+wait_cond=#{=cond}.split("&").map{|e| " [ ! -e " + prj + "-" + e.strip + ".task ]" }.join(" && ")
+[#>][
+waitfor_:{prj}_#{task}() {
+	local cpt="0"
+	echo "waiting for task #{task} in project :{prj}"
+	while :{wait_cond}  && [ $cpt != "#{cpt_max}" ]
+	do
+		sleep #{lag}
+		# echo -ne "."
+		cpt=$(($cpt+1))
+	done
+	#echo ""
+	if [ $cpt -eq  "#{cpt_max}" ]
+	then 
+		return 1
+	else 
+		return 0
+	fi
+}
+]
+[#def}
+
+[#rb<]
+require 'yaml'
+cfg_yml = File.join(Dyndoc.home,"etc","dyn-html.yml")
+dynworld_root=cfg_yml["dynworld_root"] || File.join(ENV["HOME"],".dyndoc-world")
+wd=File.join(dynworld_root,wd) 
+
+FileUtils.rm_rf wd if Dir.exist? wd
+FileUtils.mkdir_p wd
+shscript=""
+prj_id=#{=prj_id}
+# Creation of dyn tasks (_dyn.yml files)
+tasks=$params["tasks"]
+#p [:tasks,tasks.keys]
+## shell fcts
+tasks.keys.each do |task| #
+	## puts "task: "+task+"\n"
+	task_id = (task[-1,1]==">" ? task[0..-2] : task)
+	task_cond=tasks[task]["wait"]
+	{#<][#rb<]
+	|shscript << %Q(
+	|{#waitfor]:{task_id}[#cond]:{task_cond}[#}
+	|)
+	[#<}
+end
+## shell script
+shscript << "cd " + wd + "\n"
+tasks.keys.each do |task| #
+	## puts "task: "+task+"\n"
+	task_id = (task[-1,1]==">" ? task[0..-2] : task)
+	task_yml = File.join(wd,prj_id+"-"+task_id+"_dyn.yml")
+	puts "Creating "+task_yml+"\n"
+	begin
+		dyntask=(tasks[task].is_a? String) ? tasks[tasks[task]] : tasks[task]
+		dyntask=dyntask.select{|k| ["dyntask","params"].include? k}
+		#p [:dyntask,dyntask,dyntask.empty?]
+		File.open(task_yml,"w") {|f| f << dyntask.to_yaml } unless dyntask.empty?
+	rescue
+		puts "Task not created\n"
+	end
+	shscript << "{ waitfor_" << prj_id << "_" << task_id  << " && dyn-yml " << ( task_id[0,1] == task_id[0,1].upcase ? "-R " : "") << ( task_id == task ? "" : "-w ") <<  prj_id << "-" << task_id << "_dyn.yml " << "&& touch " << prj_id << "-" << task_id <<  ".task; } &\n"
+end
+shscript << "touch "+ prj_id + "-init.task\n"
+#p [:script,shscript]
+File.open(File.join(wd,"task.sh"),"w") {|f| f << shscript}
+Process.spawn(". " +File.join(wd,"task.sh"))
+[#?]end

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

@@ -10,6 +10,12 @@ 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
 
 class App < Roda
   use Rack::Session::Cookie, :secret => (secret="Thanks like!")
@@ -20,12 +26,14 @@ class App < Roda
   plugin :multi_route
   ###Dir[File.expand_path("../routes/*.rb",__FILE__)].each{|f| require f}
   plugin :header_matchers
+  plugin :json
+  plugin :json_parser
   plugin :render,
-    :views => File.expand_path("../views",__FILE__),
+    :views => File.join($public_root,"views"),
     :escape=>true,
     :check_paths=>true,
-    :allowed_paths=>[File.expand_path("../views",__FILE__),$public_root]
-
+    :allowed_paths=>[File.join($public_root,"views"),$public_root]
+  plugin :route_csrf
   route do |r|
 
     # GET / request
@@ -33,6 +41,56 @@ class App < Roda
       r.redirect "/hello"
     end
 
+    r.on "dynworld" do
+
+      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]
+        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
+          end
+        end
+        "{success: " + success.to_s + "}"
+      end
+
+      r.post "file-upload" do
+        uploaded_io = r[:file]
+        ##
+        p [:uploaded_io, uploaded_io]
+        @upload_dir=r["upload_dir"]
+        p [:file_upload_dir,@upload_dir]
+        # FileUtils.mkdir_p File.join(@upload_dir_root,@upload_dir)
+        # uploaded_io[:filename].gsub("'","_") if uploaded_io[:filename].include? "'"
+        # File.open(File.join(@upload_dir_root,@upload_dir, uploaded_io[:filename]), 'wb') do |file|
+        #   file.write(uploaded_io[:tempfile].read)
+        # end
+        "{success: true}"
+      end
+  
+      r.post "file-delete" do
+        @upload_dir=r["upload_dir"]
+        p @upload_dir
+        # deleted_file=File.join(@upload_dir_root,@upload_dir,r[:file_name])
+        # ##p deleted_file
+        # FileUtils.rm(deleted_file)
+        "{success: true}"
+      end
+
+    end
+
     #r.multi_route
 
     # /hello branch
@@ -78,22 +136,57 @@ class App < Roda
 =end
 
     r.get do
+      check_csrf!
       page=r.remaining_path
+      p [:captures,r.remaining_path,r.captures,r.scope,r.params]
       static_root=File.join($public_root,"pages")
+  
+      ## Added for erb 
+      is_erb = (page[0...4] == "/erb")
+      if is_erb
+        page=page[4..-1] 
+        @params=r.params
+      end
+
+      ## Added to protect page
+      @protect = "no"
+      if (page[0...8] == "/protect")
+        page=page[8..-1]
+        if page =~ /^\/([^\/]*)\/(.*)$/
+          @protect, page = $1, '/' + $2
+        end
+        p [:protect, @protect, page]
+      end
+      
       ##p [:page,File.join(static_root,"**",page+".html")]
-      pattern=(page=~/[^\.]*\.(?:R|Rmd|css|js|htm|html|rb|red|r|jpeg|jpg|png|gif|pdf)/) ? page : page+".html"
+      
+      pattern=(page=~/[^\.]*\.(?:R|Rmd|css|js|htm|html|rb|red|r|jpeg|jpg|png|gif|pdf)/) ? page : page+(is_erb ? ".erb" : ".html")
+      
       html_files=Dir[File.join(static_root,"**",pattern)]
+      html_files=Dir[File.join(static_root,"*","**",pattern)] if html_files.empty?
 
       ## try index.html in directory
       html_files=Dir[File.join(static_root,"**",page,"index.html")] if html_files.empty?
+      html_files=Dir[File.join(static_root,"*","**",page,"index.html")] if html_files.empty?
+
+      ##DEBUG:
+      # a=File.join(static_root,"**",page,"index.html")
+      # p [a,Dir[a]]
+      # a=File.join(static_root,"*","**",page,"index.html")
+      # p [a,Dir[a]]
+
+      ##DEBUG: p html_files
 
-      ##p html_files
       unless html_files.empty?
         html_file="pages/"+Pathname(html_files[0]).relative_path_from(Pathname(static_root)).to_s
-        if File.extname(html_file) == ".html"
-          html_file=File.join(File.dirname(html_file),File.basename(html_file,".html"))
+        if [".html",".erb"].include? (html_file_ext=File.extname(html_file))
+          html_file=File.join(File.dirname(html_file),File.basename(html_file,html_file_ext))
           p html_file
-          render html_file, :engine=>'html', :views=>$public_root
+          if is_erb
+            erb_yml=File.join($public_root,html_file+"_erb.yml")
+            @cfg_erb=(File.exists? erb_yml) ? YAML::load_file(erb_yml) : {}
+          end
+          render html_file, :engine=> (is_erb ? "erb" : 'html'), :views=>$public_root
         else
           r.redirect html_file
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.2.1
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dyndoc-ruby-core
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dyndoc-ruby-doc
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +67,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dyndoc-ruby-exec
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +77,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,10 +87,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.3
@@ -77,6 +104,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.3
@@ -84,6 +114,9 @@ dependencies:
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.4
@@ -91,6 +124,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.4
@@ -98,20 +134,29 @@ dependencies:
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: foreverb
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.3
@@ -119,6 +164,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.3
@@ -137,6 +185,7 @@ executables:
 - dyn-auto
 - dyn-ctl
 - dyn-4ever
+- dyn-yml
 extensions: []
 extra_rdoc_files: []
 files:
@@ -152,6 +201,8 @@ files:
 - bin/dyn-lint
 - bin/dyn-scan
 - bin/dyn-srv
+- bin/dyn-x
+- bin/dyn-yml
 - install/README.md
 - install/dyn-upstart.sh
 - install/dyndoc_install_ubuntu.sh
@@ -173,6 +224,9 @@ files:
 - share/demo/test_atom.dyn
 - share/dyndoc.yml/README.md
 - share/dyndoc.yml/example.dyndoc.yml
+- share/dyntasks/clean_task.dyn
+- share/dyntasks/pdflatex_task.dyn
+- share/dyntasks/workflow_task.dyn
 - share/etc/alias
 - share/etc/dyn-cli/dyn_layout
 - share/etc/dyn-cli/layout/default.dyn
@@ -429,7 +483,7 @@ files:
 homepage: http://cqls.upmf-grenoble.fr
 licenses:
 - MIT
-- GPL-2
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -447,8 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: R and Ruby in text document