dyndoc-ruby 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e794529323a9dab819dac71b1b6de1e6eceaa36
-  data.tar.gz: d49314105fb3bdaa7be8c583b488631c1fe413a5
+  metadata.gz: b521fb0e195336e4655811606b2db0dbfadf7304
+  data.tar.gz: 39675c51acf5d462806dc98edf8342a345f78731
 SHA512:
-  metadata.gz: 8d232669a147dab82f11839801dd78c5183deb154969a3678fad3e445fe159138efa55868a33cd5fbc0e757e6aaf21f11d1c78b1f6b3d1cea687cd1d2f1ea6b0
-  data.tar.gz: 7f525ea4329a3a372d71cf14e68df190d886dd33a2e75e1f0cd52a78bd28e392f0c59a06dbb3a9d085ff3d1ba547f6e1943c0d83c07db6c462ce621cfb58b59c
+  metadata.gz: 5cd340b92b6bde1373fa311495b4644e49b53e5ccc7ffc64769e53a6653a4daefa570539fdb9a295519906679072215f31199dc0817114bfda3e776225d94084
+  data.tar.gz: 4ff34548e8446d36ed38a9d13a3de25d282a461db22bee7f52048373fb495a96148f123744cc385b106aa105737ff0999c171985a0231be50205a409dfd98676

data/bin/dyn-4ever

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'forever'
+require 'fileutils'
+
+CMD="dyn-4ever"
+SRVS=["dyn-srv","dyn-html","dyn-http"]
+DYN4EVER_DIR=File.join(ENV["HOME"],"dyndoc","dyn-4ever")
+FileUtils.mkdir_p DYN4EVER_DIR
+
+Forever.run do
+  dir DYN4EVER_DIR
+  every 10.seconds do
+    status=SRVS.map do |srv|
+      `#{srv} status`.empty?
+    end
+    if status.any?
+      message="at #{Time.now}: " + status.each_with_index.map { |e,i|  e ? SRVS[i] : nil}.compact.join("+") + " stopped and restarted!"
+      if RUBY_PLATFORM =~ /darwin/
+        ##p lint_error
+        cmd_to_display="display notification \"#{message}\" with title \"dyn status\""
+        `osascript -e '#{cmd_to_display}'`
+      end
+      puts message
+      status.each_with_index { |e,i|  `#{SRVS[i]} start` if e }
+    end
+  end
+  after :all do
+    SRVS.each {|srv| `#{srv} stop`}
+  end
+end

data/bin/dyn-ctl

