nanoc-cli 4.12.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b235b7ea0a271b804d4e7a074af5acacec702cb48d06a4fc8ece9616c9a348dc
-  data.tar.gz: 2a30027b40d53a02853f458f56eb8397eaeaa264f372997eef1d1017d2daf389
+  metadata.gz: 9d5a799c008340791d94c5e37eb15d38f6ed571a13fd9e341e8ac8fc47ba2d76
+  data.tar.gz: ce4f61ba1095823cd9f9257ad73842055abb3e908745fc8840fe983f463081bc
 SHA512:
-  metadata.gz: 5256002ad3a90cffd6d56956ab8f62424e7ff86d07991e357289748919cd1a7f527f6569f1a7a9298de0ae1b6188c230a014ceec6c140599cd67493ad4853602
-  data.tar.gz: 199c28de12ebb0d778f78e021d37168ae377d388c2664347f3af3af87056268beae119b4a0ddcef78386d0f9685c9e8571ee3e8dd7d823e4c212da631d77249c
+  metadata.gz: 2bd59730dd8d63734eb850c31eacbba8d49bbba0f1f4c78b7b3ff987003c45d492529d5620695d08f33cb856bcd5decedc50042027e6933aa878e9561a27c6b7
+  data.tar.gz: 6f2f6a7253fa17e608d82e90f12a257c494bb3d7445bb87daa3633baf659f53704cc944606bb085d394bdde317211a55b1b8c1f69bc386d9c188772110cdf971

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
@@ -316,7 +305,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.1'
   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.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-04-05 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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.1
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: CLI for Nanoc