jekyll_patternbot 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceea8f589ddaa2cd03732ef5bbfe8382f98d5e3ce5c3d1d994a235b6830c44dd
-  data.tar.gz: bbc89813a7c30cecbe0751b8814b1e5916d106ea14941a00e87ef8214f80eb4c
+  metadata.gz: 9e7a65e72e14fcdfaff8cf21d079c3c2dc75b1f225af614f9fa7c01f78b6ddf4
+  data.tar.gz: dcc20432b31495913b7ac21852b90aab882a40984df61ece77687647e537b066
 SHA512:
-  metadata.gz: e6122060b6425023ddbe5fbcb7d76e2f86e6068f5284926d2f6ec1a9d3d3bd4f2b9f7bb6135caa032e52c56f1676b2f133f28417bf4a152b21ea0083c249db23
-  data.tar.gz: b7ddc1960612776da806279575bc37760200023788ccaa1653a476b8b88eff33b8a1f48bfc8acfb5f19ebf3833e9e3a1c92fbd40a518c5e062824a7505a0bb74
+  metadata.gz: 25f181344dac581222ac7569153f3e4759a6f3f1fe52e4ece007d605feabafe9c2f520d9f9a64d77ffdaf3ff0855f46e39fed64d17541092ddd152628a0ac5e9
+  data.tar.gz: fe9c3fbc7de612c147d1f3f399d8a7ea048d1457234e7cdd38d9bb56e24315a1f1652ede64621ae6d4d7b2c55f7294afcd79bfa0b48a27c02e68c4f7cbe57728

data/CHANGELOG.md

@@ -5,6 +5,14 @@ Jekyll Patternbot adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
+## [1.6.1] — 2020-01-04
+
+### Fixed
+
+- Made the config live change detection & parsing more reliable.
+
+---
+
 ## [1.6.0] — 2020-01-04
 
 ### Changed

data/_plugins/jekyll_patternbot.rb

@@ -20,6 +20,7 @@ module JekyllPatternbot
   require 'jekyll_patternbot/helpers/jekyll'
   require 'jekyll_patternbot/helpers/pattern'
 
+  require 'jekyll_patternbot/parsers/config'
   require 'jekyll_patternbot/parsers/web_dev_tool'
   require 'jekyll_patternbot/parsers/modulifier'
   require 'jekyll_patternbot/parsers/gridifier'

data/_plugins/jekyll_patternbot/config.rb

@@ -27,27 +27,13 @@ module JekyllPatternbot
     end
 
     # Does this leave a running process when Jekyll shuts down?
-    begin
-      @@config_listener.stop
-    rescue
-      @@config_listener = nil
-    end
-    @@config_listener = nil
-    @@config_listener = Listen.to(site.source, only: /\_config\.yml/) do |modified, added, removed|
-      begin
-        new_config = YAML.load_file File.expand_path(site.source + '/_config.yml')
-      rescue Exception => err
-        log = PatternbotConsoleLogger.new
-        log.fatal(err.message)
-      else
-        if new_config.key? 'patternbot'
-          Config['patternbot'].deep_merge! new_config['patternbot']
-          if site
-            site.process
-          end
+    unless @@config_listener
+      @@config_listener = Listen.to(site.source, only: /\_config\.yml/) do |modified, added, removed|
+        if site
+          site.process
         end
       end
+      @@config_listener.start
     end
-    @@config_listener.start
   end
 end

data/_plugins/jekyll_patternbot/hooks/pattern_lib.rb

@@ -1,21 +1,23 @@
 module JekyllPatternbot
   PatternbotLogger = PatternbotConsoleLogger.new
   PatternbotCache = {}
-  PatternbotData = {
-    :css => {},
-    :js => {},
-    :logos => {},
-    :icons => {
+  PatternbotData = {}
+
+  Jekyll::Hooks.register :site, :post_read do |site|
+    PatternbotData[:css] = {}
+    PatternbotData[:js] = {}
+    PatternbotData[:logos] = {}
+    PatternbotData[:icons] = {
       :spritesheets => [],
       :classes => [],
-    },
-    :layouts => [],
-    :patterns => {},
-    :patterns_order => [],
-    :pages => [],
-  }
+    }
+    PatternbotData[:layouts] = []
+    PatternbotData[:patterns] = {}
+    PatternbotData[:patterns_order] = []
+    PatternbotData[:pages] = []
+
+    ConfigChangeParser.new.parse site
 
-  Jekyll::Hooks.register :site, :post_read do |site|
     # File.open('/Users/thomasjbradley/Desktop/patternbot-config.json', 'w') do |f|
     #   f.write(JSON.pretty_generate(Config))
     # end

data/_plugins/jekyll_patternbot/parsers/config.rb

@@ -0,0 +1,20 @@
+module JekyllPatternbot
+  class ConfigChangeParser
+
+    def parse(site)
+      begin
+        new_config = YAML.load_file File.expand_path(site.source + '/_config.yml')
+      rescue Exception => err
+        PatternbotLogger.fatal(err.message)
+      else
+        if new_config.key? 'patternbot'
+          config_base = YAML.load_file File.expand_path('../../../_config.yml', __dir__)
+          Config['patternbot'] = config_base['patternbot']
+          Config['patternbot'][:version] = JekyllPatternbot::VERSION
+          Config['patternbot'].deep_merge! new_config['patternbot']
+        end
+      end
+    end
+
+  end
+end

data/version.rb

@@ -1,3 +1,3 @@
 module JekyllPatternbot
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_patternbot
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Thomas J Bradley
@@ -268,6 +268,7 @@ files:
 - _plugins/jekyll_patternbot/helpers/pattern.rb
 - _plugins/jekyll_patternbot/hooks/pattern_lib.rb
 - _plugins/jekyll_patternbot/loggers/patternbot.rb
+- _plugins/jekyll_patternbot/parsers/config.rb
 - _plugins/jekyll_patternbot/parsers/css_color.rb
 - _plugins/jekyll_patternbot/parsers/css_comment_tag.rb
 - _plugins/jekyll_patternbot/parsers/css_font.rb