cloudcannon-jekyll-bookshop 2.0.0.pre.beta.41 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8a43c880675addd3e785d46f3d517d497e25fdc12aa38aabbaa10be559a6620
-  data.tar.gz: e13f34a634080907df956e25cc6f3d5517655f5b36e8a223d83cc4a4fd6cc8a4
+  metadata.gz: 0a1b63dc14706c1f4274b391bbbbf18aba00c9521f8771065612512cd54d7a36
+  data.tar.gz: f6a8930b4c07a262f4f7fc93121a3a741cc8a26034fd523840826360fc7c1a6f
 SHA512:
-  metadata.gz: 87ae15232cb073cd6fc560f9f627b105ed05780e96028910d4699b49b559845a46df20d20a468126969bfcb5d3ac42d7ded910db4b9e468d7f7efcdffb2d6b12
-  data.tar.gz: a9ea515a8b18a8c99f8e9117e30c7bdf2d19bbcd62e046792b7f71ab8bbaea72a9fe73693de6f51d166b95b3d07bb714f24f66f0a982506cdc4eac970027ef6e
+  metadata.gz: dad2a0a51ff4bd99d4457da7badde8701e71bcfbdb850580459ef567a5bf003f35a32a0f42f440e0526c8ad549ae70cb5c6e48153c1df87afba057763623b56c
+  data.tar.gz: f8bfc80a9319b9f98cc399c8249fe0ddf0cb16fe9d55f0497842aaf258f6927bd3c49ecc2f0dd7ea7bc86fdfa933b71fe346422a7f380518ebbb483056d0cbb1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudcannon-jekyll-bookshop (2.0.0.pre.beta.41)
+    cloudcannon-jekyll-bookshop (2.0.3)
       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.pre.beta.41"
+  VERSION = "2.0.3"
 end

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

@@ -1,6 +1,6 @@
 {
   "name": "@bookshop/cloudcannon-structures",
-  "version": "2.0.0-beta.41",
+  "version": "2.0.3",
   "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-beta.41",
+    "@bookshop/toml-narrator": "2.0.3",
     "@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-beta.41",
+  "version": "2.0.3",
   "description": "Rewrite Bookshop TOML files to preserve comments",
   "main": "main.js",
   "scripts": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.41
+  version: 2.0.3
 platform: ruby
 authors:
 - Liam Bigelow
@@ -175,9 +175,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: