dyndoc-ruby 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fba357b44769920a52e1b4267e7b31cd71bef4a
-  data.tar.gz: d1f1b0ba488f063262c3789968c11cee4644eca8
+  metadata.gz: da77cb91f143261ef5cef6cf89d0f4016ec88580
+  data.tar.gz: f3c3229874249cc9854e401ed4c504d92a9ff681
 SHA512:
-  metadata.gz: 50feaa43e83224c5683c5af8a0416c8cc1e8fbebc73898d835a04c26946c078958d951b0eb3a2f361730d66ef24391de5a3022f97e9d9abf021714076bd9b99c
-  data.tar.gz: c6ad22d41baa0576145540a8c1c51eafb672dc13804410140f44cb7f6c4096feb9dea39639cdcb4ba65a1a8cf047efb7a9d0733fdda8a791dd2fe470d0c2464b
+  metadata.gz: 655ae2027b9ad6ef19c9f911430db1e019d19631dcbc33018283b5246985a0393df95c4f673442c836f5d32fb5a30542c6cebc80e692a0527afd255513399e1a
+  data.tar.gz: 23a84c99eb88da27b1a718f72042bbe4b89d3d102a77629d2604eefdaff312824a4b4203694837bd8c11e512770611d0b652ea177ce616f48e6b05c911e55c5c

data/bin/dyn-auto

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'dyndoc-convert'
+
+dyn_file=ARGV[0]
+
+full_dyn_file=File.expand_path(File.join(Dir.pwd,dyn_file))
+full_dyn_file + '.dyn' unless full_dyn_file =~ /.*\.dyn$/
+
+
+if File.exists? full_dyn_file
+  Dyndoc.auto_convert_from_file(full_dyn_file)
+else
+  puts "Error: #{full_dyn_file} does not exists"
+end

data/lib/dyndoc-convert.rb

@@ -238,4 +238,199 @@ module Dyndoc
     end
   end
 
