nanoc-cli 4.12.8 → 4.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1cf68ac090fa2dd06e13f442217c6cccc371758ea21d07a11a21135520d94c
-  data.tar.gz: 95aacadb615bc66b00e11e1ee041acea4cda3c2b3f870a6c06cc6d3e498a2195
+  metadata.gz: 5d8a8f6896a3271b909b3dc379dedfd047887d018439768e72211a34d3aa98d3
+  data.tar.gz: a8f411071943c4f155d8bc3a236c6b19d6cd6bdb5d938f327a3200d01f50f69c
 SHA512:
-  metadata.gz: 18d3bf2e0818f3271296fac135710b482836838ec5eb937ff60078d97971d2d71a795d8d53f9a27608d7ecc7c78ae62d57e1479c0fd5c344ad69abfd04cc08b4
-  data.tar.gz: b028da04b55c9078be38662afedfe43bbe5ca35b7c128e4f7134f385d5c23f23fbcb4a854903a25ff58fe49ae3a68eb02b3b7a8e21b74ecfe02d1e84069ed1df
+  metadata.gz: 82bffc4da578b0a27c2d74cf7e8381263fd0f4d1eb185a995c8b0c0afcd67472b9216d7f0765f36a9c1438b64121967f623cd4f9c4704a88306ca76cb761d135
+  data.tar.gz: 330f4a48d65f629d7f6352824e43c325af5ee98c5b94358b5a0bb4661870db4fbc39914c377fbd5ff3ce9a49c6e6fc50419d525aff153a3ae36352a1d1133e6c

data/lib/nanoc/cli/commands/show-data.rb

@@ -105,25 +105,26 @@ module Nanoc::CLI::Commands
               raise Nanoc::Core::Errors::InternalInconsistency, "unexpected pred type #{pred.inspect}"
             end
 
-          pred_identifier =
+          details =
             case pred
             when Nanoc::Core::Document
-              pred.identifier.to_s
+              [pred.identifier.to_s]
             when Nanoc::Core::Configuration, nil
-              nil
+              []
             when Nanoc::Core::IdentifiableCollection
-              case dep.props.raw_content
-              when true
-                'matching any'
-              else
-                "matching any of #{dep.props.raw_content.sort.join(', ')}"
-              end
+              describe_identifiable_collection_dependency(dep)
             else
               raise Nanoc::Core::Errors::InternalInconsistency, "unexpected pred type #{pred.inspect}"
             end
 
           if pred
-            puts "  [ #{format '%6s', type} ] (#{dep.props}) #{pred_identifier}"
+            print "  [ #{format '%7s', type} ] (#{dep.props})"
+
+            if details.any?
+              print ' '
+            end
+
+            puts details.join("\n                     ")
           else
             puts '  ( removed )'
           end
@@ -132,6 +133,47 @@ module Nanoc::CLI::Commands
       end
     end
 
+    def describe_identifiable_collection_dependency(dep)
+      outcome = []
+
+      case dep.props.raw_content
+      when true
+        outcome << 'matching any identifier'
+      when Set
+        dep.props.raw_content.sort.each do |x|
+          outcome << "matching identifier #{x}"
+        end
+      end
+
+      if dep.props.attributes
+        case dep.props.attributes
+        when true
+          outcome << 'matching any attribute'
+        when Set
+          dep.props.attributes.each do |elem|
+            case elem
+            when Symbol
+              outcome << "matching attribute #{elem.inspect} (any value)"
+            when Array
+              outcome << "matching attribute pair #{elem[0].inspect} => #{elem[1].inspect}"
+            else
+              raise(
+                Nanoc::Core::Errors::InternalInconsistency,
+                "unexpected prop attribute element #{elem.inspect}",
+              )
+            end
+          end
+        else
+          raise(
+            Nanoc::Core::Errors::InternalInconsistency,
+            "unexpected prop attribute #{dep.props.attributes.inspect}",
+          )
+        end
+      end
+
+      outcome
+    end
+
     def print_item_rep_paths(items, reps)
       print_header('Item representation paths')
 

data/lib/nanoc/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module CLI
-    VERSION = '4.12.8'
+    VERSION = '4.12.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-cli
 version: !ruby/object:Gem::Version
-  version: 4.12.8
+  version: 4.12.9
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.8
+        version: 4.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.8
+        version: 4.12.9
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement