liquidoc 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c366549d19a6bc289fe1cad1691ae33f0032f2842ab0b27e1f05b7a51825efd
-  data.tar.gz: 395e62fad08ce71196fdab34441254cce41bfc267ea9df9c2b472617acc457fc
+  metadata.gz: a5ca3ecd0b1c24dfa6231479baec2d113e3c6a6255392416ab75d54918f51f3b
+  data.tar.gz: 3abde9ab8883e38c7484782afbb7c8a0bf683c45ca05e0ecc5ad62784fb3a52e
 SHA512:
-  metadata.gz: da7f20c41c281a2a205f6910ddf414f5b4129d570d54ff794f380adf588593eea787b8830090aec953f1ec78dbaf6d02b5ecd88fe40f9fc2bce30f2b5e23907d
-  data.tar.gz: 3f7e276a5fb1929ea8467fe829dfcab02ea6a5da3e46c21185744a1433143a8c86f4915bddd3c1f0440bed65489cf7b3af16d810031855420922a1bab4dce99b
+  metadata.gz: 07b617083d1467b3d485b341d0192026fce6db31632ac4fc123c8827b39202cfa9968a1e599ff07fa115c5f4878b7e105ed11586271d1d3ce1ebc88a5ee09647
+  data.tar.gz: b25ec34f7f2e843e0fabbf5a572f133399e0716c56fe2c2c9e5ddeff93c318645552b6adcd0a4335bd5ebd0693091050b862b0e502fd8bc34442b32a1dd61946

data/lib/liquidoc/version.rb

@@ -1,3 +1,3 @@
 module Liquidoc
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/lib/liquidoc.rb

@@ -73,22 +73,24 @@ FileUtils::mkdir_p("#{@build_dir}/pre") unless File.exists?("#{@build_dir}/pre")
 # Establish source, template, index, etc details for build jobs from a config file
 def config_build config_file, config_vars={}, parse=false
   @logger.debug "Using config file #{config_file}."
-  if config_vars or parse
+  validate_file_input(config_file, "config")
+  if config_vars.length > 0 or parse or contains_liquid(config_file)
+    @logger.debug "Config_vars: #{config_vars.length}"
   # If config variables are passed on the CLI, we want to parse the config file
   # and use the parsed version for the rest fo this routine
     config_out = "#{@build_dir}/pre/#{File.basename(config_file)}"
     liquify(nil,config_file, config_out, config_vars)
     config_file = config_out
     @logger.debug "Config parsed! Using #{config_out} for build."
+    validate_file_input(config_file, "config")
   end
-  validate_file_input(config_file, "config")
   begin
     config = YAML.load_file(config_file)
-  rescue
+  rescue Exception => ex
     unless File.exists?(config_file)
       @logger.error "Config file #{config_file} not found."
     else
-      @logger.error "Problem loading config file #{config_file}. Exiting."
+      @logger.error "Problem loading config file #{config_file}. #{ex} Exiting."
     end
     raise "ConfigFileError"
   end
@@ -176,6 +178,16 @@ def validate_config_structure config
 # TODO More validation needed
 end
 
+def contains_liquid filename
+  File.open(filename, "r") do |file_proc|
+    file_proc.each_line do |row|
+      if row.match(/.*\{\%.*\%\}.*|.*\{\{.*\}\}.*/)
+        return true
+      end
+    end
+  end
+end
+
 def explainer_init out=nil
   unless @explainer
     if out == "STDOUT"
@@ -931,12 +943,15 @@ def generate_site doc, build
     File.open("#{@build_dir}/pre/_attributes.yml", 'w') { |file| file.write(attrs_yaml) }
     build.add_config_file("#{@build_dir}/pre/_attributes.yml")
     config_list = build.prop_files_array.join(',') # flatten the Array back down for the CLI
-    opts_args = ""
     quiet = "--quiet" if @quiet || @explicit
     if build.props['arguments']
-      opts_args = build.props['arguments'].to_opts_args
+      opts_args_file = "#{@build_dir}/pre/jekyll_opts_args.yml"
+      opts_args = build.props['arguments']
+      File.open(opts_args_file, 'w') { |file|
+      file.write(opts_args.to_yaml)}
+      config_list << ",#{opts_args_file}"
     end
-    base_args = "--config #{config_list} #{opts_args}"
+    base_args = "--config #{config_list}"
     command = "bundle exec jekyll build #{base_args} #{quiet}"
     if @search_index
       # TODO enable config-based admin api key ingest once config is dynamic

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidoc
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Brian Dominick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler