dyndoc-ruby 1.4.0 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874ff2bfd3cfd0a3cbc30680e7ddadb68be8a3c417d85582e05c699855a96cec
-  data.tar.gz: c47643d6023b0c525a23944127f578eb4c519cc19d35302deb7fdc4724f248f7
+  metadata.gz: 8ca881ea3393dc076e5e9c0906d7b1b6ada9e7e137ed7b51c6e2747d87e0eab5
+  data.tar.gz: 0d70c629074f76cffc709ead2f8672676f5f301c63addca578307ed7656ddca0
 SHA512:
-  metadata.gz: 43fc0de9ab39f1dbee93acd2d3bedc272b21b154227dfe5a3c2c943816ae3f23a0e1b8372b2fd773181c5bd033d022d681900baf88c3c1ab64d686ca8ad698ad
-  data.tar.gz: 0ead492497f229e9b37b04196336e3910db2611c1af3bd9d8fcf23a2943c7703b3e9def436ede1b3c0753e32670931dd7c0bc08bbb7eda3db40b3c39abbbd301
+  metadata.gz: 057d227514732b85c02080275d55fae7c1523c93df7e397ba6d559709cbdce21e17c46770fbf4a3370fb78e76ec6ab710fbaddb9d903031f41cc444340833751
+  data.tar.gz: 6f0723b13c1f65ca9fd028b18c05d312a9f0459c571ab191a6c8043059f5c3b88b176bffff10eb7a28f7c93f4f1e4823b835f9b5c6ae0518555ac48212204044

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/bin/dyn-rebase-url

@@ -29,7 +29,7 @@ if opts[:help]
   puts "rebase_url [--dir] [--from <from_path>] [--to <to_path>] [--ext <extension>] file"
 else
   ext=opts[:ext] ? "."+opts[:ext]  : ""
-  files=opts[:dir] ? Dir[File.join(file,"*"+ext)] : [file]
+  files=opts[:"--dir"] ? Dir[File.join(file,"*"+ext)] : [file]
   ##p files
   ##p opts
   files.each do |filename|

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/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,7 +229,8 @@ module Dyndoc
 
     def HtmlServers.dyn_http_server(host=nil,port=nil)
       require 'thin'
-      dyn_html_srv_ru="/home/ubuntu/tools/dyn-html/srv.ru" # DyndocDockerSite guest-tools folder
+      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
       
@@ -236,7 +238,7 @@ module Dyndoc
       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]
@@ -248,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'
@@ -257,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 = {
@@ -310,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
@@ -332,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

@@ -25,13 +25,37 @@ module DyndocWorld
 	## 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)
+	def DyndocWorld.prj_file?(yml)
+		prj=yml["prj"] || yml["project"] || "default" 
 		admin=(prj=="admin")
 		cfg=DyndocWorld.cfg(admin)
 		cfg=cfg[prj] unless admin
-		return true unless cfg
+		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? "../"))]
-		return (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 ##
@@ -39,37 +63,19 @@ module DyndocWorld
 	## 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
+	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 success
+		return res
 	end
 end

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.6
 platform: ruby
 authors:
 - RCqls
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2021-09-11 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.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: dyndoc-ruby-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: dyndoc-ruby-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: dyndoc-ruby-exec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -494,7 +493,7 @@ licenses:
 - MIT
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -510,8 +509,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.22
+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?