dyndoc-ruby-exec 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ca855899830fe149198371631c1ad6799ef6ba
-  data.tar.gz: 95706e8408ab156182d91746f27c78e76c45ff34
+  metadata.gz: 3e595ec0591bedf58982901cf0301a6f4fee71be
+  data.tar.gz: 3bf4118abc7965fd1f598803cc386524a0f9f806
 SHA512:
-  metadata.gz: 6e4631cec87f6d8d75fa1cd9997b326d02f09ae484e557ef23dad683398b8566d633bf4d8621ceb8f152101222d1e17e785e891d2a6a78c06f7ccc0b916db6e9
-  data.tar.gz: 88a016c2b62cca4f69865e31789d8585be91de3b42f0dedab2c0846a9738fb2d624026a8919e807496ab04ae1aaa25da9e71cdf8632b8dcb15133c2209d039e5
+  metadata.gz: 838bc2ec316476d7af324d66cc4303316ada49037596048ec4fa0417209ef5af7605041ecd85bb49eb283c265d41a24bc537a99335cc22b34e6cf2a0cfc0a79f
+  data.tar.gz: c82b94759686b33528315e61aaa7d2855aa83f6b885e70ee3f31da501be6d7cfa91c7a5d3db06e9ad3f3cde37c786efe6adb05b26a875756526853295eb6ca68

data/lib/dyndoc-converter.rb

@@ -54,8 +54,7 @@ module Dyndoc
       end
     end
 
-    def Converter.pandoc(input,opt='')
-      output = ''
+    def Converter.pandoc_available?
       unless SOFTWARE[:pandoc]
         if File.exist? File.join(ENV["HOME"],".cabal","bin","pandoc")
           SOFTWARE[:pandoc]=File.join(ENV["HOME"],".cabal","bin","pandoc")
@@ -66,7 +65,12 @@ module Dyndoc
           #SOFTWARE[:pandoc]=cmd.strip.split(" ")[2] unless cmd.empty?
         end
       end
-      if SOFTWARE[:pandoc]
+      SOFTWARE[:pandoc]
+    end
+
+    def Converter.pandoc(input,opt='')
+      output = ''
+      if Converter.pandoc_available?
         ##DEBUG: p [:pandoc_soft, SOFTWARE[:pandoc]+" #{opt}"]
         if input
           ##DEBUG: p [:pandoc_iput,input]
@@ -120,6 +124,41 @@ module Dyndoc
       Asciidoctor.convert(code,:attributes => {"icons" => "font"})
     end
 
+    def Converter.redcarpet_engine
+      unless @@markdown
+        require 'redcarpet'
+        @@markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+      end
+      @@markdown
+    end
+
+    def Converter.redcarpet(code)
+        Dyndoc::Converter.redcarpet_engine ? @@markdown.render(code) : ""
+    end
+
+
+    def Converter.markdown_engine=(engine)
+       @@markdown_engine=engine unless Dyndoc::Converter.markdown_engine == engine
+
+    end
+
+    def Converter.markdown_engine
+      (@@markdown_engine ||= :pandoc)
+    end
+
+    def Converter.markdown(code)
+      if Dyndoc::Converter.markdown_engine == :pandoc
+        if Dyndoc::Converter.pandoc_available?
+          Dyndoc::Converter.pandoc(code)
+        else
+          Converter.markdown_engine=:redcarpet
+        end
+      end
+      Converter.redcarpet(code) if Dyndoc::Converter.markdown_engine == :redcarpet
+      ## default output if no available engine found
+      ""
+    end
+
     def Converter.convert(input,format,outputFormat,to_protect=nil)
       ##
       format=format.to_s unless format.is_a? String
@@ -127,14 +166,14 @@ module Dyndoc
       outputFormat=outputFormat.to_s unless outputFormat.is_a? String
       res=""
       input.split("__PROTECTED__FORMAT__").each_with_index do |code,i|
-        ## Dyndoc.warn "code",[i,code,format,outputFormat]
+        ##Dyndoc.warn "code",[i,code,format,outputFormat]
         if i%2==0
           res << case format+outputFormat
           when "adoc>html"
             Dyndoc::Converter.asciidoctor(code)
           when "md>html"
             ##PandocRuby.new(code, :from => :markdown, :to => :html).convert
-            Dyndoc::Converter.pandoc(code)
+            Dyndoc::Converter.markdown(code)
           when "md>tex"
             #puts "latex documentclass";p Dyndoc::Utils.dyndoc_globvar("_DOCUMENTCLASS_")
             if Dyndoc::Utils.dyndoc_globvar("_DOCUMENTCLASS_")=="beamer"
@@ -173,7 +212,7 @@ module Dyndoc
         else
           res << code
         end
-        #puts "res";p res
+        #Dyndoc.warn "res",res
       end
       return (to_protect ? "__PROTECTED__FORMAT__"+res+"__PROTECTED__FORMAT__": res)
     end

data/lib/dyndoc-software.rb

@@ -2,10 +2,18 @@ module Dyndoc
 
   SOFTWARE={}
 
+  def self.mingw32_software?
+    RUBY_PLATFORM=~/mingw32/
+  end
+
+  def self.scoop_install?
+    self.mingw32_software? and !(`where scoop`.strip.empty?)
+  end
+
   def self.software_init(force=false)
 
     unless SOFTWARE[:R]
-      if RUBY_PLATFORM=~/mingw32/
+      if self.mingw32_software?
         cmd=Dir[File.join(ENV["HomeDrive"],"Program Files","R","**","R.exe")]
         SOFTWARE[:R]=cmd[0] unless cmd.empty?
       else
@@ -15,7 +23,7 @@ module Dyndoc
     end
 
     unless SOFTWARE[:Rscript]
-      if RUBY_PLATFORM=~/mingw32/
+      if self.mingw32_software?
         cmd=Dir[File.join(ENV["HomeDrive"],"Program Files","R","**","Rscript.exe")]
         SOFTWARE[:Rscript]=cmd[0] unless cmd.empty?
       else
@@ -58,6 +66,19 @@ module Dyndoc
       SOFTWARE[:ttm]=cmd.strip.split(" ")[2] unless cmd.empty?
     end
 
+    unless SOFTWARE[:bash]
+      if self.scoop_install?
+        bash_path=File.expand_path('../../bin/bash.exe',`scoop which git`)
+        if File.exist? bash_path
+          bash_path
+        else # Needs to be in the PATH
+          "bash"
+        end
+      else
+        "/bin/bash"
+      end
+    end
+
   end
 
   def self.software
@@ -71,12 +92,20 @@ module Dyndoc
   def self.pdflatex
     # this has to be initialized each time you need pdflatex since TEXINPUTS could change!
     if ENV['TEXINPUTS']
-      "env TEXINPUTS=#{ENV['TEXINPUTS']}" + (RUBY_PLATFORM=~/mingw32/ ? "; " : " ") + SOFTWARE[:pdflatex]
+      "env TEXINPUTS=#{ENV['TEXINPUTS']}" + (self.mingw32_software? ? "; " : " ") + SOFTWARE[:pdflatex]
     else
       SOFTWARE[:pdflatex]
     end
   end
 
+  def self.bash(bash_path=nil)
+    if bash_path # Needs to be in the PATH
+      return bash_path
+    else
+      SOFTWARE[:bash]
+    end
+  end
+
   def self.R
     SOFTWARE[:R]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-exec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies: []
 description: |2
     Converters and software for dyndoc.
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Converters and software for dyndoc