nanoc-cli 4.12.0 → 4.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b235b7ea0a271b804d4e7a074af5acacec702cb48d06a4fc8ece9616c9a348dc
-  data.tar.gz: 2a30027b40d53a02853f458f56eb8397eaeaa264f372997eef1d1017d2daf389
+  metadata.gz: b8c952285c6ce33f87061bb808936940483d239df4485a03a70f4b1e01c4fe05
+  data.tar.gz: 39d722ab6a05c03fd80e5103ea8e80155a655638f92b087fbed3dab2dbb79981
 SHA512:
-  metadata.gz: 5256002ad3a90cffd6d56956ab8f62424e7ff86d07991e357289748919cd1a7f527f6569f1a7a9298de0ae1b6188c230a014ceec6c140599cd67493ad4853602
-  data.tar.gz: 199c28de12ebb0d778f78e021d37168ae377d388c2664347f3af3af87056268beae119b4a0ddcef78386d0f9685c9e8571ee3e8dd7d823e4c212da631d77249c
+  metadata.gz: '058b2831ccd021cc654bfc58d77615a9b781e5721a23321cccf55b5615126f5c0bba539fa39cd9161719375a18a1b5865a6c985f738964cde83320edff1985d7'
+  data.tar.gz: f5676bcf4d22f206806b0d1514214a4c0c8d530f01ca4eb56636efdb0491cbbc763ede8c60a981cc8df011052c0d3f90df3d896126de3324e7ba000fe12ec060

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

@@ -99,15 +99,17 @@ module Nanoc::CLI::Commands
               'items'
             when Nanoc::Core::LayoutCollection
               'layouts'
+            when nil
+              '(unknown)'
             else
-              raise Nanoc::Core::Errors::InternalInconsistency, "unexpected pred type #{pred}"
+              raise Nanoc::Core::Errors::InternalInconsistency, "unexpected pred type #{pred.inspect}"
             end
 
           pred_identifier =
             case pred
             when Nanoc::Core::Document
               pred.identifier.to_s
-            when Nanoc::Core::Configuration
+            when Nanoc::Core::Configuration, nil
               nil
             when Nanoc::Core::IdentifiableCollection
               case dep.props.raw_content
@@ -117,13 +119,13 @@ module Nanoc::CLI::Commands
                 "matching any of #{dep.props.raw_content.sort.join(', ')}"
               end
             else
-              raise Nanoc::Core::Errors::InternalInconsistency, "unexpected pred type #{pred}"
+              raise Nanoc::Core::Errors::InternalInconsistency, "unexpected pred type #{pred.inspect}"
             end
 
           if pred
             puts "  [ #{format '%6s', type} ] (#{dep.props}) #{pred_identifier}"
           else
-            puts '  ( removed item )'
+            puts '  ( removed )'
           end
         end
         puts '  (nothing)' if dependencies.empty?

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

@@ -37,15 +37,22 @@ module Nanoc::CLI::CompileListeners
         duration = @stopwatches[rep].duration
 
         action =
-          if is_created then :create
-          elsif is_modified then :update
-          elsif cached_reps.include?(rep) then :cached
-          else :identical
+          if is_created
+            :create
+          elsif is_modified
+            :update
+          elsif cached_reps.include?(rep)
+            :cached
+          else
+            :identical
           end
         level =
-          if is_created then :high
-          elsif is_modified then :high
-          else :low
+          if is_created
+            :high
+          elsif is_modified
+            :high
+          else
+            :low
           end
 
         # FIXME: do not depend on working directory

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

@@ -141,7 +141,6 @@ module Nanoc::CLI::CompileListeners
       print_table_for_summary_duration(:stages, @stages_summary) if Nanoc::CLI.verbosity >= 2
       print_table_for_summary(:outdatedness_rules, @outdatedness_rules_summary) if Nanoc::CLI.verbosity >= 2
       print_table_for_summary_duration(:load_stores, @load_stores_summary) if Nanoc::CLI.verbosity >= 2
