easol-canvas 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e459457eae0524f0281bb9ecf65bd3070bb1673d43f5db5c310312a2117df4
-  data.tar.gz: 1f50ab28d983d59c985295fa5899ea7b19e5d8d202a5595f0828aca562ad0830
+  metadata.gz: 02a735325d86666992a3673a94898fd3ad6800e11c4efbe74b34eb7126b349cf
+  data.tar.gz: e86117c8bcc022a091448f90f4107aa9b07bc51c8d895e15937643ce0fe9502f
 SHA512:
-  metadata.gz: 8f9d688d4ac0f97731d8ec38e548dc5f69a6c29546a029ee9825e9e5e30f58c4dba0d1a8331846e2f8f5166f735ab3a88cb5063d8ae59a95fb1904886e27a85a
-  data.tar.gz: c0c3977a8d4ad41df4ed9b43e53e4699e555db5d4c0596605d990e722de927108a9ecfbccfce02d8aae0da58b0f9c10a7ed604a099b24db6f831be6116750814
+  metadata.gz: c2ed2183d3766d3aa7daccfb40f35685739940e9e48cb419efd511d81e232e01f4865f58a06a0b07edd33786ab841ac6a6586331d874381a2722cfaf7e4dc4cb
+  data.tar.gz: 2deb9d2f391b9e47f76c5ceac8691e1786769992f684ed6ff11d4f9f6ce9a5a51ad98d40c6c968f87407d9775f1cdf01147e853aad5632fd57ff90b784728403

data/bin/canvas

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/canvas'
+$LOAD_PATH.push File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
+require_relative "../lib/canvas"
 
 Canvas::Cli.start(ARGV)

data/lib/canvas/checks/valid_liquid_check.rb

@@ -38,6 +38,7 @@ module Canvas
       register_tag("easol_badge", ::Liquid::Tag)
       register_tag("accommodation_availability", ::Liquid::Block)
       register_tag("cache", ::Liquid::Block)
+      register_tag("currency_switcher", ::Liquid::Tag)
     end
   end
 end

data/lib/canvas/lint.rb

@@ -6,17 +6,18 @@ module Canvas
   #:documented:
   class Lint
     def run
-      output_context = CLI::UI::SpinGroup.new(auto_debrief: false)
+      spin_group = CLI::UI::SpinGroup.new(auto_debrief: false)
 
-      @checks = Checks.registered.map(&:new)
+      @failed_checks = {}
 
-      @checks.each do |check|
-        run_check(check, output_context)
+      checks = Checks.registered.map(&:new)
+      checks.each do |check|
+        run_check(check, spin_group)
       end
 
-      output_context.wait
+      spin_group.wait
 
-      if @checks.any?(&:failed?)
+      if @failed_checks.any?
         puts debrief_message
         exit 1
       end
@@ -24,20 +25,39 @@ module Canvas
 
     private
 
-    def run_check(check, output_context)
-      output_context.add(check.class.name) do
-        check.run
-        raise if check.offenses.any?
+    def run_check(check, spin_group)
+      offenses = run_check_and_return_offenses(check)
+
+      output_check(
+        spin_group,
+        name: check.class.name,
+        success: offenses.empty?
+      )
+
+      if offenses.any?
+        @failed_checks[check.class.name] = offenses
       end
     end
 
+    def output_check(spin_group, name:, success:)
+      spin_group.add(name) do
+        raise if !success
+      end
+    end
+
+    def run_check_and_return_offenses(check)
+      check.run
+      check.offenses.map(&:message)
+    rescue => ex
+      [ex.message + "\n" + ex.backtrace.join("\n")]
+    end
+
     def debrief_message
       CLI::UI::Frame.open("Failures", color: :red) do
-        failed_checks = @checks.filter(&:failed?)
-        failed_checks.map do |check|
-          CLI::UI::Frame.open(check.class.name, color: :red) do
-            output = check.offenses.map { |offense|
-              CLI::UI.fmt "{{x}} #{offense.message}"
+        @failed_checks.map do |check_name, messages|
+          CLI::UI::Frame.open(check_name, color: :red) do
+            output = messages.map { |message|
+              CLI::UI.fmt "{{x}} #{message}"
             }
             puts output.join("\n")
           end

data/lib/canvas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canvas
-  VERSION = "3.0.0"
+  VERSION = "3.1.1"
 end

data/lib/canvas.rb

@@ -7,7 +7,7 @@ module Canvas
   autoload :Constants, "canvas/constants"
   autoload :Lint, "canvas/lint"
   autoload :Offense, "canvas/offense"
-  autoload :Version, "canvas/version"
+  autoload :VERSION, "canvas/version"
 end
 
 # We need to ensure Canvas::Validator::SchemaAttribute::Base is required first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Kyle Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: CLI to help with building themes for Easol