cloudcannon-jekyll-bookshop 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272a7ddb403a9ecc69d867930fa241767e84fd9ec41d4cbb0881510a03c5ad04
-  data.tar.gz: 4d7562f2bc12b773b5647f6cee76437bbaa5a6e32e1a0e9f4b3c290e1a9629c9
+  metadata.gz: 578be28e9d766a56a3e73f55a77aecce49ff76e1eb3fa24291fcbbe76aaf73ba
+  data.tar.gz: 54a7068649ff0cec48d3ba78c1630e4e1ba1ff23515bd0d2d323d87fb9ffbd31
 SHA512:
-  metadata.gz: 0e6d9b0ff778b9e5010c14f0b1713da5367d49511782a7e0251f830cbaad1efb53bb2daad5ffb1c182b96effe947c92fc5308c6a279c83db74a8197e06675c52
-  data.tar.gz: b8b24448d5c6f20feef017c14e5b85621f5b7c60823af16a613f3924ac352b6c21e179c8f85d07041941db34b2052f1329bd6ea002406522f7ff0d9b43ca8c2d
+  metadata.gz: 7964aa2ab8068278edc904cc4e60b2354bf09dff57afefa28b9c7a0cc26d2f59c1cf11a42fc57598eed97bb7140740d5e37a292d1add92e37da7a0f7d18ac3be
+  data.tar.gz: 45999be4ea59596c5322edb3e560ae39980f893eb617c79e1fcb6b2eed1ca289c2a1aba7325809b2ed5f54c4ef396a29ad191aacfb4261433aefce4bfd14657f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudcannon-jekyll-bookshop (2.0.0)
+    cloudcannon-jekyll-bookshop (2.0.4)
       dry-inflector (>= 0.1, < 1.0)
       jekyll (>= 3.7, < 5.0)
       node-runner (>= 1.0, < 2.0)

data/lib/cloudcannon-jekyll-bookshop/structures.rb

@@ -58,18 +58,47 @@ module CloudCannonJekyllBookshop
       Jekyll.logger.info "Bookshop:",
                          "Parsing Stories from #{base_path}"
 
-      threads = []
-      Dir.glob("**/*.{bookshop}.{toml,tml,tom,tm}", :base => base_path).each do |f|
-        threads << Thread.new do
-          raw_file = File.read(base_path + "/" + f)
-          component = load_component(raw_file)
-
-          transform_component(f, component).each do |transformed_component|
-            add_structure(site.config["_array_structures"], transformed_component)
+      files = Dir.glob("**/*.{bookshop}.{toml,tml,tom,tm}", :base => base_path);
+
+      read_attempts = 0
+      while files.size > 0 && read_attempts < 5
+        processing = files.map(&:clone)
+        files = []
+        threads = []
+        processing.each do |f|
+          threads << Thread.new do
+            begin
+              raw_file = File.read(base_path + "/" + f)
+              component = load_component(raw_file)
+    
+              transform_component(f, component).each do |transformed_component|
+                add_structure(site.config["_array_structures"], transformed_component)
+              end
+            rescue
+              Thread.current[:output] = f
+            end
           end
         end
+        threads.each do |t|
+          t.join
+          files << t[:output] if t[:output]
+        end
+        Jekyll.logger.info "Bookshop:",
+                           "Had trouble reading #{files.size} file(s), retrying" if files.size > 0
+        read_attempts += 1
+      end
+
+      if files.size > 0
+        Jekyll.logger.error "Bookshop:",
+                            "❌ Failed to read #{files.size} file(s)"
+        files.each do |f|
+          Jekyll.logger.error "Bookshop:",
+                              "❌ Failed to read #{f}"
+        end
+        Jekyll.logger.error "Bookshop:",
+                            "❌ Check your TOML files are valid."
+        exit 1
       end
-      threads.each(&:join)
     end
 
     def self.setup_helpers

data/lib/cloudcannon-jekyll-bookshop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyllBookshop
-  VERSION = "2.0.0"
+  VERSION = "2.0.4"
 end

data/node_modules/@bookshop/cloudcannon-structures/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bookshop/cloudcannon-structures",
-  "version": "2.0.0",
+  "version": "2.0.4",
   "description": "Convert a Bookshop object into a CloudCannon structure",
   "main": "main.js",
   "scripts": {
@@ -16,7 +16,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@bookshop/toml-narrator": "2.0.0",
+    "@bookshop/toml-narrator": "2.0.4",
     "@ltd/j-toml": "^1.17.0",
     "ava": "^3.15.0",
     "nyc": "^15.1.0",

data/node_modules/@bookshop/toml-narrator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bookshop/toml-narrator",
-  "version": "2.0.0",
+  "version": "2.0.4",
   "description": "Rewrite Bookshop TOML files to preserve comments",
   "main": "main.js",
   "scripts": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll