dyndoc-ruby 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b104002585f67910c6674bd6d9937221cffe185
-  data.tar.gz: 5014c79451e427798d0b2dac7307d0c55c83ccd9
+  metadata.gz: b9963c5d464efaa1e487405f7281a8fc0524bfb4
+  data.tar.gz: 381c9fdc302fc46caf90ff3add7ef0fa4509cd25
 SHA512:
-  metadata.gz: 0ca0e8ddfd72441ad99174c31615946580bb135ddafbb4c8719faafd61f629060d93560440cdf5874c69dfef44921a064c2f037b6b446afb324dee56f47b8a8f
-  data.tar.gz: 2d2d3e9eced1d1d0ce9ff6ed8e69134ed4c014f3a6e80cafb2a7ecde337e52973e3bbcd8c1cf64c7f95953852e4539bad62029a4f19cee7416532dcfd11b15bd
+  metadata.gz: 0f4be1e799a156cdc63609e0db7a5c18da45783fd8a56b390272b9a3cb2b96200e132d33f05e5c6a8220a32172a78bc895298f2ae14621de6605737ee68d1b25
+  data.tar.gz: 064ba3d1dc341f4b06f997d60bd12d0387ae126ddf072f43d7ab6bf80df766f5e42f40d67d2e1f5c1f35c6e469725d0c9fd7a8016d3f907ea749d001279d8a90

data/bin/dyn

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+
 require 'dyndoc/document'
 
 ## p Dyndoc.cfg_dir

data/bin/dyn-forever

@@ -5,9 +5,7 @@ require "dyndoc/srv/interactive-server"
 
 Forever.run do
   on_error do |e|
-
       puts  "%s\n  %s\n" % [e.message, e.backtrace.join("\n  ")]
-
   end
   before :all do
     Dyndoc::InteractiveServer.new.run

data/bin/dyn-html

@@ -2,6 +2,8 @@
 require 'dyndoc-convert'
 require 'dyndoc-edit'
 require 'dyndoc/init/home'
+require 'pathname'
+
 dyndoc_home = Dyndoc.home
 #p Dyndoc.home
 
@@ -14,72 +16,49 @@ cfg=YAML::load_file(cfg_yml) if File.exist? cfg_yml
 
 ## To put inside yaml config file!
 root = cfg["root"] || File.join(ENV["HOME"],"RCqls","RodaServer")
-edit_root = File.join(root ,"edit")
-pages_root = File.join(root ,"public","pages")
+edit_root = cfg["edit_root"] || File.join(root ,"edit")
+public_root = cfg["public_root"] || File.join(root ,"public")
+pages_root = File.join(public_root ,"pages")
 current_email = cfg["email"] || "rdrouilh@gmail.com" #default email user can be overriden by -u option
+base_url=cfg["base_url"] || "http://localhost:9292"
 
 args=ARGV
-args=["-h"] if args.empty?
 
 require 'optparse'
 
 $VERBOSE = nil
 
-## Examples:
-## 1) global mode:
-##    dyn-html /dev/R/test.dyn
-## 2) user mode: relative path used instead of ~ since ~ is interpreted in bash mode!
-##    dyn-html cfies2017/index.dyn:index # -u <default_user_email>
-##    dyn-html -u remy.drouilhet@upmf-grenoble.fr cfies2017/index.dyn:index
-##    dyn-html -u remy.drouilhet@upmf-grenoble.fr cfies2017/index.dyn:all
-
-options={watching: nil, refresh: :auto, first: true}
+options={first: true}
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: dyn-html [-u email_user] [-w] [-r <url-to-refresh-when-watched>] [/]<relative_path>/<file>.dyn"
-
-  opts.on( '-u', '--user EMAIL', 'user email' ) do |email|
-    current_email=email
-  end
-
-  opts.on( '-w', '--watch', 'watch file') do
-    options[:watching]=true
-  end
-
-  opts.on( '-r', '--refresh HTML', 'page to refresh (only for MacOsX)' ) do |html|
-    options[:refresh]=html
-  end
-
-  opts.on('--no-refresh', 'no refresh page' ) do
-    options[:refresh]=nil
-  end
-
+  opts.banner = "Usage: dyn-html"
 end.parse!(args)
 
 ## Mandatory input
