nanoc-cli 4.12.17 → 4.12.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84630fa2f9d314d2d20c7b1b268070250b20a8589e3135f4bfa7c059fe4ab22c
-  data.tar.gz: d85a5fa4219daad3c3f6c9ae96b955fdc7d55eccee1c4bc24f6b55a658c736e4
+  metadata.gz: 06a03025f7eef087022fff79f2c76e348399cbb8534452b0859817ac1ab8f8e2
+  data.tar.gz: af695835bf0f91fa37ce37cd7382810fe13219eada71486e4ee73feff4c15fea
 SHA512:
-  metadata.gz: 615ed3e9ba9cb7f3a2d57ae4fc3f531cc5f821244b85d8168ff81dd4fadf7a3d5e82c3e3fd7bf22f9438ba754c87e23a45ea27030f8dd04ae94bb57ed6406a6e
-  data.tar.gz: ce24b3cfaecd54e0de73c28bed0601944d958ea4667d6383aa4effdb6165bd0ac1b8c91c0658a983c9681b2cfd4bcbab61fe3c884fdcb1dc296dea3816e338d5
+  metadata.gz: ad2e443bf66d784f8bc467c3f8e0fd38ad58b016a3fa372e10f7e9bc8bd81c95d633ba57a3b4da1dcce4e776cf052f4096f0b34e092654e45bdbd9dfe22e3122
+  data.tar.gz: 831aa210f969ed6f564b83fea38dd7ae8e21dd6d52600f77f558dd8133ffccd735aaa00e2aae4f3b2ca462c15df33df2f67cb23e8445e9ef5db4b74aef71868d

data/lib/nanoc/cli/commands/create-site.rb

@@ -18,6 +18,14 @@ module Nanoc::CLI::Commands
       end
     end
 
+    DEFAULT_GEMFILE = <<~EOS unless defined? DEFAULT_GEMFILE
+      # frozen_string_literal: true
+
+      source 'https://rubygems.org'
+
+      gem 'nanoc', '~> #{Nanoc::VERSION.split('.').take(2).join('.')}'
+    EOS
+
     DEFAULT_CONFIG = <<~EOS unless defined? DEFAULT_CONFIG
       # A list of file extensions that Nanoc will consider to be textual rather than
       # binary. If an item with an extension not in this list is found,  the file
@@ -54,7 +62,7 @@ module Nanoc::CLI::Commands
       #  layout '/default.*'
       #
       #  if item.identifier =~ '**/index.*'
-      #    write item.identifier.to_s
+      #    write item.identifier.without_ext + '.html'
       #  else
       #    write item.identifier.without_ext + '/index.html'
       #  end
@@ -240,6 +248,7 @@ module Nanoc::CLI::Commands
         FileUtils.mkdir_p('lib')
         FileUtils.mkdir_p('output')
 
+        write('Gemfile', DEFAULT_GEMFILE)
         write('nanoc.yaml', DEFAULT_CONFIG)
         write('Rules', DEFAULT_RULES)
         write('content/index.html', DEFAULT_ITEM)

data/lib/nanoc/cli/error_handler.rb

@@ -38,7 +38,7 @@ module Nanoc::CLI
       %w[INT TERM].each do |signal|
         Signal.trap(signal) do
           puts
-          exit!(0)
+          exit(0)
         end
       end
 
@@ -55,10 +55,21 @@ module Nanoc::CLI
 
       # Run
       yield
-    rescue Interrupt
-      exit(1)
-    rescue StandardError, ScriptError => e
-      handle_error(e, exit_on_error: exit_on_error)
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      # The exception could be wrapped in a
+      # Nanoc::Core::Errors::CompilationError, so find the
+      # underlying exception and handle that one instead.
+      e = unwrap_error(e)
+
+      case e
+      when Interrupt
+        puts
+        exit(1)
+      when StandardError, ScriptError
+        handle_error(e, exit_on_error: exit_on_error)
+      else
+        raise e
+      end
     end
 
     def handle_error(error, exit_on_error:)
@@ -131,7 +142,7 @@ module Nanoc::CLI
     #
     # @return [void]
     def write_verbose_error(error, stream)
-      stream.puts "Crashlog created at #{Time.now}"
+      stream.puts "Crash log created at #{Time.now}"
 
       write_error_message(stream, error, verbose: true)
       write_error_detail(stream, error)

data/lib/nanoc/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module CLI
-    VERSION = '4.12.17'
+    VERSION = '4.12.18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-cli
 version: !ruby/object:Gem::Version
-  version: 4.12.17
+  version: 4.12.18
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-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.17
+        version: 4.12.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.17
+        version: 4.12.18
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement