dyndoc-ruby 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ead83e394d38dcc18626162ada3e9fc5077d1e5673a6992227811bfda153fd5
-  data.tar.gz: be7ce6c24f93febcfddf6822aaf30e4dad4978cbbc8e88e47c02d6902cff525e
+  metadata.gz: 874ff2bfd3cfd0a3cbc30680e7ddadb68be8a3c417d85582e05c699855a96cec
+  data.tar.gz: c47643d6023b0c525a23944127f578eb4c519cc19d35302deb7fdc4724f248f7
 SHA512:
-  metadata.gz: 924604a6f99dd1fc71ec45c2fb7d062b4564ae569bc8d6328ddbf2ae7e1ed88326aa607e8e62f7ba99f95ed68cef0e46732bcbc9468d8caa5ffa0b3abf039524
-  data.tar.gz: 015316465d1ac2db277a1390e4566a525e5005fdb45b9ea333e89b61014a8f870cdc6305a8301772bf5c8a70e5f0634704410fc26068f365fdd3da5c6356842d
+  metadata.gz: 43fc0de9ab39f1dbee93acd2d3bedc272b21b154227dfe5a3c2c943816ae3f23a0e1b8372b2fd773181c5bd033d022d681900baf88c3c1ab64d686ca8ad698ad
+  data.tar.gz: 0ead492497f229e9b37b04196336e3910db2611c1af3bd9d8fcf23a2943c7703b3e9def436ede1b3c0753e32670931dd7c0bc08bbb7eda3db40b3c39abbbd301

data/bin/dyn-rebase-url

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+cur=0
+opts={mode: :default, to: ""}
+
+##p ARGV
+
+while ["--dir","--mode","--from","--to","--help","--ext"].include? ARGV[cur]
+  ##p [:cur,ARGV[cur]]
+  case ARGV[cur]
+  when "--dir","--help"
+    opts[ARGV[cur].to_sym]=true
+    cur += 1
+  when "--mode"
+    opts[:mode]==ARGV[cur+1].to_sym if ["default","href"].include? ARGV[cur+1]
+    cur += 2
+  when "--from","--to"
+    opts[ARGV[cur][2..-1].to_sym]=ARGV[cur+1]
+    cur += 2
+  when "--ext"
+    opts[ARGV[cur].to_sym]=ARGV[cur+1]
+    cur += 2
+  end
+end
+
+file=ARGV[cur]
+opts[:help]=true unless file
+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]
+  ##p files
+  ##p opts
+  files.each do |filename|
+    content=File.read(filename)
+    File.open(filename,"w") do |f|
+      case opts[:mode]
+      when :href
+        f << content.gsub(/\ href="#{opts[:from]}/," href=\""+opts[:to])
+      else
+        f << content.gsub(/#{opts[:from]}/,opts[:to])
+      end
+    end
+  end
+end

data/bin/dyn-site

@@ -0,0 +1,7 @@
+#!/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?

data/lib/dyndoc-html-servers.rb

@@ -228,7 +228,10 @@ module Dyndoc
 
     def HtmlServers.dyn_http_server(host=nil,port=nil)
       require 'thin'
-      dyn_html_srv_ru=File.expand_path("../../share/html-srv/dyn-html-srv.ru",__FILE__)
+      dyn_html_srv_ru="/home/ubuntu/tools/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
+      
       arg=["-R",dyn_html_srv_ru]
       if HtmlServers.cfg["html-srv-port"]
         arg += ["-p",HtmlServers.cfg["html-srv-port"].to_s]
@@ -270,10 +273,11 @@ module Dyndoc
         user: nil #current_email
       }
 
-      puts "watching "+ dyn_root+ " and " + dyn_public_edit_root
+      puts "watching "+ dyn_public_edit_root + " and " + dyn_root
       old_html_file=""