-dyn_file,doc_tag=args[0].split(":")
-doc_tag="" unless doc_tag
-doc_tag="__ALL_DOC_TAG__" if doc_tag.downcase == "all"
+# dyn_file=args[0]
+# doc_tag="" unless doc_tag
+# doc_tag="__ALL_DOC_TAG__" if doc_tag.downcase == "all"
 
 ## Detect docs_tags_info
-dyn_file=File.join(["","users",current_email],dyn_file) unless dyn_file[0,1]=="/"
-filename=File.join(edit_root,dyn_file)
-doc_tags_info=Dyndoc::Edit.get_doc_tags_info(File.read(filename))
+# dyn_file=File.join(["","users",current_email],dyn_file) unless dyn_file[0,1]=="/"
+# filename=File.join(edit_root,dyn_file)
 
-if dyn_file and (dyn_file=~/(.*)(?:\.dyn|_html.dyn)$/)
+### doc_tags_info=Dyndoc::Edit.get_doc_tags_info(File.read(filename))
+
+### if dyn_file and (dyn_file=~/(.*)(?:\.dyn|_html.dyn)$/)
   #p [:dyn_file,dyn_file,$1]
-  html_files=Dyndoc::Edit.html_files({doc_tags_info: doc_tags_info , dyn_file: dyn_file },current_email)
-  ##p [:html_files,html_files]
-  html_file=html_files[doc_tag] || html_files[""]
+  ### html_files=Dyndoc::Edit.html_files({doc_tags_info: doc_tags_info , dyn_file: dyn_file },current_email)
+  ### ##p [:html_files,html_files]
+  ### html_file=html_files[doc_tag] || html_files[""]
 
-  if options[:refresh] and options[:refresh] == :auto
-    options[:refresh] = File.join(cfg["localhost_url"] || "http://localhost:9292",File.dirname(dyn_file),File.basename(dyn_file,".*"))
-  end
+  ### if options[:refresh] and options[:refresh] == :auto
+  ###   options[:refresh] = File.join(cfg["localhost_url"] || "http://localhost:9292",File.dirname(dyn_file),File.basename(dyn_file,".*"))
+  ### end
 
-  output=""
-  output << "Watching "+dyn_file if options[:watching]
-  output << (options[:watching] ? " and refreshing " : "Refreshing ")+options[:refresh] if options[:refresh]
-  puts output unless output.empty?
+  ### output=""
+  ### output << "Watching "+dyn_file if options[:watching]
+  ### output << (options[:watching] ? " and refreshing " : "Refreshing ")+options[:refresh] if options[:refresh]
+  ### puts output unless output.empty?
 
 # Ex for opts:
 # rdrouilh : [:dyn_opts, {:dyn_root=>"/Users/remy/RCqls/RodaServer/edit", :html_root=>"/Users/remy/RCqls/RodaServer/public/pages", :user=>"rdrouilh@gmail.com", :doc_tag=>"bio", :html_files=>{""=>"/dev/R/test.html", "ssd"=>"/dev/R/ssd.html", "bio"=>"/dev/R/bio.html", "tmp"=>"/dev/R/tmp.html", "cours"=>"/dev/R/cours.html"}}]
@@ -87,37 +66,42 @@ if dyn_file and (dyn_file=~/(.*)(?:\.dyn|_html.dyn)$/)
   opts = {
     dyn_root: edit_root,
     html_root: pages_root,
-    user: current_email,
-    doc_tag: doc_tag,
-    html_files: html_files
+    user: current_email
   }
 ##p opts
-  file_to_process=File.join(opts[:dyn_root],dyn_file)
+  ### file_to_process=File.join(opts[:dyn_root],dyn_file)
   cmd_to_open=nil
-  if options[:refresh] and RUBY_PLATFORM =~ /darwin/
-    cmd_to_open='tell application "Safari" to set URL of current tab of front window to "'+options[:refresh]+'"'
-    cmd_to_refresh='tell application "System Events"' + "\n" + 'tell process "Safari"' + "\n" + 'keystroke "r" using {command down}' + "\n" + 'delay 60' + "\n" + 'end tell' + "\n" + 'end tell'
+  if RUBY_PLATFORM =~ /darwin/
+
   end
