jekyll_pre 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e01bd13d91a64bf9b1dc9802cd11ef6c759985a30532daf8b3ace4618bfe634
-  data.tar.gz: 6d33733cf1f1d0267ba226dafd459807254fa10f5199f2b1358648f9f94ccc01
+  metadata.gz: 2a78213a8f26a3d6743a9b706501a5c0f87279eeb243e492956fdd557b0a1e6d
+  data.tar.gz: 64c8640dee1fe914ac54f9813df8bb3f365518d41d13aecd62bda8c752d0488e
 SHA512:
-  metadata.gz: 8e1f5e2a5cb3beb928cc2d8ad09fd1274aff0c5085ac1ee1f014456aaefaa78d5711c2bd9046e9418737b7bff7b53b2e4f54856e5dbbb8fcd1d4f193757db0fc
-  data.tar.gz: 22747b92ec65bb6568a648c98a2a24417fd970daa012632ec596deca2232b0e994dffa7017792083d797c1ee6b2bc86b01b4b496d84525786ddcfd06769ade64
+  metadata.gz: e89f23e343045045c93f7fe7843a43611608f8702e934f4ce0f3c50b52bed7d71b856c79af679d4af9fbdd25921bbcf6977acbd709033a171bbfffc136ff358d
+  data.tar.gz: bba7c4caf281ab09415560e63a525c632bd98019bb475d53e526fade9c43ed4f77a9de7ef8395085c82308cf4fe31c4e4bbc52c58870f942cd7f6db1181e23ae

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2.4
+  * The `exec` tag now evaluates environment variables in the command before execution.
+
 ## 1.2.3
   * Added `cd` option to `exec` tag.
 

data/README.md

@@ -38,7 +38,8 @@ This Jekyll plugin provides 3 new Liquid tags that work together:
     ```
 
   * An `exec` tag that executes shell commands and incorporates the command and its output into the content of the `pre` tag.
-    Output data is escaped, whitespace is condensed, and wrapped in the same `unselectable` class as does `unselectable`.
+    Environment variables are evaluated,
+    output data is escaped, whitespace is condensed, and wrapped in the same `unselectable` class as does `unselectable`.
     ```
     {% exec [Options] [shell command] %}
     ```
@@ -219,6 +220,24 @@ The following executes `ls -alF /` and displays the output.
 {% endpre %}
 ```
 
+### Example 9
+The following changes to the home directory (`$HOME`), then executes `pwd` and displays the output.
+
+```
+{% pre clear copyButton label='Exec without error' %}
+{% noselect %}{% exec cd="$HOME" die_if_nonzero=false pwd %}
+{% endpre %}
+```
+
+### Example 10
+The following executes `echo $USER` and displays the output.
+
+```
+{% pre clear copyButton label='Exec display $USER' %}
+{% noselect %}{% exec die_if_nonzero=false echo $USER %}
+{% endpre %}
+```
+
 
 ### Comprehensive Example
 The code I wrote to generate the above CSS was a good example of how the plugins work together with

data/jekyll_pre.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.version = JekyllPreVersion::VERSION
 
   spec.add_dependency 'jekyll', '>= 3.5.0'
-  spec.add_dependency 'jekyll_plugin_support', '~> 0.5.0'
+  spec.add_dependency 'jekyll_plugin_support', '~> 0.5.0', '>= 0.5.3'
 end

data/lib/exec_tag.rb

@@ -5,9 +5,14 @@ module ExecTag
   class ExecTag < JekyllSupport::JekyllTag
     include JekyllPreVersion
 
+    def self.remove_html_tags(string)
+      string.gsub(/<[^>]*>/, '')
+    end
+
     def render_impl
       parse_args
-      command = @helper.remaining_markup
+      @original_command = @helper.remaining_markup_original
+      command = JekyllPluginHelper.expand_env(@original_command)
       response = run_command(command)
       response = if @child_status.success?
                    compress(response)
@@ -16,14 +21,14 @@ module ExecTag
                  end
 
       <<~END_OUTPUT
-        #{Rack::Utils.escape_html(command)}
+        #{Rack::Utils.escape_html(@original_command)}
         <span class='unselectable'>#{response}</span>
       END_OUTPUT
     rescue PreError => e
       raise PreError, e.message, []
     rescue StandardError => e
-      msg = remove_html_tags(e.message) + " from executing '#{command}' on line #{@line_number} (after front matter) of #{@page['path']}"
-      raise PreError, msg.red, [] if die_if_error
+      msg = self.class.remove_html_tags(e.message) + " from executing '#{@original_command}' on line #{@line_number} (after front matter) of #{@page['path']}"
+      raise PreError, msg.red, [] if @die_if_error
     end
 
     private
@@ -37,13 +42,14 @@ module ExecTag
     end
 
     def die(msg)
-      msg_no_html = remove_html_tags(msg)
+      msg_no_html = self.class.remove_html_tags(msg)
       @logger.error("#{@page['path']} - #{msg_no_html}")
       raise PreError, "#{@page['path']} - #{msg_no_html.red}", []
     end
 
     def handle_error(command)
       msg0 = "Error: executing '#{command}'"
+      msg0 += " (expanded from #{@original_command})" if command != @original_command
       msg0 += " in directory '#{@cd}'" if @cd
       msg = <<~END_MSG
         #{msg0} on line #{@line_number} (after front matter) of #{@page['path']} returned error code #{@child_status.exitstatus}
@@ -78,12 +84,14 @@ module ExecTag
                end
       @child_status = $CHILD_STATUS
       result
+    rescue StandardError => e
+      msg = self.class.remove_html_tags(e.message) + " from executing '#{@original_command}' on line #{@line_number} (after front matter) of #{@page['path']}"
+      raise PreError, msg.red, [] if @die_if_error
+    ensure
+      @child_status = $CHILD_STATUS
+      result
     end
 
     JekyllPluginHelper.register(self, 'exec')
   end
-
-  def remove_html_tags(string)
-    string.gsub(/<[^>]*>/, '')
-  end
 end

data/lib/jekyll_pre/version.rb

@@ -1,3 +1,3 @@
 module JekyllPreVersion
-  VERSION = '1.2.3'.freeze
+  VERSION = '1.2.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_pre
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Mike Slinn
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 description: 'Jekyll tags pre and noselect, for HTML <pre/> tag, prompts and unselectable
   text. Can number lines.