dyndoc-ruby 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fb3f2c7f43257295393916babc73a24a01b5be83f2497be40f4d6516fc0a8e3
-  data.tar.gz: 8a3d7d4ea1676d9192213b5062a7a25b80c8063c236e10d15378276bf5388ac8
+  metadata.gz: 9ead83e394d38dcc18626162ada3e9fc5077d1e5673a6992227811bfda153fd5
+  data.tar.gz: be7ce6c24f93febcfddf6822aaf30e4dad4978cbbc8e88e47c02d6902cff525e
 SHA512:
-  metadata.gz: 925f6d28081d121501344010bdcda7bbe71fbff2d412ed42673952aae9ef0a91bd0f539323316cf324b5f7e30464e71c879bd5f6939070c4290f75ff94b21b59
-  data.tar.gz: a5754bd8233d1b94ad5073bf1c69e28d62f7de77176a44b0c3353ac579d68a807762ac4437866b0fef71fef0cb66c73401a0a49c81e10d03336f3701042d5e20
+  metadata.gz: 924604a6f99dd1fc71ec45c2fb7d062b4564ae569bc8d6328ddbf2ae7e1ed88326aa607e8e62f7ba99f95ed68cef0e46732bcbc9468d8caa5ffa0b3abf039524
+  data.tar.gz: 015316465d1ac2db277a1390e4566a525e5005fdb45b9ea333e89b61014a8f870cdc6305a8301772bf5c8a70e5f0634704410fc26068f365fdd3da5c6356842d

data/bin/dyn-ctl

@@ -2,7 +2,7 @@
 
 require 'fileutils'
 
-SRVS=["dyn-srv","dyn-html","dyn-http"]
+SRVS=["dyn-srv","dyn-html","dyn-http","dyn-task"]
 CMD="dyn-ctl"
 DYNCTL_PLIST=File.expand_path("~/Library/LaunchAgents/local.dyn-ctl.plist")
 

data/bin/dyn-task

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'dyndoc-tasks'
+
+if ["--no-forever","--no-daemon"].include? ARGV[0]
+  cfg={}
+  cfg[:dyntasks_root]=ARGV[1] if ARGV[1]
+  DyndocTasks::filewatcher(cfg)
+else
+  require 'daemons'
+  require 'dyndoc/init/home'
+  require 'fileutils'
+
+  dir_pids=File.join(Dyndoc.home,"pids")
+  FileUtils.mkdir_p dir_pids
+  Daemons.run_proc('dyn-task',{dir: dir_pids}) do
+      DyndocTasks::filewatcher
+  end
+
+end

data/bin/dyn-yml

@@ -98,84 +98,84 @@ end.parse!(args)
 doc=args[0]
 
 doc += "_dyn.yml" unless doc =~ /_dyn.yml$/
-require 'yaml'
-require 'fileutils'
-
-doc =~ /^(.*)_dyn\.yml$/
-docname=$1
-
-cfg_lines=File.readlines(doc)
-i=0
-i += 1 if cfg_lines[i][0,3] == "---"
-
-if cfg_lines[i][0,9] == "dyntask: "
-  ## regular _dyn.yml file
-  cfg_yml=YAML::load(cfg_lines.join("\n"))
-else
-  cfg_txt =  cfg_lines[0..i].join("\n")
-  cfg_lines[(i+1)..-1].each do |line|
-    if line[0,2] == "  "
-      cfg_txt << line
-    else
-      tn,td=line.split(":")
-      cfg_txt << tn.strip << ": |\n"
-      cfg_txt << "  " << td.strip << "\n"
-    end
-  end
-  puts "ici\n"
-  puts cfg_txt
-  cfg_yml=YAML::load(cfg_txt.strip)
-end
-
-
-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
+
+require 'dyndoc-tasks'
+
+DyndocTasks.dyn_yml doc
+
+# require 'yaml'
+# require 'fileutils'
+
+# cfg_lines=File.readlines(doc)
+# i=0
+# i += 1 if cfg_lines[i][0,3] == "---"
+
+# if cfg_lines[i][0,9] == "dyntask: "
+#   ## regular _dyn.yml file
+#   cfg_yml=YAML::load(cfg_lines.join("\n"))
+# else
+#   cfg_txt =  cfg_lines[0..i].join("\n")
+#   cfg_lines[(i+1)..-1].each do |line|
+#     if line[0,2] == "  "
+#       cfg_txt << line
+#     else
+#       tn,td=line.split(":")
+#       cfg_txt << tn.strip << ": |\n"
+#       cfg_txt << "  " << td.strip << "\n"
+#     end
+#   end
+#   cfg_yml=YAML::load(cfg_txt.strip)
+# end
+
+
+# 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-html-servers.rb

@@ -255,8 +255,9 @@ module Dyndoc
       options={first: true}
       ## To put inside yaml config file!
       root ||= cfg["root"] || HtmlServers.cfg["root"] || File.join(ENV["HOME"],"RCqls","RodaServer")
-      dyn_root = cfg["dyn_root"] || HtmlServers.cfg["dyn_root"] || File.join(root ,"edit")
+      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
@@ -269,9 +270,9 @@ module Dyndoc
         user: nil #current_email
       }
 
-      puts "watching "+ dyn_root
+      puts "watching "+ dyn_root+ " and " + dyn_public_edit_root
       old_html_file=""
-      ::FileWatcher.new(dyn_root).watch() do |filename, event|
+      ::FileWatcher.new([dyn_root,dyn_public_edit_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]
@@ -279,7 +280,19 @@ module Dyndoc
             ## do not process preload, postload, lib and layout files
             unless filename =~ /(?:_pre|_post|_lib|_layout)\.dyn$/
               ## find dyn_file (relative path from root)
-              dyn_file="/"+Pathname(filename).relative_path_from(Pathname(dyn_root)).to_s
+              dyn_public_edit_file=""
+              dyn_file=Pathname(filename).relative_path_from(Pathname(dyn_root)).to_s
+              if dyn_file[0,2] == '..' # try the public_root
+                dyn_public_edit_file=Pathname(filename).relative_path_from(Pathname(public_root)).to_s
+                dyn_public_edit_file=dyn_public_edit_file.split("/")
+                if dyn_public_edit_file[0]=="users" and dyn_public_edit_file[2]==".edit"
+                  dyn_file="/"+File.join(dyn_public_edit_file[1],dyn_public_edit_file[3..-1])
+                  dyn_public_edit_file=dyn_public_edit_file.join("/")
+                end
+              else
+                dyn_file="/"+dyn_file
+              end
+              
               unless HtmlServers.unwatched?(dyn_file[1..-1]).empty?
                 if RUBY_PLATFORM =~ /darwin/
                   `osascript -e 'display notification "Warning: #{dyn_file} unwatched by #{HtmlServers.unwatched?(dyn_file[1..-1])}!" with title "dyn-ctl unwatch"'`
@@ -303,7 +316,7 @@ module Dyndoc
                   end
                   html_file = "erb"+$1
                 end
-                puts dyn_file[1..-1]+" processed => "+html_file+" created!"
+                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

data/lib/dyndoc-tasks.rb

@@ -0,0 +1,130 @@
+require 'filewatcher'
+#if RUBY_VERSION >= "2.4"
+class FileWatcher < Filewatcher
+end
+#end
+
+
+module DyndocTasks
+
+def DyndocTasks.dyn_yml(doc)
+
+	require 'yaml'
+	require 'fileutils'
+
+	doc =~ /^(.*)_dyn\.yml$/
+	docname=$1
+
+	cfg_lines=File.readlines(doc)
+	i=0
+	i += 1 if cfg_lines[i][0,3] == "---"
+
+	if cfg_lines[i][0,9] == "dyntask: "
+		## regular _dyn.yml file
+		cfg_yml=YAML::load(cfg_lines.join(""))
+	else
+		cfg_txt =  cfg_lines[0..i].join("\n")
+		## deal with possible common params
+		cfg_common=""
+		while cfg_lines[i+1][0,2] == "  "
+			i += 1
+			cfg_common << cfg_lines[i]
+		end
+		unless cfg_common.empty?
+			cfg_txt << "common:\n" << cfg_common
+		end
+		## deal with tasks
+		cfg_lines[(i+1)..-1].each do |line|
+			if line[0,2] == "  "
+			cfg_txt << line
+			else
+			tn,td=line.split(":")
+			cfg_txt << tn.strip << ": |\n"
+			cfg_txt << "  " << td.strip << "\n"
+			end
+		end
+		##DEBUG: puts cfg_txt.strip
+		cfg_yml=YAML::load(cfg_txt.strip)
+	end
+
+
+	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={}
+		i=1
+		if ks[1] == "common"
+			i+=1
+			cfg2["params"]["params"]=cfg_yml["common"] # common params for tasks
+		end
+		ks[i..-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
+		##DEBUG: p [:cfg_yml,cfg_yml]
+		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
+end
+
+def DyndocTasks.filewatcher(cfg={}) #cfg
+	require 'dyndoc/document'
+
+	Settings['cfg_dyn.ruby_only']=true
+	Settings["cfg_dyn.model_doc"] = "Content"
+	Settings["cfg_dyn.exec_mode"] = "yes"
+
+	require 'dyndoc-linter'
+
+	dyntasks_root=cfg["dyntasks_root"] || File.join(ENV["HOME"],".dyndoc-world","reactzone")
+
+	puts "watching tasks inside "+ dyntasks_root
+	::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
+	  end
+	end
+end
+end

data/share/dyntasks/workflow_task.dyn

@@ -46,6 +46,7 @@ shscript=""
 prj_id=#{=prj_id}
 # Creation of dyn tasks (_dyn.yml files)
 tasks=$params["tasks"]
+common_params=$params["params"]
 #p [:tasks,tasks.keys]
 ## shell fcts
 tasks.keys.each do |task| #
@@ -69,6 +70,9 @@ tasks.keys.each do |task| #
 		dyntask=(tasks[task].is_a? String) ? tasks[tasks[task]] : tasks[task]
 		dyntask=dyntask.select{|k| ["dyntask","params"].include? k}
 		#p [:dyntask,dyntask,dyntask.empty?]
+		if common_params
+			dyntask["params"] = common_params.dup.merge dyntask["params"]
+		end
 		File.open(task_yml,"w") {|f| f << dyntask.to_yaml } unless dyntask.empty?
 	rescue
 		puts "Task not created\n"

data/share/etc/systemd/dyn-task.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Dyndoc Task service
+
+[Service]
+User=conf
+ExecStart=/usr/local/bin/dyn-task run
+Restart=on-failure
+SuccessExitStatus=3 4
+RestartForceExitStatus=3 4
+
+[Install]
+WantedBy=default.target

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -178,6 +178,7 @@ executables:
 - dpm
 - dyn-html
 - dyn-http
+- dyn-task
 - dyn-init
 - dyn-scan
 - dyn-lint
@@ -201,6 +202,7 @@ files:
 - bin/dyn-lint
 - bin/dyn-scan
 - bin/dyn-srv
+- bin/dyn-task
 - bin/dyn-x
 - bin/dyn-yml
 - install/README.md
@@ -210,6 +212,7 @@ files:
 - lib/dyndoc-edit.rb
 - lib/dyndoc-html-servers.rb
 - lib/dyndoc-linter.rb
+- lib/dyndoc-tasks.rb
 - lib/dyndoc/cli/interactive-client.rb
 - lib/dyndoc/srv/interactive-server.rb
 - lib/dyndoc/srv/tilt.rb
@@ -236,6 +239,7 @@ files:
 - share/etc/systemd/dyn-html.service
 - share/etc/systemd/dyn-http.service
 - share/etc/systemd/dyn-srv.service
+- share/etc/systemd/dyn-task.service
 - share/etc/uv/render/README
 - share/etc/uv/render/latex/-h.yaml
 - share/etc/uv/render/latex/active4d.render