-  unless options[:watching]
-    ## dyn_file[1..-1] to have a relative path...
-    if Dyndoc::Linter.check_file(file_to_process).empty?
-      Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
-    else
-      puts dyn_file[1..-1]+" not well-formed!"
-    end
-  else
-    require 'filewatcher'
-    require 'dyndoc-linter'
-    FileWatcher.new([file_to_process]).watch() do |filename, event|
-      if event == :changed
-        if Dyndoc::Linter.check_file(file_to_process).empty?
-          Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
-          puts dyn_file[1..-1]+" processed!"
-          if options[:refresh] and RUBY_PLATFORM =~ /darwin/
-            if options[:first]
-              `osascript -e '#{cmd_to_open}'`
-              options[:first]=nil
-            else
+
+  require 'filewatcher'
+  require 'dyndoc-linter'
+  puts "watching "+File.join(edit_root)
+  old_html_file=""
+  FileWatcher.new(edit_root).watch() do |filename, event|
+    ##p [:filename,filename]
+    if [:changed,:new].include? event and File.extname(filename) == ".dyn"
+      ##p [:filename_event,event,filename]
+      if Dyndoc::Linter.check_file(filename).empty?
+        ## find dyn_file (relative path from root)
+        dyn_file="/"+Pathname(filename).relative_path_from(Pathname(edit_root)).to_s
+        opts_doc=Dyndoc::FileWatcher.get_dyn_html_info(filename,dyn_file,opts[:user])
+        opts.merge! opts_doc
+        ##p [:html_files,html_files]
+
+        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)
+        puts dyn_file[1..-1]+" processed!"
+        if RUBY_PLATFORM =~ /darwin/
+          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)
+            cmd_to_open='tell application "Safari" to set URL of current tab of front window to "'+url+'"'
+            `osascript -e '#{cmd_to_open}'`
+          else
 %x{osascript<<ENDREFRESH
 tell app "Safari" to activate
 tell application "System Events"
@@ -125,12 +109,12 @@ tell application "System Events"
 end tell
 ENDREFRESH
 }
-            end
           end
-        else
-          puts dyn_file[1..-1]+" not well-formed!"
         end
+      else
+        puts dyn_file[1..-1]+" not well-formed!"
       end
     end
   end
-end
+
+### end

