nanoc-cli 4.12.7 → 4.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ce31131dfbd628ae35493fc601ca5436f96e6a144634a14d3d6c67e1a9208a
-  data.tar.gz: 7e280e823981a6ed4b4c21a5efd109be05dcd2add68da30adbee6578bdd7bf88
+  metadata.gz: 5d8a8f6896a3271b909b3dc379dedfd047887d018439768e72211a34d3aa98d3
+  data.tar.gz: a8f411071943c4f155d8bc3a236c6b19d6cd6bdb5d938f327a3200d01f50f69c
 SHA512:
-  metadata.gz: 56ed6bc3516d7d6551de28bee7db494aef1ba3632b63a1f1fa85e6f8b1c1d278c7d08d780ee56a8e3ad1a1302798944ecdc1abd71bcb394c153b003f72c3c12d
-  data.tar.gz: 2292a387d814b7ac3c80548528ef03a6a8c25d6d164ac05ad9b0ab568104a690ae9d78a069c75d9bb35370067475e7ccb2387c42c198ccfefbbe24ca6d437e19
+  metadata.gz: 82bffc4da578b0a27c2d74cf7e8381263fd0f4d1eb185a995c8b0c0afcd67472b9216d7f0765f36a9c1438b64121967f623cd4f9c4704a88306ca76cb761d135
+  data.tar.gz: 330f4a48d65f629d7f6352824e43c325af5ee98c5b94358b5a0bb4661870db4fbc39914c377fbd5ff3ce9a49c6e6fc50419d525aff153a3ae36352a1d1133e6c

data/lib/nanoc/cli/cleaning_stream.rb

@@ -139,11 +139,9 @@ module Nanoc
       end
 
       # @see ARGF.set_encoding
-      # rubocop:disable Naming/AccessorMethodName
       def set_encoding(*args)
         @stream.set_encoding(*args)
       end
-      # rubocop:enable Naming/AccessorMethodName
 
       protected
 

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/commands/view.rb

@@ -4,11 +4,11 @@ usage 'view [options]'
 summary 'start the web server that serves static files'
 description <<~EOS
   Start the static web server. Unless specified, the web server will run on port
-  3000 and listen on all IP addresses. Running this static web server requires
+  3000 and listen 127.0.0.1. Running this static web server requires
   `adsf` (not `asdf`!).
 EOS
 
-required :H, :handler, 'specify the handler to use (webrick/mongrel/...)'
+required :H, :handler, 'specify the handler to use (webrick/puma/...)'
 required :o, :host,    'specify the host to listen on (default: 127.0.0.1)', default: '127.0.0.1'
 required :p, :port,    'specify the port to listen on (default: 3000)', transform: Nanoc::CLI::Transform::Port, default: 3000
 flag :L, :'live-reload', 'reload on changes'

data/lib/nanoc/cli/compile_listeners/timing_recorder.rb

@@ -25,6 +25,8 @@ module Nanoc::CLI::CompileListeners
 
     # @see Listener#start
     def start
+      Nanoc::Core::Instrumentor.enable
+
       on(:stage_ran) do |duration, klass|
         @stages_summary.observe(duration, name: klass.to_s.sub(/.*::/, ''))
       end
@@ -65,6 +67,8 @@ module Nanoc::CLI::CompileListeners
 
     # @see Listener#stop
     def stop
+      Nanoc::Core::Instrumentor.disable
+
       print_profiling_feedback
     end
 

data/lib/nanoc/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module CLI
-    VERSION = '4.12.7'
+    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.7
+  version: 4.12.9
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 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.7
+        version: 4.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.7
+        version: 4.12.9
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: CLI for Nanoc