nanoc-cli 4.11.23 → 4.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469b830a4987d47a248bd19e5e6b94676dd192f288a31f4cf2a037446c8c703a
-  data.tar.gz: ede58acf6a6a1cc9218d365243b2391fa90625be0790a7cb10d8002b58d8737d
+  metadata.gz: a6102307353730ee35fbda3e32a6e4e067c357b9f59fe7ba37f77915f86a7fe9
+  data.tar.gz: ecf963e25dd03a717113777a96c2bf1a5f08f6df87b85f92e755e6066f5046c3
 SHA512:
-  metadata.gz: f78264e89709fd7e5194d94081c34ea4565ded61e7751eb5172f107b9ed62d8834d7393599518381e3432209a6b30cf64bdbd0b09fe9bb47a3e96f520b8480db
-  data.tar.gz: d9ef79a480711969039dd8d1a1939eae14fc4458d1d1962e9db776e851eba4c94e889dbe81154de12b0e5854af24a40932eadc37627fff9975ad083fcff1d51b
+  metadata.gz: 02c656f32a80ee458471f6dc70eeff01380bb4a802c967381624e604e7cd1c269bcb34c865e1e1459d7ac97c88788cfc8f4896d05616472bef48a0842436496d
+  data.tar.gz: 7a4055654927ebfa816aa019fe846b451731669a88195757f187262b7ad6df4450c03c7b5de016496b9aeefc5e18b2678943a1271e331d7e47c1efac427f2c61

data/lib/nanoc/cli/commands/compile.rb

@@ -8,9 +8,7 @@ EOS
 no_params
 
 flag nil, :diff, 'generate diff'
-if Nanoc::Core::Feature.enabled?(Nanoc::Core::Feature::LIVE_CMD)
-  flag :w, :watch, 'watch for changes and recompile when needed'
-end
+flag :W, :watch, 'watch for changes and recompile when needed'
 
 module Nanoc::CLI::Commands
   class Compile < ::Nanoc::CLI::CommandRunner

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/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.11.23'
+    VERSION = '4.12.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-cli
 version: !ruby/object:Gem::Version
-  version: 4.11.23
+  version: 4.12.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.23
+        version: 4.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.23
+        version: 4.12.3
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +113,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.5
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: CLI for Nanoc