data/bin/dyn-html-onefile

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+require 'dyndoc-convert'
+require 'dyndoc-edit'
+require 'dyndoc/init/home'
+dyndoc_home = Dyndoc.home
+#p Dyndoc.home
+
+###############################################
+## INFO: this file watch only one file and    #
+## it is now replaced with dyn-html watching  #
+## an entire directory!                       #
+###############################################
+cfg_yml = File.join(dyndoc_home,"etc","dyn-html.yml")
+
+cfg={}
+
+cfg=YAML::load_file(cfg_yml) if File.exist? cfg_yml
+
+
+## To put inside yaml config file!
+root = cfg["root"] || File.join(ENV["HOME"],"RCqls","RodaServer")
+edit_root = cfg["edit_root"] || File.join(root ,"edit")
+public_root = cfg["public_root"] || File.join(root ,"public")
+pages_root = File.join(public_root ,"pages")
+current_email = cfg["email"] || "rdrouilh@gmail.com" #default email user can be overriden by -u option
+
+args=ARGV
+args=["-h"] if args.empty?
+
+require 'optparse'
+
+$VERBOSE = nil
+
+## Examples:
+## 1) global mode:
+##    dyn-html /dev/R/test.dyn
+## 2) user mode: relative path used instead of ~ since ~ is interpreted in bash mode!
+##    dyn-html cfies2017/index.dyn:index # -u <default_user_email>
+##    dyn-html -u remy.drouilhet@upmf-grenoble.fr cfies2017/index.dyn:index
+##    dyn-html -u remy.drouilhet@upmf-grenoble.fr cfies2017/index.dyn:all
+
+options={watching: nil, refresh: :auto, first: true}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: dyn-html [-u email_user] [-w] [-r <url-to-refresh-when-watched>] [/]<relative_path>/<file>.dyn"
+
+  opts.on( '-u', '--user EMAIL', 'user email' ) do |email|
+    current_email=email
+  end
+
+  opts.on( '-w', '--watch', 'watch file') do
+    options[:watching]=true
+  end
+
+  opts.on( '-r', '--refresh HTML', 'page to refresh (only for MacOsX)' ) do |html|
+    options[:refresh]=html
+  end
+
+  opts.on('--no-refresh', 'no refresh page' ) do
+    options[:refresh]=nil
+  end
+
+end.parse!(args)
+
+## Mandatory input
+dyn_file,doc_tag=args[0].split(":")
+doc_tag="" unless doc_tag
+doc_tag="__ALL_DOC_TAG__" if doc_tag.downcase == "all"
+
+## Detect docs_tags_info
+dyn_file=File.join(["","users",current_email],dyn_file) unless dyn_file[0,1]=="/"
+filename=File.join(edit_root,dyn_file)
+
+doc_tags_info=Dyndoc::Edit.get_doc_tags_info(File.read(filename))
+
+if dyn_file and (dyn_file=~/(.*)(?:\.dyn|_html.dyn)$/)
+  #p [:dyn_file,dyn_file,$1]
+  html_files=Dyndoc::Edit.html_files({doc_tags_info: doc_tags_info , dyn_file: dyn_file },current_email)
+  ##p [:html_files,html_files]
+  html_file=html_files[doc_tag] || html_files[""]
+
+  if options[:refresh] and options[:refresh] == :auto
+    options[:refresh] = File.join(cfg["localhost_url"] || "http://localhost:9292",File.dirname(dyn_file),File.basename(dyn_file,".*"))
+  end
+
+  output=""
+  output << "Watching "+dyn_file if options[:watching]
+  output << (options[:watching] ? " and refreshing " : "Refreshing ")+options[:refresh] if options[:refresh]
+  puts output unless output.empty?
+
+# Ex for opts:
+# rdrouilh : [:dyn_opts, {:dyn_root=>"/Users/remy/RCqls/RodaServer/edit", :html_root=>"/Users/remy/RCqls/RodaServer/public/pages", :user=>"rdrouilh@gmail.com", :doc_tag=>"bio", :html_files=>{""=>"/dev/R/test.html", "ssd"=>"/dev/R/ssd.html", "bio"=>"/dev/R/bio.html", "tmp"=>"/dev/R/tmp.html", "cours"=>"/dev/R/cours.html"}}]
+# remy.drouilhet : [:dyn_opts, {:dyn_root=>"/Users/remy/RCqls/RodaServer/edit", :html_root=>"/Users/remy/RCqls/RodaServer/public/pages", :user=>"remy.drouilhet@upmf-grenoble.fr", :doc_tag=>"index", :html_files=>{""=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/index.html", "index"=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/index.html", "dates"=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/dates.html", "sc"=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/sc.html", "orga"=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/orga.html"}}]
+  opts = {
+    dyn_root: edit_root,
+    html_root: pages_root,
+    user: current_email,
+    doc_tag: doc_tag,
+    html_files: html_files
+  }
+##p opts
+  file_to_process=File.join(opts[:dyn_root],dyn_file)
+  cmd_to_open=nil
+  if options[:refresh] and RUBY_PLATFORM =~ /darwin/
+    cmd_to_open='tell application "Safari" to set URL of current tab of front window to "'+options[:refresh]+'"'
+    cmd_to_refresh='tell application "System Events"' + "\n" + 'tell process "Safari"' + "\n" + 'keystroke "r" using {command down}' + "\n" + 'delay 60' + "\n" + 'end tell' + "\n" + 'end tell'
+  end
+  unless options[:watching]
+    ## dyn_file[1..-1] to have a relative path...
+    if Dyndoc::Linter.check_file(file_to_process).empty?
+      Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
+    else
+      puts dyn_file[1..-1]+" not well-formed!"
+    end
+  else
+    require 'filewatcher'
+    require 'dyndoc-linter'
+    FileWatcher.new([file_to_process]).watch() do |filename, event|
+      if event == :changed
+        if Dyndoc::Linter.check_file(file_to_process).empty?
+          Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
+          puts dyn_file[1..-1]+" processed!"
+          if options[:refresh] and RUBY_PLATFORM =~ /darwin/
+            if options[:first]
+              `osascript -e '#{cmd_to_open}'`
+              options[:first]=nil
+            else
+%x{osascript<<ENDREFRESH
+tell app "Safari" to activate
+tell application "System Events"
+  keystroke "r" using {command down}
+end tell
+ENDREFRESH
+}
+            end
+          end
+        else
+          puts dyn_file[1..-1]+" not well-formed!"
+        end
+      end
+    end
+  end
+end

data/bin/dyn-html-srv

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require 'dyndoc/init/home'
+dyndoc_home = Dyndoc.home
+## read config file
+cfg_yml = File.join(dyndoc_home,"etc","dyn-html.yml")
+cfg={}
+cfg.merge! YAML::load_file(cfg_yml) if File.exist? cfg_yml
+
+require 'thin'
+arg=["-R",File.join(dyndoc_home,"html-srv","dyn-html-srv.ru")]
+if cfg["html-srv-port"]
+  arg += ["-p",cfg["html-srv-port"].to_s]
+elsif (i=ARGV.index("-p"))
+  arg += ["-p",ARGV[i+1]]
+end
+arg << "start"
+p [:arg,arg]
+Thin::Runner.new(arg).run!

data/bin/dyn-init

@@ -1,28 +1,67 @@
 #!/usr/bin/env ruby
 require 'fileutils'
+require 'dyndoc/init/home'
 
 arg=ARGV[0]
 arg="path" if !arg or arg.empty?
 
+share_path=File.expand_path("../../share", __FILE__)
+
 case arg
 when "help"
 	puts <<-DOC
 Usage:
-	## create ~/dyndoc folder and initialize some sharing
-	dyn-init path
-	## add room folder
-	dyn-init sync	<room_id>:<room_folder_full_path>@<room_remote_wordir>
+	## get dyndoc home (i.e, ~/dyndoc or read config file ~/.dyndoc_home)
+	dyn-init home
+	## set dyndoc home (update ~/.dyndoc_home)
+	dyn-init home <other dyndoc home path>
+	dyn-init home <other dyndoc home path> --init #with init path
+	## create dyndoc home folder and initialize some sharing
+	dyn-init [path]
+	dyn-init --reset #reset dyndoc home folder
+	## without creating dyndoc home folder, initialize some sharing
+	dyn-init install [all|etc|demo|html-srv|dyndoc.yml]
 DOC
-when "path"
-	share_path=File.expand_path("../../share", __FILE__)
-	dyndoc_path=File.join(ENV["HOME"],"dyndoc")
+## REMOVED from DOC above since maybe it is OBSOLETE
+#### ## add room folder
+#### dyn-init sync	<room_id>:<room_folder_full_path>@<room_remote_wordir>
+when "home"
+	if ARGV.length == 2 or (ARGV.length==3 and ["--init"].include? ARGV[2])
+		Dyndoc.home=ARGV[1]
+		FileUtils.mkdir_p Dyndoc.home
+		FileUtils.cp_r File.join(share_path,"."),Dyndoc.home if ARGV[2]=="--init"
+	end
+	unless File.directory? Dyndoc.home
+		puts "Folder #{Dyndoc.home} does not exist. \nDo you want to initialize (YES|no)?"
+		if STDIN.gets.chomp == "YES"
+			FileUtils.cp_r File.join(share_path,"."),Dyndoc.home
+		end
+	end
+	puts "dyndoc home set to #{Dyndoc.home}"+((ARGV.length==3 and ARGV[2]=="--init") ? " with paths initialization" : "" )
+when "path","--reset"
+	dyndoc_path=Dyndoc.home
+	if arg=="--reset"
+		puts "Do you really want to reset the dyndoc home (YES|no)?"
+		if STDIN.gets.chomp=="YES" and File.directory? dyndoc_path
+			FileUtils.rm_rf dyndoc_path
+		end
+	end
 	unless File.exist? dyndoc_path
 		FileUtils.mkdir_p dyndoc_path
 		FileUtils.cp_r File.join(share_path,"."),dyndoc_path
+		puts "Your dyndoc home now contains at least the default settings!"
 	else
 		puts "Warning: #{dyndoc_path} folder already exists!"
+		puts "Try: dyn-init install [all|etc|demo|html-srv|dyndoc.yml]"
+	end
+when "install"
+	case ARGV[1].strip
+	when "all"
+		FileUtils.cp_r File.join(share_path,"."),Dyndoc.home
+	when "etc","demo","html-srv","dyndoc.yml"
+		FileUtils.cp_r File.join(share_path,ARGV[1].strip),Dyndoc.home
 	end
-when "sync"
+when "sync" ## MAYBE OBSOLETE!
 	require 'fileutils'
 	FileUtils.mkdir_p (etc=File.join(ENV["HOME"],"dyndoc","etc"))
 	room_sync=File.join(etc,".room_sync")

data/lib/dyndoc-convert.rb

