dyndoc-ruby 1.3.4 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec509c1bb4aa90c2960546ea660bb8c1b734d84e090cb7892738f4ec812972d
-  data.tar.gz: c58112a3f6326a0c2421058ca28df3fbbe286d3a8766859a9b3fecdd30ff57c4
+  metadata.gz: 1429abd256e9d0441df24744231a62ae8129a5274c3e8de413e700a81dfdc917
+  data.tar.gz: 21e08fa73d544abf8618461df13e40cdfc333a542e4c71185ae301ad12784ea7
 SHA512:
-  metadata.gz: '045482d13e19620b809a07c60d27e2b0e20d55f97406d19aca29545b85d4b21d9bd7d69f28abb9eced64a93ead570a4546d57c2f4032fc7c39b930bc0f17904a'
-  data.tar.gz: 722057d19ff0d07762b5c6fffd8a5abf61405f63c3a2757f8592c41ffff023eaaea1806baaa0eb1835090c3b200fd8f13b19c93009427327c926ad24e60ba1a2
+  metadata.gz: 1a02a9276665a3302bea5445e7d7b1f2b1129ae62ca5409464afc25180254ebf053046298cac9f46130a8e4b1d8ac282f5ddf01dd93066d29905942d8f1d534a
+  data.tar.gz: 3953bd8ce467a7e6dc5306085e0062152571af478634e3404eb057da0211d8d726091e88bf57e15ae0c3e854deeecef445c0d7c38df34f9f0fa5640f961e21b1

data/lib/dyndoc-html-servers.rb

@@ -305,27 +305,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-world.rb

@@ -0,0 +1,11 @@
+module DyndocWorld
+
+	def DyndocWorld.yml?(prj,yml)
+			true
+	end
+
+	def DyndocWorld.prj_dir(prj,yml)
+			prj
+	end
+
+end

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

@@ -11,11 +11,8 @@ 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'
 
 class App < Roda
   use Rack::Session::Cookie, :secret => (secret="Thanks like!")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -217,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