@@ -0,0 +1,86 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+
+SRVS=["dyn-srv","dyn-html","dyn-http"]
+CMD="dyn-ctl"
+DYNCTL_PLIST=File.expand_path("~/Library/LaunchAgents/local.dyn-ctl.plist")
+
+
+
+case (ARGV[0] || "start").downcase
+when "start"
+  status=SRVS.map do |srv|
+    `#{srv} status`.empty?
+  end
+  if status.any?
+    message="at #{Time.now}: " + status.each_with_index.map { |e,i|  e ? SRVS[i] : nil}.compact.join("+") + " stopped and restarted!"
+    if RUBY_PLATFORM =~ /darwin/
+      ##p lint_error
+      cmd_to_display="display notification \"#{message}\" with title \"dyn status\""
+      `osascript -e '#{cmd_to_display}'`
+    end
+    puts message
+    status.each_with_index { |e,i|  `#{SRVS[i]} start` if e }
+  end
+
+when "stop"
+    SRVS.each {|srv| `#{srv} stop`}
+
+when "new"
+
+  if RUBY_PLATFORM =~ /darwin/
+    ## launchctl seems to work but actually: dyn-srv, dyn-html and dyn-http started but noit properly
+
+    DYNCTL_ERR_FILE = File.join(ENV["HOME"],"dyndoc","log","")+CMD+".err"
+    DYNCTL_OUT_FILE = File.join(ENV["HOME"],"dyndoc","log","")+CMD+".out"
+    FileUtils.mkdir_p File.join(ENV["HOME"],"dyndoc",'log')
+
+    unless File.exists? DYNCTL_PLIST
+      plist= <<-END.sub(/CMD/,CMD).sub(/DYN_CMD/,`which #{CMD}`.strip).sub(/ERR_FILE/,DYNCTL_ERR_FILE).sub(/OUT_FILE/,DYNCTL_OUT_FILE).sub(/DYN_PATH/,ENV["PATH"]).sub(/DYN_LANG/,ENV["LANG"])
+      <?xml version="1.0" encoding="UTF-8"?>
+      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+      <plist version="1.0">
+      <dict>
+      <key>EnvironmentVariables</key>
+          <dict>
+                  <key>PATH</key>
+                  <string>DYN_PATH</string>
+                  <key>LANG</key>
+                  <string>DYN_LANG</string>
+          </dict>
+      <key>Label</key>
+      <string>CMD</string>
+      <key>ProgramArguments</key>
+      <array>
+      <string>DYN_CMD</string>
+      </array>
+      <key>RunAtLoad</key>
+      <true/>
+      <key>StartInterval</key>
+      <integer>10</integer>
+      <key>StandardErrorPath</key>
+      <string>ERR_FILE</string>
+      <key>StandardOutPath</key>
+      <string>OUT_FILE</string>
+      </dict>
+      </plist>
+      END
+      File.open(DYNCTL_PLIST,"w") do |f|
+        f << plist
+      end
+    end
+  end
+
+when "load"
+  `launchctl load #{DYNCTL_PLIST}` if RUBY_PLATFORM =~ /darwin/ and File.exists? DYNCTL_PLIST
+
+when "unload"
+  `launchctl unload #{DYNCTL_PLIST}` if RUBY_PLATFORM =~ /darwin/ and File.exists? DYNCTL_PLIST
+when "delete"
+  if RUBY_PLATFORM =~ /darwin/ and File.exists? DYNCTL_PLIST
+    `launchctl unload #{DYNCTL_PLIST}`
+    FileUtils.rm DYNCTL_PLIST
+  end
+
+end

data/lib/dyndoc-convert.rb

@@ -67,7 +67,8 @@ module Dyndoc
 
     return unless opts[:dyn_root]
 
-    dyn_libs,dyn_tags,dyn_layout,dyn_pre_code,dyn_post_code=nil,nil,nil,nil,nil
+    dyn_libs,dyn_tags,dyn_layout=nil,nil,nil
+    dyn_pre_code,dyn_post_code="",""
 
     ## requirement: dyn_file is provided relatively to the opts[:dyn_root] (for security reason too)
 
@@ -112,16 +113,6 @@ module Dyndoc
       ## add info related to dyn file
       cfg.merge!(cfg_files)
 
-      ## Dyn layout
-      dyn_layout=dyn_file[0...i]+"_layout.dyn" if File.exist? dyn_file[0...i]+"_layout.dyn"
-
-      ## Dyn pre
-      dyn_pre_code=File.read(dyn_file[0...i]+"_pre.dyn") if File.exist? dyn_file[0...i]+"_pre.dyn"
-
-      ## Dyn post
-      dyn_post_code=File.read(dyn_file[0...i]+"_post.dyn") if File.exist? dyn_file[0...i]+"_post.dyn"
-
-
       if File.exist? dyn_file[0...i]+".dyn_cfg" and (yml=YAML::load_file(dyn_file[0...i]+".dyn_cfg"))
         cfg.merge!(yml)
       else # try do find (in the Zope spirit) a config file in the nearest folder
@@ -145,40 +136,82 @@ module Dyndoc
       # dyn_root can be overwritten by cfg
       dyn_root= cfg["dyn_root"] || opts[:dyn_root] || File.expand_path("..",dyn_file)
       html_root= cfg["html_root"] || opts[:html_root] || File.expand_path("..",dyn_file)