@@ -56,6 +56,12 @@ module Dyndoc
   end
 
   ## TODO: a config.yml file for the site
+  ## NOTE: Mode multipage works as follows:
+  ## 1) "only:" can have a list of tags from "docs:" which is put inside opts[:doc_tag]
+  ## 2) In order to process files properly for this list of tags inside opts[:doc_tag]
+  ##    cfg[:tag] and dyn_tags are replace with "__ALL_DOC_TAG__" instead of opts[:doc_tag]
+  ##    Since are __ALL_DOC_TAG__ is replaced by the current tag for each file to be processed, everything goes well!
+
   def Dyndoc.cli_convert_from_file(dyn_file,html_file,opts={}) #ex: opts={dyn_root: , html_root:, user: , doc_tag: }
     addr="127.0.0.1"
 
@@ -80,7 +86,7 @@ module Dyndoc
       basename: File.basename(dyn_file,".*"),
       long_url: html_file,
       url: File.basename(html_file,".*"),
-      tag: opts[:doc_tag],
+      tag:  opts[:doc_tag],
       urls: html_files
     }
 
@@ -186,6 +192,7 @@ module Dyndoc
 
       ## mode multi-documents
       docs_tags=[]
+      ## since opts[:doc_tag] can have more than one tag it is replaced with __ALL_DOC_TAG__ that is replaced before processing with the proper tag
       docs_tags << opts[:doc_tag] if opts[:doc_tag]
       ## complete docs_tags with cfg["tags"]
       docs_tags += (cfg["tags"]||"").split(",").map{|e| e.strip}
@@ -201,7 +208,8 @@ module Dyndoc
     	end
     	code += "\n" + dyn_post_code if dyn_post_code
       ## TO TEST!!!
-      ##Dyndoc.warn :cfg,cfg
+      ##
+      Dyndoc.warn :cfg,cfg
       ##Dyndoc.warn :page,page
       code = "[#rb<]require 'ostruct';cfg = OpenStruct.new(" + cfg.inspect + ");page = OpenStruct.new(" + page.inspect + ")[#>]" +code
       code = dyn_tags + code if dyn_tags
@@ -220,9 +228,9 @@ module Dyndoc
       unless opts[:doc_tag] == "__ALL_DOC_TAG__"
         Dyndoc.process_html_file_from_dyn_file(code,html_file,dyn_file,dyn_layout,addr,dyndoc_start)
       else
-        html_files.keys[1..-1].each do |doc_tag|
+        (opts[:current_tags] || html_files.keys[1..-1]).each do |doc_tag|
           html_file=File.join(html_root,["users",opts[:user]] || [],cfg_files[:urls][doc_tag])
-          p [:html_multi,doc_tag,html_file]
+          p [:html_multi,doc_tag,html_file] #,code.gsub(/__ALL_DOC_TAG__/,doc_tag)]
           Dyndoc.process_html_file_from_dyn_file(code.gsub(/__ALL_DOC_TAG__/,doc_tag),html_file,dyn_file,dyn_layout,addr,dyndoc_start)
         end
       end

data/lib/dyndoc-edit.rb

@@ -1,4 +1,25 @@
 module Dyndoc
+module FileWatcher ## USED by dyn-html
+
+  def FileWatcher.get_dyn_html_info(filename,dyn_file,user)
+    content=File.read(filename)
+    current_tags=[] #select current tags from doc_tags_info
+    doc_tags_info=Dyndoc::Edit.get_doc_tags_info(content,current_tags)
+    ##p [:fw_current_tags, current_tags]
+    doc_tag=(doc_tags_info.empty? ? "" : "__ALL_DOC_TAG__")
+    #p [:dyn_file,dyn_file,$1]
+    tmp=dyn_file.split("/")
+    user=tmp[2] if tmp[1]=="users"
+    ##p [:fw_user,user]
+    html_files=Dyndoc::Edit.html_files({doc_tags_info: doc_tags_info , dyn_file: dyn_file },user)
+
+    current_tags=html_files.keys[1..-1] if doc_tag=="__ALL_DOC_TAG__" and current_tags.empty?
+    current_doc_tag=(current_tags.empty? ? doc_tag : current_tags[0])
+    {html_files: html_files, doc_tag: doc_tag, user: user, current_doc_tag: current_doc_tag, current_tags: current_tags}
+  end
+
+end
+
 module Edit
 
   def Edit.docs_from_doc_tags_info(doc_tags_info)
@@ -13,15 +34,28 @@ module Edit
     return docs
   end
 
-  def Edit.get_doc_tags_info(content)
+  ## if selected_tag is an Array, allow to get current tags to proces
+  def Edit.get_doc_tags_info(content,current_tags=nil)
     doc_tags_info=""
     if content =~ /^\-{3}/
-        b=content.split(/^(\-{3,})/,-1)
-        if b[0].empty? and b.length>4
-          tmp=b[2].strip.split("\n").select{|e2| e2.strip =~/^docs\:/}
-          doc_tags_info=tmp[0] || ""
-          doc_tags_info=$1.strip if doc_tags_info =~ /^docs\:(.*)/
+      b=content.split(/^(\-{3,})/,-1)
+      if b[0].empty? and b.length>4
+        tmp=b[2].strip.split("\n").select{|e2| e2.strip =~/^docs\:/}
+        doc_tags_info=tmp[0] || ""
+        doc_tags_info=$1.strip if doc_tags_info =~ /^docs\:(.*)/
+
+        tmp=b[2].strip.split("\n").select{|e2| e2.strip =~/^only\:/}
+        current_tag_info=tmp[0] || ""
+        current_tag_info=$1.strip if current_tag_info =~ /^only\:(.*)/
+        p [:only_tag,current_tag_info]
+        ## added possibility select current tags only when current_tags is provided as an Array
+        if tmp[0] and current_tags and current_tags.is_a? Array
+          doc_tags=Edit.get_doc_tags(doc_tags_info)
+          current_tag_info.split(",").map{|e| e.strip}.each{|e| current_tags << e if doc_tags.include? e}
+          ##p [:only_current_tags,current_tags]
         end
+
+      end
     end
     return doc_tags_info
   end

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

