Merge branch 'main' of github.com:puppetlabs/showoff

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

lib/showoff.rb

@@ -1810,7 +1810,7 @@ def manage_client_cookies(presenter=false)
     end
   end
 
-  get %r{(?:image|file)/(.*)} do
+  get %r{/(?:image|file)/(.*)} do
     path = params[:captures].first
     full_path = File.join(settings.pres_dir, path)
     if File.exist?(full_path)

lib/showoff/compiler.rb

@@ -67,7 +67,7 @@ def profile
       end
     rescue LoadError
       puts "ERROR: The #{renderer} markdown rendering engine does not appear to be installed correctly."
-      exit! 1
+      exit 1
     end
 
     profile

lib/showoff_utils.rb

@@ -173,7 +173,7 @@ def self.validate(config)
     puts "Found #{errors.size} errors."
     unless errors.empty?
       errors.each { |err| puts " * #{err}" }
-      exit!
+      exit 1
     end
   end
 
@@ -715,7 +715,7 @@ def self.setup(dir_name)
       end
     rescue LoadError
       puts "ERROR: The #{renderer} markdown rendering engine does not appear to be installed correctly."
-      exit! 1
+      exit 1
     end
   end