dyndoc-ruby 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42fea0e78789262abc853bd7b2b328216b2a5f025a7dfcd161c367d57ceb23d
-  data.tar.gz: b30acf3518b75e7449c85f6a886e7f7b02ddc1fb61054726ba329ee524f3a70b
+  metadata.gz: de8974d835f1c28fe519e9dcad144c6df472418b1722e64c1170024a297463fb
+  data.tar.gz: 729c42dcf5a03ba6b23230547b48be9a184861fabb0b16445aafde9a2677e7ec
 SHA512:
-  metadata.gz: 7b0c2d715135a5f40309b679b2dd4e40cbfeb51b38672afeb1015b805693a77085f52ddd1a4ff0ab5511f970fbb161fcc0f74485fb8522dc07d62bfe324712ec
-  data.tar.gz: 1d2b63f650ac19af353cf70f1637e76c96b232234c2f9ccaaaf5f872f53b1eaf9b4066e665f0f80d33f4ed07b38582071a4b6692f4d0a34088f6196ebad123ae
+  metadata.gz: 89fa832cd2e117b83373e5b2b40c18cd106034a7235cceceaa3f6c33ac417419814338ca7e8a66b94bfacda69b696a2fd4621cce847008559bd7cdb4614c57a5
+  data.tar.gz: 1ee53e1c3a5e452c2131591309c6cf2260f2474d8a679ee174b91c2dc957f30bc1c9433972f9ff7ed68e7d98fe6006af4acd1638adc1b7edb0d5aab33ca5e493

data/bin/dyn

@@ -78,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-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-yml

@@ -15,6 +15,13 @@ args=ARGV.select{|name|
 
 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|
@@ -34,9 +41,9 @@ OptionParser.new do |opts|
     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"
+  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|
@@ -72,6 +79,10 @@ OptionParser.new do |opts|
     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
@@ -92,14 +103,52 @@ require 'fileutils'
 
 cfg_yml=YAML::load_file(doc)
 
-doc =~ /^(.*)_dyn.yml$/
+doc =~ /^(.*)_dyn\.yml$/
 docname=$1
 
-if dyntaskname=cfg_yml["dyntask"]
-	puts dyntaskname
-	if File.exists? dyntaskname
+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 dyntaskname, dynfile
+    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

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!")
@@ -35,16 +41,54 @@ class App < Roda
       r.redirect "/hello"
     end
 
-    r.post "dyndoc-yml" do
-      puts "dyndoc-yml"
-      @yml,@content=r['yml'],r['content']
-      p [@yml,@content]
-      require 'fileutils'
-      if @yml
-        dynappsdir=File.join(ENV["HOME"],".dyndoc-apps")
-        File.open(File.join(dynappsdir,@yml),"w") {|f| f << @content.strip} if Dir.exists? dynappsdir
+    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.redirect "/hello"
+
+      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
@@ -91,33 +135,6 @@ class App < Roda
     end
 =end
 
-    r.on "dropzone" do
-
-      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.get do
       check_csrf!
       page=r.remaining_path
@@ -132,13 +149,13 @@ class App < Roda
       end
 
       ## Added to protect page
-      protect = nil
+      @protect = "no"
       if (page[0...8] == "/protect")
         page=page[8..-1]
         if page =~ /^\/([^\/]*)\/(.*)$/
-          protect, page = $1, '/' + $2
+          @protect, page = $1, '/' + $2
         end
-        p [:protect, protect, page]
+        p [:protect, @protect, page]
       end
       
       ##p [:page,File.join(static_root,"**",page+".html")]

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !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
@@ -224,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
@@ -498,8 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: R and Ruby in text document