+      sys_root = cfg["sys_root"] ||  opts[:sys_root] || File.expand_path('..',dyn_root)
+      ##p [:sys_root,dyn_root,sys_root]
+
+      ## Dyn Model: generally helps to define a style (layout, preload, postload)
+      if cfg["model"]
+        ## do not aggregate layout
+        cfg["layout"] = cfg["model"]
+        ## aggregate model to pre and load
+        cfg["pre"] = ([cfg["model"]] + ((cfg["pre"] || "").split(","))).join(",")
+        cfg["post"] = ([cfg["model"]] + ((cfg["post"] || "").split(","))).join(",")
+      end
 
-      cfg["layout"] = cfg["pre"] = cfg["post"] = cfg["model"] if cfg["model"]
-
+      ## Dyn layout
+      dyn_layout=dyn_file[0...i]+"_layout.dyn" if File.exist? dyn_file[0...i]+"_layout.dyn"
       if cfg["layout"]
-        if cfg["layout"][0] == "~" #user mode
+        if cfg["layout"][-4,4] != ".dyn" ## Main use now! Added to put layout outside  /edit folder
+          if cfg["layout"][0] == "~"
+            user,*pa=cfg["layout"][1..-1].split("/")
+            cfg_tmp=File.join(sys_root,"public","users",user,"layout",pa)+".dyn"
+          else
+            cfg_tmp=File.join(sys_root,"system","layout",cfg["layout"]+".dyn")
+          end
+        elsif cfg["layout"][0] == "~" #user mode
           cfg_tmp=File.join(opts[:dyn_root],'users',cfg["layout"][1] == "/" ? File.join(opts[:user],cfg["layout"][1..-1]) : cfg["layout"][1..-1])
         else
           cfg_tmp=File.join(dyn_root,cfg["layout"][0] == "/" ? cfg["layout"][1..-1] : ["layout",cfg["layout"]])
         end
+        ##p [:cfg_tmp_layout,cfg_tmp]
         cfg_tmp+= ".dyn" if File.extname(cfg_tmp).empty?
         ##Dyndoc.warn :layout,cfg_tmp
         dyn_layout=cfg_tmp if !dyn_layout and File.exist? cfg_tmp
       end
+
+      ## Dyn pre
       if cfg["pre"]
-        if cfg["pre"][0] == "~" #user mode
-          cfg_tmp=File.join(opts[:dyn_root],'users',cfg["pre"][0] == "/" ? cfg["pre"][1..-1] : ["pre",cfg["pre"]])
-        else
-          #cfg_tmp=File.join(dyn_root,cfg["pre"])
-          cfg_tmp=File.join(dyn_root,cfg["pre"][0] == "/" ? cfg["pre"][1..-1] : ["preload",cfg["pre"]])
+        cfg["pre"].split(",").map{|e| e.strip}.each do |pre|
+          if pre[-4,4] != ".dyn" ## Main use now! Added to put preload outside /edit folder
+            if pre[0] == "~"
+              user,*pa=pre[1..-1].split("/")
+              cfg_tmp=File.join(sys_root,"public","users",user,"preload",pa)+".dyn"
+            else
+              cfg_tmp=File.join(sys_root,"system","preload",pre+".dyn")
+            end
+          elsif pre[0] == "~" #user mode
+            cfg_tmp=File.join(opts[:dyn_root],'users',pre[0] == "/" ? pre[1..-1] : ["pre",pre])
+          else
+            #cfg_tmp=File.join(dyn_root,pre)
+            cfg_tmp=File.join(dyn_root,pre[0] == "/" ? pre[1..-1] : ["preload",pre])
+          end
+          cfg_tmp+= ".dyn" if File.extname(cfg_tmp).empty?
+          dyn_pre_code += File.read(cfg_tmp) if File.exist? cfg_tmp
         end
-        cfg_tmp+= ".dyn" if File.extname(cfg_tmp).empty?
-        dyn_pre_code=File.read(cfg_tmp) if !dyn_pre_code and File.exist? cfg_tmp
       end
+      dyn_pre_code += File.read(dyn_file[0...i]+"_pre.dyn") if File.exist? dyn_file[0...i]+"_pre.dyn"
 
+      ## Dyn post
       if cfg["post"]