+
+  ## Very similar to Dyndoc.process_html_file_from_dyn_file
+  def Dyndoc.auto_dyn_file(code,output_file,dyn_file,dyn_layout,addr,dyndoc_start)
+    cli=Dyndoc::InteractiveClient.new(code,dyn_file,addr,dyndoc_start)
+
+    if dyn_layout
+      cli=Dyndoc::InteractiveClient.new(File.read(dyn_layout),"",addr) #File.expand_path(dyn_layout),addr)
+    end
+
+    if output_file and Dir.exist? File.dirname(output_file)
+      File.open(output_file,"w") do |f|
+        f << cli.content
+      end
+    else
+      puts cli.content
+    end
+  end
+
+  ###################################
+  ## Dyndoc.auto_convert_from_file ##
+  ###########################################################################
+  ## Very similar to Dyndoc.cli_convert_from_file which is (badly) devoted to html file!
+  ## 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!
+
+  def Dyndoc.auto_convert_from_file(dyn_file,opts={}) #ex: opts={dyn_root: , doc_tag: } #opts=obtained by commandline
+    ## opts[:dyn_root] ||= ENV["HOME"]
+
+    dyn_libs,dyn_tags,dyn_layout,dyn_pre_code,dyn_post_code=nil,nil,nil,nil,nil
+
+    dyn_path=dyn_file.split(File::Separator)
+
+
+    if i=(dyn_file =~ /\_([a-z,A-Z,0-9]*)\.dyn$/)
+      dyn_extname = $1
+      dyn_dirname = File.dirname(dyn_file[0...i])
+      dyn_basename = dyn_file[0...i]
+
+      cfg_files={
+        fullname: dyn_file,
+        basename: File.basename(dyn_file,".*"),
+        tag:  opts[:doc_tag],
+        dyn_extname: dyn_extname,
+        dyn_dirname: dyn_dirname,
+        dyn_basename: dyn_basename,
+        output_basename: dyn_basename+"."+dyn_extname
+      }
+
+      p [:cfg_files,cfg_files]
+
+      cfg={}
+
+      ## find the previous config.yml in the tree folder
+      ## TODO: read all previous config.yml and merge them from root to current
+      ## The merge could be also to join the content when the key is the same.
+      ## Ex: semantic-ui (1st config.yml): css_message
+      ##    semantic-ui (2nd config.yml): css_icon
+      ##  becomes: semantic-ui: css_message, css_icon
+      ## NEEDS TO DECLARE the fields that behave like this in some other config file (keys.yml)
+
+      cfg_yml_files=dyn_path.inject([""]) {|res,e| res + [(res[-1,1]+[e]).flatten]}.map{|pa| File.join("",pa,"config.yml")}.reverse
+      cfg_yml_file=cfg_yml_files.select{|c| File.exists? c}[0]
+      cfg=YAML::load_file(cfg_yml_file) if cfg_yml_file
+
+      ## add info related to dyn file
+      cfg.merge!(cfg_files)
+
+      ## Dyn layout
+      dyn_layout=dyn_file[0...i]+"_#{dyn_extname}-layout.dyn" if File.exist? dyn_file[0...i]+"_#{dyn_extname}-layout.dyn"
+
+      ## Dyn pre
+      dyn_pre_code=File.read(dyn_file[0...i]+"_#{dyn_extname}-pre.dyn") if File.exist? dyn_file[0...i]+"_#{dyn_extname}-pre.dyn"
+
+      ## Dyn post
+      dyn_post_code=File.read(dyn_file[0...i]+"_#{dyn_extname}-post.dyn") if File.exist? dyn_file[0...i]+"_#{dyn_extname}-post.dyn"
+
+
+      if File.exist? dyn_file[0...i]+"_#{dyn_extname}.dyn_cfg" and (yml=YAML::load_file(dyn_file[0...i]+"_#{dyn_extname}.dyn_cfg"))
+        cfg.merge!(yml)
+      else # try do find (in the Zope spirit) a config file in the nearest folder
+      end
+
+      ## code to evaluate
+      code=File.read(dyn_file)
+
+      page={}
+
+      if code =~ /^\-{3}/
+        b=code.split(/^(\-{3,})/,-1)
+        if b[0].empty? and b.length>4
+          require 'yaml'
+          page=YAML.load(b[2])
+          cfg.merge!(page)
+          code=b[4..-1].join("")
+        end
+      end
+
+      # dyn_root can be overwritten by cfg
+      # defines the root of relative predefined dyn (pre, post, ...) files
+      dyn_root= cfg["dyn_root"] || opts[:dyn_root] || File.expand_path("..",dyn_file)
+
+      cfg["layout"] = cfg["pre"] = cfg["post"] = cfg["model"] if cfg["model"]
+
+      if cfg["layout"]
+        if cfg["layout"][0] == "/"
+          cfg_tmp=cfg["layout"]
+        else
+          cfg_tmp=File.join(dyn_root, cfg["layout"])
+        end
+        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
+      if cfg["pre"]
+        if cfg["pre"][0] == "/"
+          cfg_tmp=cfg["pre"]
+        else
+          cfg_tmp=File.join(dyn_root,cfg["pre"])
+        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
+
+      if cfg["post"]
+        if cfg["post"][0] == "/"
+          cfg_tmp=cfg["post"]
+        else
+          cfg_tmp=File.join(dyn_root,cfg["post"])
+        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
+
+
+      ## deal with html_file
+      output_file=File.join(opts[:where] || cfg[:dyn_dirname],File.basename(cfg[:output_basename]))
+      unless File.exist? output_file
+        dirname=File.dirname(output_file)
+        require 'fileutils'
+        FileUtils.mkdir_p dirname
+      end
+
+      dyn_libs=cfg["libs"].strip if cfg["libs"]
+
+      ## 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}
+      dyn_tags="[#<]{#opt]"+docs_tags.join(",")+"[#opt}[#>]" unless docs_tags.empty?
+
+      ### Dyndoc.warn  :dyn_tags,[docs_tags,dyn_tags]
+
+      if dyn_libs or dyn_pre_code
+        code_pre = ""
+        code_pre += dyn_pre_code + "\n" if dyn_pre_code
+        code_pre += '[#require]'+"\n"+dyn_libs if dyn_libs
+        code = code_pre + '[#main][#>]' + code
+      end
+      code += "\n" + dyn_post_code if dyn_post_code
+      ## TO TEST!!!
+      ##
+      Dyndoc.warn :cfg,cfg
+      ##Dyndoc.warn :page,page
+      code = "[#rb<]require 'ostruct';cfg = OpenStruct.new(" + cfg.inspect + ")[#>]" +code
+      code = dyn_tags + code if dyn_tags
+
+      ## add path for user
+      code_path = "[#path]"
+      code_path << "\n" << File.join(dyn_root,'dynlib')
+      code_path << "\n" << opts[:dynlib_root] << "\n" if opts[:dynlib_root]
+      code_path << "\n" << cfg[:dynlib_root] << "\n" if cfg[:dynlib_root]
+      code_path << "[#main][#<]\n"
+      code = code_path + code
+
+      ### Dyndoc.warn :code,code
+
+      dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
+
+      opts[:addr] ||= "127.0.0.1"
+      ##unless cfg[:doc_tags]
+        Dyndoc.auto_dyn_file(code,output_file,dyn_file,dyn_layout,opts[:addr],dyndoc_start)
+      # else
+      #   (cfg[:doc_tags]).each do |doc_tag|
+      #     output_file = cfg[:outputs][doc_tag] ? (cfg[:outputs][doc_tag][0] == "/" ? cfg[:outputs][doc_tag] :  File.join() ) : File.join(opts[:where] || cfg["dyn_dirname"],cfg["output_basename"])
+      #     p [:html_multi,doc_tag,html_file] #,code.gsub(/__ALL_DOC_TAG__/,doc_tag)]
+      #     Dyndoc.auto_dyn_file(code,html_file,dyn_file,dyn_layout,addr,dyndoc_start)
+      #   end
+      # end
+    end
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -121,11 +121,13 @@ executables:
 - dyn-scan
 - dyn-lint
 - dyn-cli
+- dyn-auto
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/dpm
 - bin/dyn
+- bin/dyn-auto
 - bin/dyn-cli
 - bin/dyn-forever
 - bin/dyn-html