showoff 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67f806a8e4ea968733805e72b6976820aa1c04b
-  data.tar.gz: fe179fae4f9ed586414d33b200d764324e400317
+  metadata.gz: 4fcc16c52c78d5e9c2d0f6b8fed009584e8b4558
+  data.tar.gz: 43d18be95f74b4690bb096733d821a87a9e09cb5
 SHA512:
-  metadata.gz: c502bc0616a0a208399adf5d0ab51488ba6230f1ccaf04a872167742932be04750130f3708f6e71f76eab20a9e61392357721957e8f1077b189985cf01b7d23a
-  data.tar.gz: 6ae5577782baf360c4c412ad1ff9654648eb1e12f06cf94ac7c8661246ff4a3b412b60eac043b0dceb90055bb87ae0b01c208b618e27b145d2b48ca83aae86f5
+  metadata.gz: 9c671f6d44ce601953d7e2a1882535c5d0141459033801a2fbe869a0d1a7998f792e9faa486cdff2d8888575bc53872af56064d667e459952a4fcee2e0240f07
+  data.tar.gz: 8330b2398adb6bfaf6a51e8358c4f6095bffd489a1e57c825c7e7f4da7199b36900eb83fdb10296f0a6e47b618a808f485b0f09adf6a4ea6a5ef1806b9e06603

data/lib/showoff.rb

@@ -114,6 +114,14 @@ class ShowOff < Sinatra::Application
       settings.showoff_config['locked'] ||= Array.new
     end
 
+    # default code parsers (for executable code blocks)
+    settings.showoff_config['parsers'] ||= {}
+    settings.showoff_config['parsers']['perl']   ||= 'perl'
+    settings.showoff_config['parsers']['puppet'] ||= 'puppet apply --color=false'
+    settings.showoff_config['parsers']['python'] ||= 'python'
+    settings.showoff_config['parsers']['ruby']   ||= 'ruby'
+    settings.showoff_config['parsers']['shell']  ||= 'sh'
+
     # default code validators
     settings.showoff_config['validators'] ||= {}
     settings.showoff_config['validators']['perl']   ||= 'perl -cw'
@@ -226,7 +234,7 @@ class ShowOff < Sinatra::Application
       files = if File.directory? section
         Dir.glob("#{section}/**/*").sort
       else
-        [section]
+        Array(section)
       end
       @logger.debug files
       files
@@ -1320,30 +1328,27 @@ class ShowOff < Sinatra::Application
   get '/execute/:lang' do |lang|
     return 'Run showoff with -x or --executecode to enable code execution' unless @execute
 
-    code = get_code_from_slide(params[:path], params[:index])
+    code   = get_code_from_slide(params[:path], params[:index])
+    parser = settings.showoff_config['parsers'][lang]
+
+    return "No parser for #{lang}" unless parser
 
     require 'timeout'
     require 'open3' # for 1.8 compatibility :/
     begin
       Timeout::timeout(settings.showoff_config['timeout']) do
-        case lang
-        when 'ruby'
-          eval(code).to_s
-        when 'shell'
-          %x(#{code})
-        when 'puppet'
-          stdout, err = Open3.capture2('puppet', 'apply', '--color=false', '-e', code)
-          stdout
-        when 'python'
-          stdout, err = Open3.capture2('python', '-c', code)
-          stdout
-        when 'perl'
-          stdout, err = Open3.capture2('perl', '-e', code)
-          stdout
-        when 'null'
-          code
-        else
-          "No exec handler for #{lang}"
+        # write out a tempfile to make it simpler for end users to add custom language parser
+        Tempfile.open('showoff-execution') do |f|
+          File.write(f.path, code)
+          @logger.debug "Evaluating: #{parser} #{f.path}"
+          output, status = Open3.capture2e("#{parser} #{f.path}")
+
+          unless status.success?
+            @logger.warn "Command execution failed for #{params[:path]}[#{params[:index]}]"
+            @logger.warn output
+          end
+
+          output
         end
       end
     rescue => e

data/lib/showoff/version.rb

@@ -1,3 +1,3 @@
 # No namespace here since ShowOff is a class and I'd have to inherit from
 # Sinatra::Application (which we don't want to load here)
-SHOWOFF_VERSION = '0.15.1'
+SHOWOFF_VERSION = '0.15.2'

data/lib/showoff_utils.rb

@@ -130,7 +130,7 @@ class ShowOffUtils
             next
 
           elsif validator
-            # write out a tempfile because many validators require files to with
+            # write out a tempfile because many validators require files to work with
             Tempfile.open('showoff-validation') do |f|
               File.write(f.path, code)
               unless system("#{validator} #{f.path}", :out => File::NULL, :err => File::NULL)
@@ -409,27 +409,57 @@ class ShowOffUtils
       logger.level = Logger::WARN
     end
 
-    index = File.join(dir, ShowOffUtils.presentation_config_file)
-    sections = nil
+    index    = File.join(dir, ShowOffUtils.presentation_config_file)
+    sections = ["."] # default boring showoff.json
+
     if File.exist?(index)
-      data = JSON.parse(File.read(index))
-      logger.debug data
-      if data.is_a?(Hash)
-        sections = data['sections']
-      else
-        sections = data
-      end
-      sections = sections.map do |s|
-        if s.is_a? Hash
-          s['section']
+      begin
+        data = JSON.parse(File.read(index))
+        logger.debug data
+        if data.is_a?(Hash)
+          sections = data['sections'] if data.include? 'sections'
         else
-          s
+          sections = data
+        end
+
+        # each entry in sections can be:
+        # - "filename.md"
+        # - { "section": "filename.md" }
+        # - { "section": [ "array.md, "of.md, "files.md"] }
+        # - { "include": "sections.json" }
+        sections = sections.map do |entry|
+          next entry if entry.is_a? String
+          next nil unless entry.is_a? Hash
+
+          next entry['section'] if entry.include? 'section'
+
+          section = nil
+          if entry.include? 'include'
+            file = entry['include']
+            path = File.dirname(file)
+            data = JSON.parse(File.read(file))
+            if data.is_a? Array
+              if path == '.'
+                section = data
+              else
+                section = data.map do |source|
+                  "#{path}/#{source}"
+                end
+              end
+            end
+          end
+
+          section
         end
+      rescue => e
+        logger.error "There was a problem with the presentation file #{index}"
+        logger.error e.message
+        logger.debug e.backtrace
+        sections = []
       end
-    else
-      sections = ["."] # if there's no showoff.json file, make a boring one
     end
-    sections
+
+    sections.flatten.compact
   end
 
   def self.showoff_title(dir = '.')

data/public/css/showoff.css

@@ -44,9 +44,6 @@ pre code {
   /* explicitly size parent elements so the screen blanker works */
   html, body{
     height:100%;
-  }
-
-  body {
     margin:0;
     padding:0;
     overflow: hidden;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-20 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra