glim 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cf2638bda0d93060164af5852371d10769b989d12d4bb2ff22f7c18d36402fd
-  data.tar.gz: 441332f28ab6c0a7ccc5cb7fc9f51a8846566bdcd5bea10d70dcb4a4f31ad89d
+  metadata.gz: 1c833f6ae8f777fea4bea3921973658abb6d2047e5c8e392551e95af595e0b94
+  data.tar.gz: 20eed39068fed6280b3711a93db863769d7e2dddd56594a50e6325c253b0ff30
 SHA512:
-  metadata.gz: 89524be8ab561fe5febf6278de1b09da581e176644fa992032a0f5c6a87d8d40b80687c2b80cb0388ffb547d4c05aefe87a2ee70802a8330ce5caf207930aa39
-  data.tar.gz: 0325c5264098db6b540a875f556f87cc6a5d044b2c39e3d1e1773085309caeb99d4ddd7fdd089b8554bb5c50d93ebd589b3e1833a2ab66e5ee058170c3bc8700
+  metadata.gz: 0d5900a018a77e3840a89e4a7e552d49565ad5c48b7075ce90f9cd53f5068488b6fee8fbfcc9c5793e847c6c5c05ab6e6fe98485afa5f8b82afe19f8ca5ae5fe
+  data.tar.gz: 6a42db7d9f865b6cf444ab4317db99560631a0ad48829ff208d14e7ac63c95f76490ef6b84b48055f8452c3a34c48e5825f3b2f64234d066a99c72044039f599

data/bin/glim

@@ -15,7 +15,14 @@ require 'pathname'
 require 'kramdown'
 require 'liquid'
 require 'mercenary'
-require 'bundler/setup' if File.exists?('Gemfile')
+
+if File.exists?('Gemfile')
+  begin
+    require 'bundler/setup'
+  rescue LoadError => e
+    $log.warn("Unable to load Bundler but directory contains a Gemfile")
+  end
+end
 
 module Util
   module_function
@@ -982,7 +989,7 @@ module Glim
                 Sass.load_paths << sass_dir unless Sass.load_paths.include?(sass_dir)
               end
             end
-          rescue Gem::MissingSpecError => e
+          rescue Gem::LoadError => e
             $log.warn("Unable to load the #{theme} theme: #{e}")
           end
         end
@@ -1463,7 +1470,9 @@ Mercenary.program(:glim) do |p|
     c.action do |args, options|
       Profiler.enabled = options['profile']
 
-      Glim::Commands.build(Glim::Config.new(files: options['config'], defaults: { 'environment' => 'production' }, override: options))
+      config = Glim::Config.new(files: options['config'], defaults: { 'environment' => 'production' }, override: options)
+      config['show_backtrace'] = true if c.trace
+      Glim::Commands.build(config)
 
       Profiler.run("Saving cache") do
         Glim::Cache.save
@@ -1510,7 +1519,7 @@ Mercenary.program(:glim) do |p|
     end
   end
 
-  Bundler.require(:glim_plugins) if File.exists?('Gemfile')
+  Bundler.require(:glim_plugins) if defined?(Bundler) && File.exists?('Gemfile')
 
   Jekyll::Plugin.plugins_of_type(Jekyll::Command).sort.each do |klass|
     klass.init_with_program(p)

data/lib/commands.rb

@@ -10,7 +10,7 @@ module Glim
 
       delete_files, delete_dirs = items_in_directory(output_dir, skip: config['keep_files'])
       deleted = delete_items(delete_files, delete_dirs, keep: output_paths)
-      created, updated, warnings, errors = *generate(output_dir, config['jobs'] || 7, files)
+      created, updated, warnings, errors = *generate(output_dir, config['jobs'] || 7, files, backtrace: config['show_backtrace'])
 
       symlinks.each do |dest, path|
         FileUtils.mkdir_p(File.dirname(dest))
@@ -163,17 +163,17 @@ module Glim
       res
     end
 
-    def self.generate(output_dir, number_of_jobs, files)
+    def self.generate(output_dir, number_of_jobs, files, backtrace: false)
       Profiler.run("Creating pages") do
         if number_of_jobs == 1
-          generate_subset(output_dir, files)
+          generate_subset(output_dir, files, backtrace: backtrace)
         else
-          generate_async(output_dir, files.shuffle, number_of_jobs)
+          generate_async(output_dir, files.shuffle, number_of_jobs, backtrace: backtrace)
         end
       end
     end
 
-    def self.generate_async(output_dir, files, number_of_jobs)
+    def self.generate_async(output_dir, files, number_of_jobs, backtrace: false)
       total  = files.size
       slices = number_of_jobs.times.map do |i|
         first = (total *    i  / number_of_jobs).ceil
@@ -190,7 +190,7 @@ module Glim
         pid = fork do
           start = Time.now
           pipe_rd.close
-          created, updated, warnings, errors = *generate_subset(output_dir, files_slice)
+          created, updated, warnings, errors = *generate_subset(output_dir, files_slice, backtrace: backtrace)
           pipe_wr << Marshal.dump({
             'cache_updates' => Glim::Cache.updates,
             'created'       => created,
@@ -224,7 +224,7 @@ module Glim
       [ created, updated, warnings, errors ]
     end
 
-    def self.generate_subset(output_dir, files)
+    def self.generate_subset(output_dir, files, backtrace: false)
       created, updated, warnings, errors = [], [], [], []
 
       for file in files do
@@ -235,16 +235,18 @@ module Glim
         if file.frontmatter?
           begin
             if !file_exists || File.read(dest) != file.output
-              (file_exists ? updated : created) << dest
               File.unlink(dest) if file_exists
               File.write(dest, file.output)
+              (file_exists ? updated : created) << dest
             end
             warnings.concat(file.warnings.map { |warning| "#{file}: #{warning}" }) unless file.warnings.nil?
           rescue Glim::Error => e
             errors << [ "Unable to create output for: #{file}", *e.messages ]
             break
           rescue => e
-            errors << [ "Unable to create output for: #{file}", e.to_s, e.backtrace.join("\n") ]
+            error = [ "Unable to create output for: #{file}", e.to_s ]
+            error << e.backtrace.join("\n") if backtrace
+            errors << error
             break
           end
         else

data/lib/local_server.rb

@@ -233,7 +233,7 @@ module Glim
       def websocket_script
         <<~JS
         const glim = {
-          connect: function (host, port, should_try, should_reload) {
+          connect: function (host, port, should_retry, should_reload) {
             const server = host + ":" + port
             console.log("Connecting to Glim’s live reload server (" + server + ")…");
 
@@ -260,14 +260,14 @@ module Glim
             socket.onclose = () => {
               console.log("Lost connection: Live reload disabled.")
 
-              if(should_try) {
-                window.setTimeout(() => this.connect(host, port, should_try, true), 2500);
+              if(should_retry) {
+                window.setTimeout(() => this.connect(host, port, should_retry, true), 2500);
               }
             };
           },
         };
 
-        glim.connect('#{@config['host']}', #{@config['livereload_port']}, true /* should_try */, false /* should_reload */);
+        glim.connect('#{@config['host']}', #{@config['livereload_port']}, true /* should_retry */, false /* should_reload */);
         JS
       end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Glim
-  VERSION = '0.1'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glim
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Allan Odgaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -136,7 +136,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-description: 
+description: Generating output is done in parallel using multiple tasks and lazy evaluation
+  is used when serving pages locally for instant reloads when source content changes.
 email: 
 executables:
 - glim
@@ -151,10 +152,14 @@ files:
 - lib/local_server.rb
 - lib/log_and_profile.rb
 - lib/version.rb
-homepage: https://macromates.com/glim/
+homepage: https://sigpipe.macromates.com/2018/creating-a-faster-jekyll/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://sigpipe.macromates.com/2018/creating-a-faster-jekyll/
+  documentation_uri: https://macromates.com/glim/
+  source_code_uri: https://github.com/sorbits/glim/
+  mailing_list_uri: https://lists.macromates.com/listinfo/glim
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -163,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="