-      ::FileWatcher.new([dyn_root,dyn_public_edit_root]).watch() do |filename, event|
-        ##p [:filename,filename,event]
+      ::FileWatcher.new([dyn_public_edit_root,dyn_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]
           if (lint_error=Dyndoc::Linter.check_file(filename)).empty?
@@ -304,27 +308,40 @@ module Dyndoc
 
                 html_file=opts[:html_files][opts[:current_doc_tag]] # No more default # || html_files[""]
                 ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
-                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"
+                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
+                  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
+                    url=File.join(base_url,html_file)
+                    ## p [:url,url]
+                    Dyndoc::Browser.load(url)
+                  else
+                    Dyndoc::Browser.reload
+                  end
+                rescue
+                  state="error: "
+                ensure
+                  notify_file=filename.split("/")
+                  if (ind=notify_file.index ".edit")
+                    notify_file=notify_file[0..ind].join("/")
+                    File.open(notify_file+"/notify.out","w") do |f|
+                      f << state + filename
+                    end
                   end
-                  html_file = "erb"+$1
-                end
-                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
-                  url=File.join(base_url,html_file)
-                  ## p [:url,url]
-                  Dyndoc::Browser.load(url)
-                else
-                  Dyndoc::Browser.reload
                 end
               end
             end

data/lib/dyndoc-tasks.rb

@@ -83,6 +83,10 @@ def DyndocTasks.dyn_yml(doc)
 		dyntaskname += "_task.dyn" unless dyntaskname=~/_task.dyn$/
 		dyntaskpath=dyntaskname
 		is_dyntask=File.exists? dyntaskpath
+		unless is_dyntask
+			dyntaskpath=File.join(ENV["HOME"],".dyndoc-world","tasks",dyntaskname)
+			is_dyntask=File.exists? dyntaskpath
+		end
 		unless is_dyntask
 			dyntaskpath=File.join(ENV["HOME"],"dyndoc","tasks",dyntaskname)
 			is_dyntask=File.exists? dyntaskpath

data/lib/dyndoc-world.rb

@@ -0,0 +1,75 @@
+require 'yaml'
+
+module DyndocWorld
+
+	@@root=nil
+	@@public=nil
+
+	def DyndocWorld.root(root=nil)
+		@@root=root if root
+		return @@root
+	end
+
+	def DyndocWorld.public_root(public_root=nil)
+		@@public=public_root if public_root
+		return @@public
+	end
+
+	def DyndocWorld.cfg(admin=nil)
+		cfg={}
+		secret = File.join(DyndocWorld.root,admin ? ".admin.yml" : ".secret.yml")
+		cfg = YAML::load_file(secret) if DyndocWorld.root and File.exists? secret
+		return cfg
+	end
+
+	## 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)
+		admin=(prj=="admin")
+		cfg=DyndocWorld.cfg(admin)
+		cfg=cfg[prj] unless admin
+		return true unless cfg
+		##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? "../"))
+	end
+
+	## file ##
+	## from yml
+	## 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
+		end
+		return success
+	end
+end

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

@@ -10,12 +10,10 @@ 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
+
+require 'dyndoc-world'
+DyndocWorld.root(cfg["dynworld_root"] || File.join(ENV["HOME"],".dyndoc-world"))
+DyndocWorld.public_root($public_root)
 
 class App < Roda
   use Rack::Session::Cookie, :secret => (secret="Thanks like!")
@@ -45,24 +43,19 @@ class App < Roda
 
       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]
+        prj,yml,@content=r['prj'].strip,r['yml'].strip,r['content']
+        p [prj,yml,@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
+          if DyndocWorld.yml?(prj,yml)
+            success=DyndocWorld.prj_file(yml,@content)
           end
         end
+        p [:success, "{success: " + success.to_s + "}"]
         "{success: " + success.to_s + "}"
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -187,6 +187,8 @@ executables:
 - dyn-ctl
 - dyn-4ever
 - dyn-yml
+- dyn-rebase-url
+- dyn-site
 extensions: []
 extra_rdoc_files: []
 files:
@@ -200,7 +202,9 @@ files:
 - bin/dyn-http
 - bin/dyn-init
 - bin/dyn-lint
+- bin/dyn-rebase-url
 - bin/dyn-scan
+- bin/dyn-site
 - bin/dyn-srv
 - bin/dyn-task
 - bin/dyn-x
@@ -213,6 +217,7 @@ files:
 - lib/dyndoc-html-servers.rb
 - lib/dyndoc-linter.rb
 - lib/dyndoc-tasks.rb
+- lib/dyndoc-world.rb
 - lib/dyndoc/cli/interactive-client.rb
 - lib/dyndoc/srv/interactive-server.rb
 - lib/dyndoc/srv/tilt.rb