dyndoc-ruby 1.4.2 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb2f3e831ea517eaff9fc31d345306051d56fb4c2a8c501ffd6e57cacb7e31b1
-  data.tar.gz: 0002b697759d5ada6085ef5ab02040e0e9c83bf19c864fb250ea210382ec5be1
+  metadata.gz: d255842b28ec56165e4afeaa4365023f907564018686c100ddaaa51a5da082d8
+  data.tar.gz: 0cfcbc668b436f90246754c516b2c6fe3ab7c8db9a1c0fa25f308fafbb994440
 SHA512:
-  metadata.gz: ecc7fef24adac129da5b2fe4753d183f62fdbbf31ba4638d2da20e5dbad11d423dc54f329b3caa9b8229985f1e87567e544c3a81530e777f052acc0192b88c3f
-  data.tar.gz: 2169eb881e4d9a25fea6b3d7fd1ce8b791c5708d6c1e6e8ab66c22fb68f2f6c6fea5b442cf3f3e7d11fc60fd0058331650fc5ce5cdb948fe00b1ee4e20f1059c
+  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

@@ -229,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
       
@@ -275,7 +276,7 @@ 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")

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.5
 platform: ruby
 authors:
 - RCqls
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -493,7 +493,7 @@ licenses:
 - MIT
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -510,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: []