-        if cfg["post"][0] == "~" #user mode
-          cfg_tmp=File.join(opts[:dyn_root],'users',cfg["post"][0] == "/" ? cfg["post"][1..-1] : ["post",cfg["post"]])
-        else
-          #cfg_tmp=File.join(dyn_root,cfg["post"])
-          cfg_tmp=File.join(dyn_root,cfg["post"][0] == "/" ? cfg["post"][1..-1] : ["postload",cfg["post"]])
+        cfg["post"].split(",").map{|e| e.strip}.each do |post|
+          if post[-4,4] != ".dyn" ## Main use now! Added to put postload outside /edit folder
+            if post[0] == "~"
+              user,*pa=post[1..-1].split("/")
+              cfg_tmp=File.join(sys_root,"public","users",user,"postload",pa)+".dyn"
+            else
+              cfg_tmp=File.join(sys_root,"system","postload",post+".dyn")
+            end
+          elsif post[0] == "~" #user mode
+            cfg_tmp=File.join(opts[:dyn_root],'users',post[0] == "/" ? post[1..-1] : ["post",post])
+          else
+            #cfg_tmp=File.join(dyn_root,post)
+            cfg_tmp=File.join(dyn_root,post[0] == "/" ? post[1..-1] : ["postload",post])
+          end
+          cfg_tmp+= ".dyn" if File.extname(cfg_tmp).empty?
+          dyn_post_code += File.read(cfg_tmp) if File.exist? cfg_tmp
         end
-        cfg_tmp+= ".dyn" if File.extname(cfg_tmp).empty?
-        dyn_post_code=File.read(cfg_tmp) if !dyn_post_code and File.exist? cfg_tmp
       end
+      dyn_post_code += File.read(dyn_file[0...i]+"_post.dyn") if File.exist? dyn_file[0...i]+"_post.dyn"
 
       ## deal with html_file
       html_file=File.join(html_root,cfg["html_file"] || html_file)
@@ -217,6 +250,8 @@ module Dyndoc
       ## add path for user
       code_path = "[#path]"+File.join(opts[:dyn_root],'users',opts[:user],"dynlib")
       code_path << "\n" << File.join(opts[:dyn_root],'users',opts[:user])
+      code_path << "\n" << File.join(sys_root,'public','users')
+      code_path << "\n" << File.join(sys_root,'system','dynlib')
       code_path << "\n" << File.join(opts[:dyn_root],'dynlib')
       code_path << "\n" << opts[:dyn_root] << "\n"
       code_path << "[#main][#<]\n"
@@ -231,7 +266,7 @@ module Dyndoc
       else
         (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] #,code.gsub(/__ALL_DOC_TAG__/,doc_tag)]
+          ##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
@@ -263,6 +298,7 @@ module Dyndoc
   ## This version tries to autoconvert a dyn_file of the form *_<format>.dyn to *.<format>
   ## Multi-documents is not considered here! The goal is to provide autoconversion for simple file (even though we can use template)
   ## :format_output => "html" is not a pb since it is mostly used for verbatim output and it is not the focus here!
+  ## TODO: think about existence or location of root of layout, preload, postload and dynlib
 
   def Dyndoc.auto_convert_from_file(dyn_file,opts={}) #ex: opts={dyn_root: , doc_tag: } #opts=obtained by commandline
     ## opts[:dyn_root] ||= ENV["HOME"]
@@ -287,7 +323,7 @@ module Dyndoc
         output_basename: dyn_basename+"."+dyn_extname
       }
 
-      p [:cfg_files,cfg_files]
+      ## p [:cfg_files,cfg_files]
 
       cfg={}
 

data/lib/dyndoc-html-servers.rb

@@ -41,6 +41,7 @@ module Dyndoc
       require 'dyndoc-edit'
       require 'filewatcher'
       require 'dyndoc-linter'
+
       $VERBOSE = nil
       options={first: true}
       ## To put inside yaml config file!

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