-      print_ddmemoize_metrics if Nanoc::CLI.verbosity >= 2
     end
 
     def print_table_for_summary(name, summary)
@@ -158,11 +157,6 @@ module Nanoc::CLI::CompileListeners
       print_table(table_for_summary_durations(name, summary))
     end
 
-    def print_ddmemoize_metrics
-      puts
-      DDMemoize.print_metrics
-    end
-
     def print_table(rows)
       puts DDMetrics::Table.new(rows).to_s
     end

data/lib/nanoc/cli/error_handler.rb

@@ -114,15 +114,9 @@ module Nanoc::CLI
       stream.puts
       stream.puts 'Captain! We’ve been hit!'
 
-      if forwards_stack_trace?
-        write_stack_trace(stream, error)
-        write_error_message(stream, error)
-        write_item_rep(stream, error)
-      else
-        write_error_message(stream, error)
-        write_item_rep(stream, error)
-        write_stack_trace(stream, error)
-      end
+      write_error_message(stream, error)
+      write_item_rep(stream, error)
+      write_stack_trace(stream, error)
 
       stream.puts
       stream.puts 'A detailed crash log has been written to ./crash.log.'
@@ -148,11 +142,6 @@ module Nanoc::CLI
       write_load_paths(stream, verbose: true)
     end
 
-    # @api private
-    def forwards_stack_trace?
-      ruby_version.start_with?('2.5')
-    end
-
     # @api private
     def trivial?(error)
       case error
@@ -202,7 +191,6 @@ module Nanoc::CLI
       'mustache' => 'mustache',
       'nanoc/live' => 'nanoc-live',
       'nokogiri' => 'nokogiri',
-      'nokogumbo' => 'nokogumbo',
       'pandoc-ruby' => 'pandoc-ruby',
       'pry' => 'pry',
       'rack' => 'rack',
@@ -316,7 +304,7 @@ module Nanoc::CLI
     def write_stack_trace(stream, error, verbose: false)
       write_section_header(stream, 'Stack trace', verbose: verbose)
 
-      writer = Nanoc::CLI::StackTraceWriter.new(stream, forwards: forwards_stack_trace?)
+      writer = Nanoc::CLI::StackTraceWriter.new(stream)
       writer.write(unwrap_error(error), verbose: verbose)
     end
 

data/lib/nanoc/cli/stack_trace_writer.rb

@@ -3,22 +3,11 @@
 module Nanoc
   module CLI
     class StackTraceWriter
-      def initialize(stream, forwards:)
+      def initialize(stream)
         @stream = stream
-        @forwards = forwards
       end
 
       def write(error, verbose:)
-        if @forwards
-          write_forwards(error, verbose: verbose)
-        else
-          write_backwards(error, verbose: verbose)
-        end
-      end
-
-      private
-
-      def write_backwards(error, verbose:)
         count = verbose ? -1 : 10
 
         error.backtrace[0...count].each_with_index do |item, index|
@@ -29,23 +18,6 @@ module Nanoc
           @stream.puts "  ... #{error.backtrace.size - count} lines omitted (see crash.log for details)"
         end
       end
-
-      def write_forwards(error, verbose:)
-        count = 10
-        backtrace = verbose ? error.backtrace : error.backtrace.take(count)
-
-        if !verbose && error.backtrace.size > count
-          @stream.puts "  ... #{error.backtrace.size - count} lines omitted (see crash.log for details)"
-        end
-
-        backtrace.each_with_index.to_a.reverse_each do |(item, index)|
-          if index.zero?
-            @stream.puts "  #{item}"
-          else
-            @stream.puts "  #{index}. from #{item}"
-          end
-        end
-      end
     end
   end
 end

data/lib/nanoc/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module CLI
-    VERSION = '4.12.0'
+    VERSION = '4.12.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-cli
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.12.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2022-01-15 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.0
+        version: 4.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.4
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,8 @@ files:
 homepage: https://nanoc.ws/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -113,14 +114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: CLI for Nanoc