@@ -0,0 +1,165 @@
+require "roda"
+require "pathname"
+
+## read config file
+require 'dyndoc/init/home'
+dyndoc_home = Dyndoc.home
+cfg_yml = File.join(dyndoc_home,"etc","dyn-html.yml")
+cfg={}
+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]
+
+class App < Roda
+  use Rack::Session::Cookie, :secret => (secret="Thanks like!")
+  plugin :static, ["/pages","/private","/tools"], :root => $public_root
+  #opts[:root]=File.expand_path("..",__FILE__),
+  #plugin :static, ["/pages","/private"]
+  plugin :multi_route
+  ###Dir[File.expand_path("../routes/*.rb",__FILE__)].each{|f| require f}
+  plugin :header_matchers
+  plugin :render,
+    :views => File.expand_path("../views",__FILE__),
+    :escape=>true,
+    :check_paths=>true,
+    :allowed_paths=>[File.expand_path("../views",__FILE__),$public_root]
+  # plugin :csrf,
+  #   :skip => [
+  #     "POST:/edit/dyn",
+  #     "POST:/edit/save",
+  #     "POST:/edit/change-all-dyn-files",
+  #     "POST:/edit/add_delete_dyn_file",
+  #     "POST:/edit/add_delete_user",
+  #     "POST:/edit/add_user_dyn_file",
+  #     "POST:/edit/delete_user_dyn_file",
+  #     "POST:/edit/update_doc_tags_info"
+  #   ],
+  #   :skip_if => lambda{|req| req.env['CONTENT_TYPE'] =~ /application\/json/}
+
+  # plugin :rodauth, :name=>:editor, :json=>true do
+  #   db DB
+  #   enable :login, :logout
+  #   account_password_hash_column :ph
+  #   session_key :user_id
+  #   login_label 'Email'
+  #   password_label 'Mot de passe'
+  #   login_redirect "/editor"
+  # end
+
+  # plugin :rodauth, :name=>:compte,  :json=>true do
+  #   db DB
+  #   enable :change_login, :change_password, :close_account, :create_account,
+  #          :lockout, :login, :logout #, :remember, :reset_password,
+  #          #:verify_account,
+  #          #:otp, :recovery_codes, :sms_codes,
+  #          :password_complexity #,
+  #          #:disallow_password_reuse, :password_expiration, :password_grace_period,
+  #          #:account_expiration,
+  #          #:single_session,
+  #          #:jwt, :session_expiration,
+  #          #:verify_account_grace_period, :verify_change_login
+  #   create_account_link  do
+  #    "<p><a href=\"/compte/create-account\">Créer un nouveau compte</a></p>"
+  #   end
+  #   login_redirect "/editor"
+  #   after_login do
+  #     puts session[:user_id]
+  #   end
+  #   logout_redirect "/editor"
+  #   create_account_redirect "/compte"
+  #   session_key :user_id
+  #   login_label "Email"
+  #   password_label "Mot de passe"
+  #   login_confirm_label "Confirme Email"
+  #   password_confirm_label "Confirme Mot de passe"
+  #   create_account_button "Création compte"
+  #   max_invalid_logins 2
+  #   #allow_password_change_after 60
+  #   #verify_account_grace_period 300
+  #   account_password_hash_column :ph
+  #   title_instance_variable :@page_title
+  #   delete_account_on_close? true
+  #   #only_json? false
+  #   #jwt_secret secret
+  #   # sms_send do |phone_number, message|
+  #   #   MUTEX.synchronize{SMS[session_value] = "Would have sent the following SMS to #{phone_number}: #{message}"}
+  #   # end
+  # end
+
+
+
+  route do |r|
+
+    # GET / request
+    r.root do
+      r.redirect "/hello"
+    end
+
+    #r.multi_route
+
+    # /hello branch
+    r.on "hello" do
+      # Set variable for all routes in /hello branch
+      @greeting = 'Hello'
+
+      # GET /hello/world request
+      r.get "world" do
+        "#{@greeting} world!"
+      end
+
+      # /hello request
+      r.is do
+        # GET /hello request
+        r.get do
+          "#{@greeting}!"
+        end
+
+        # POST /hello request
+        r.post do
+          puts "Someone said #{@greeting}!"
+          r.redirect
+        end
+      end
+    end
+
+    r.on "get" do
+      rsrc=r.remaining_path
+      #p [:get,rsrc]
+      static_root=File.join($public_root,"tools")
+      if (rsrc=~/[^\.]*\.(?:css|js|rb|red|r|R|RData|rdata|rds|csv|txt|xls|xlsx|jpeg|jpg|png|gif)/)
+        rsrc_files=Dir[File.join(static_root,"**",rsrc)]
+        ##p rsrc_files
+        unless rsrc_files.empty?
+          rsrc_file="/tools/"+Pathname(rsrc_files[0]).relative_path_from(Pathname(static_root)).to_s
+          r.redirect rsrc_file
+        end
+      end
+      "No resource #{rsrc} to serve!"
+    end
+
+    r.get do
+      page=r.remaining_path
+      static_root=File.join($public_root,"pages")
+      ##p [:page,File.join(static_root,"**",page+".html")]
+      pattern=(page=~/[^\.]*\.(?:R|Rmd|css|js|html|html|rb|red|r|jpeg|jpg|png|gif)/) ? page : page+".html"
+      html_files=Dir[File.join(static_root,"**",pattern)]
+      ##p html_files
+      unless html_files.empty?
+        html_file="pages/"+Pathname(html_files[0]).relative_path_from(Pathname(static_root)).to_s
+        if File.extname(html_file) == ".html"
+          html_file=File.join(File.dirname(html_file),File.basename(html_file,".html"))
+          p html_file
+          render html_file, :engine=>'html', :views=>$public_root
+        else
+          r.redirect html_file
+        end
+      else
+        "no #{page} to serve!"
+      end
+    end
+
+  end
+end
+
+run App.freeze.app

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -103,6 +103,7 @@ executables:
 - dyn-srv
 - dpm
 - dyn-html
+- dyn-html-srv
 - dyn-init
 - dyn-scan
 - dyn-lint
@@ -115,6 +116,8 @@ files:
 - bin/dyn-env
 - bin/dyn-forever
 - bin/dyn-html
+- bin/dyn-html-onefile
+- bin/dyn-html-srv
 - bin/dyn-init
 - bin/dyn-lint
 - bin/dyn-scan
@@ -383,6 +386,7 @@ files:
 - share/etc/uv/syntax/text.xml.syntax
 - share/etc/uv/syntax/text.xml.xsl.syntax
 - share/etc/uv/uv.rb
+- share/html-srv/dyn-html-srv.ru
 - install/README.md
 - install/dyn-upstart.sh
 - install/dyndoc_install_ubuntu.sh