@@ -14,7 +14,7 @@ $public_root = cfg["public_root"] || File.join(root ,"public")
 class App < Roda
   use Rack::Session::Cookie, :secret => (secret="Thanks like!")
   ##TODO: use Rack::LiveReload
-  plugin :static, ["/pages","/private","/tools"], :root => $public_root
+  plugin :static, ["/pages","/private","/tools","/users"], :root => $public_root
   #opts[:root]=File.expand_path("..",__FILE__),
   #plugin :static, ["/pages","/private"]
   plugin :multi_route

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: foreverb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 description: |2
     Provide templating in text document.
 email: rdrouilh@gmail.com
@@ -122,22 +136,23 @@ executables:
 - dyn-lint
 - dyn-cli
 - dyn-auto
+- dyn-ctl
+- dyn-4ever
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/dpm
 - bin/dyn
+- bin/dyn-4ever
 - bin/dyn-auto
 - bin/dyn-cli
-- bin/dyn-forever
+- bin/dyn-ctl
 - bin/dyn-html
-- bin/dyn-html-fw-onefile
 - bin/dyn-http
 - bin/dyn-init
 - bin/dyn-lint
 - bin/dyn-scan
 - bin/dyn-srv
-- bin/dyn-win-env
 - lib/dyndoc-convert.rb
 - lib/dyndoc-edit.rb
 - lib/dyndoc-html-servers.rb

data/bin/dyn-forever

@@ -1,166 +0,0 @@
-#!/usr/bin/ruby
-
-## THIS IS AN ADAPTATION OF FOREVERB (https://github.com/DAddYE/foreverb) TO DYN
-require 'rubygems' unless defined?(Gem)
-require 'thor'
-require 'yaml'
-require 'fileutils'
-require 'dyndoc/init/home'
-
-DYN_FOREVER_PATH = ENV['DYN_FOREVER_PATH'] ||= File.expand_path(Dyndoc.home,"etc","dyn-foreverb.yml") unless defined?(DYN_FOREVER_PATH)
-
-class CLI < Thor
-
-  desc "list", "List Forever running daemons"
-  method_option :monitor, :type => :boolean, :aliases => "-m", :default => false, :desc => "Show memory and cpu usage with ps"
-  def list
-    say "Your config is empty, so no deamons was found.", :red if config.empty? && !options.monitor
-
-    if options.monitor
-      print_table([%w(PID RSS CPU CMD), *ps])
-    else
-      config.each do |conf|
-        status = begin
-          pid = File.read(conf[:pid]).to_i
-          Process.kill(0, pid)
-          "RUNNING"
-        rescue Errno::ESRCH, Errno::ENOENT
-          "NOT RUNNING"
-        rescue Errno::EPERM
-          "RUNNING"
-        end
-        say_status status, conf[:file], status =~ /^RUNNING/ ? :green : :red
-      end
-      say "Reading config from: #{DYN_FOREVER_PATH}", :blue
-    end
-  end
-
-  desc "stop [DAEMON] [--all] [--yes]", "Stop one or more matching daemons"
-  method_option :all, :type => :boolean, :aliases => "-a", :desc => "All matching daemons"
-  method_option :yes, :type => :boolean, :aliases => "-y", :desc => "Don't ask permission to kill daemon"
-  def stop(daemon=nil)
-    find(daemon, :multiple => options.all).each do |conf|
-      stop_daemon(conf) if options.yes || yes?("Do you want really stop \e[1m#{conf[:file]}\e[0m?")
-    end
-  end
-
-  desc "kill [DAEMON] [--all] [--yes]", "Kill one or more matching daemons"
-  method_option :all, :type => :boolean, :aliases => "-a", :desc => "All matching daemons"
-  method_option :yes, :type => :boolean, :aliases => "-y", :desc => "Don't ask permission to kill daemon"
-  def kill(daemon=nil)
-    find(daemon, :multiple => options.all).each do |conf|
-      if options.yes || yes?("Do you want really kill \e[1m#{conf[:file]}\e[0m?")
-        say_status "KILLING", conf[:file]
-        begin
-          pid = File.read(conf[:pid]).to_i
-          Process.kill(:INT, pid)
-        rescue Exception => e
-          say_status "ERROR", e.message, :red
-        end
-      end
-    end
-  end
-
-  desc "start [DAEMON] [--all] [--yes]", "Start one or more matching daemons"
-  method_option :all, :type => :boolean, :aliases => "-a", :desc => "All matching daemons"
-  method_option :yes, :type => :boolean, :aliases => "-y", :desc => "Don't ask permission to start the daemon"
-  def start(daemon=nil)
-    find(daemon, :multiple => options.all).each do |conf|
-      system(conf[:file]) if options.yes || yes?("Do you want really start \e[1m#{conf[:file]}\e[0m?")
-    end
-  end
-
-  desc "restart [DAEMON] [--all] [--yes]", "Restart one or more matching daemons"
-  method_option :all, :type => :boolean, :aliases => "-a", :desc => "All matching daemons"
-  method_option :yes, :type => :boolean, :aliases => "-y", :desc => "Don't ask permission to start the daemon"
-  def restart(daemon=nil)
-    invoke :start
-  end
-
-  desc "tail [DAEMON]", "Tail log of first matching daemon"
-  method_option :lines, :aliases => "-n", :default => 150, :desc => "How many lines show?"
-  def tail(daemon)
-    found = find(daemon)[0]
-    return unless found
-    system "tail -f -n #{options.lines} #{found[:log]}"
-  end
-
-  desc "update [DAEMON] [--all] [--yes]", "Update config from one or more matching daemons"
-  method_option :all, :type => :boolean, :aliases => "-a", :desc => "All matching daemons"
-  method_option :yes, :type => :boolean, :aliases => "-y", :desc => "Don't ask permission to start the daemon"
-  def update(daemon=nil)
-    match = find(daemon, :multiple => options.all)
-    return if match.empty?
-    FileUtils.rm_rf(DYN_FOREVER_PATH)
-    match.each do |conf|
-      system(conf[:file], 'update') if options.yes || yes?("Do you want really update config from \e[1m#{conf[:file]}\e[0m?")
-    end
-  end
-
-  desc "remove [DAEMON] [--all]", "Remove the config of a daemon from foreverb"
-  method_option :all, :type => :boolean, :aliases => "-a", :desc => "All matching daemons"
-  method_option :yes, :type => :boolean, :aliases => "-y", :desc => "Don't ask permission to remove the daemon"
-  def remove(daemon=nil)
-    say "You must provide a daemon name or provide --all option", :red and return if daemon.nil? && !options.all
-    new_config = config.delete_if do |conf|
-      if conf[:file] =~ /#{daemon}/
-        if options.yes || yes?("Do you really want to remove the daemon \e[1m#{conf[:file]}\e[0m?")
-          stop_daemon(conf)
-          say "\e[1m#{conf[:file]}\e[0m removed."
-          true
-        else
-          say "\e[1m#{conf[:file]}\e[0m remains on the list."
-          false
-        end
-      else
-        false
-      end
-    end
-    write_config! new_config
-  end
-
-  private
-    def find(daemon, options={})
-      multiple = options.delete(:multiple)
-      say "You must provide a daemon name or provide --all option", :red and return [] if daemon.nil? && !multiple
-      found = multiple ? config : config.find_all { |conf| conf[:file] =~ /#{daemon}/ }
-      say "Daemon(s) matching '#{daemon}' not found", :red if found.empty? && !daemon.nil?
-      say "Daemons not found", :red if found.empty? && nil && daemon.nil?
-      found
-    end
-
-    def find_all(daemon)
-      find(daemon, :multiple => true)
-    end
-
-    def config
-      File.exist?(DYN_FOREVER_PATH) ? YAML.load_file(DYN_FOREVER_PATH) : []
-    end
-
-    def ps
-      # This is horrible command, but how we can keep compatiblity between darwin and *unix ?
-      result = `ps axo pid,rss,pcpu,command | grep -vE "^USER|grep" | grep Forever: | awk '{print $1"\t"$2"\t"$3"\t"$4" "$5" "$6}'`
-      result = result.chomp.split("\n").map { |line| line.split("\t") }
-      result = result.sort { |a,b| b[1].to_i <=> a[1].to_i }
-      result.each { |column| column[1] = "%d Mb" % [column[1].to_i / 1024] }
-      result.each { |column| column[2] = "%s %"  % [column[2]] }
-      result
-    end
-
-    def write_config!(new_config)
-      File.open(DYN_FOREVER_PATH, "w") { |f| f.write new_config.to_yaml }
-    end
-
-    def stop_daemon(conf)
-      say_status "STOPPING", conf[:file]
-      begin
-        pid = File.read(conf[:pid]).to_i
-        Process.kill(:INT, pid)
-      rescue Exception => e
-        say_status "ERROR", e.message, :red
-      end
-    end
-end
-
-ARGV << "-h" if ARGV.empty?
-CLI.start(ARGV)

data/bin/dyn-html-fw-onefile

@@ -1,143 +0,0 @@
-#!/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["src_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-win-env

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-require 'rubygems'        	# if you use RubyGems
-require 'commander/import'
-require 'dyndoc/common/utils'
-
-
-# :name is optional, otherwise uses the basename of this executable
-program :name, 'dyndoc environment'
-program :version, '0.1.0'
-program :description, 'Dyndoc environment management.'
-
-highline= HighLine.new
-
-command :path do |c|
-  c.syntax = 'dyndoc-envir path'
-  c.description = 'Manage paths for Windows'
-  c.action do |args, options|
-  	if Dyndoc::Utils.is_windows?
-  		dirsR=Dir[File.join(ENV['ProgramFiles'].split('\\'),'**','R.dll')].map{|e| File.dirname(e).split('/').join('\\').strip}.uniq
-	    if dirsR.empty?
-	    	say("No R directory found in your Windows System!")
-	    else
-		    require 'win32/registry'
-		    paths=nil
-			Win32::Registry::HKEY_CURRENT_USER.open('Environment') do |reg|
-				paths=reg['path'].split(";").map{|l| l.strip}
-			end
-			save=false
-			case args[0].downcase.to_sym
-	  		when :r
-				highline.choose do |menu|
-					menu.prompt = "Please select the R directory to add to your PATH:  "
-					menu.choices(*dirsR) do |ch|
-						paths << ch
-						save=true
-						say("#{ch} added to user PATH!") 
-					end
-				  	menu.choice :quit do  say("Nothing done!") end
-				end
-			when :add
-				paths << args[1].split(";").map{|l| l.strip}
-				say("#{args[1]} added to user PATH!") 
-				save=true
-	  		when :del
-	  			highline.choose do |menu|
-					menu.prompt = "Please choose path to delete?  "
-					menu.choices(*paths) do |ch|
-						paths.delete(ch)
-						save=true
-						say("#{ch} removed from user PATH!") 
-					end
-				  	menu.choice :quit do  say("Nothing done!") end
-				end
-	  		end
-	  		if save
-		  		Win32::Registry::HKEY_CURRENT_USER.open('Environment',Win32::Registry::KEY_WRITE) do |reg|
-			  		reg['path'] = paths.join(";")
-			  		puts reg['path']
-			  	end
-			end
-			puts paths.join("\n")+"\n"
-		end
-	end
-  end
-end
-
-command :link do |c|
-  	c.syntax = 'dyndoc-envir link'
- 	c.description = 'Create a link for Dyndoc Console2'
-  	c.action do |args, options|
-  		console=args[0] ? args[0] : "C:\\tools\\Console2\\Console.exe"
-  		require 'win32/shortcut'
-  		Win32::Shortcut.new(ENV["HOME"].split("/").join("\\")+"\\Desktop\\Dyndoc.lnk") do |s| 
-  		    s.description       = 'Dyndoc'
-		    s.path              = console
-		    s.window_style      = Win32::Shortcut::SHOWNORMAL
-		    s.icon_location		= console
-		    s.working_directory = ENV["HOME"].split("/").join("\\")
-		end
-	end
-end