nanoc-cli 4.14.6 → 4.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7e78bf8fdec42df624c8cc9c3fd3611ddb3a19e9d2807d989ac9b59144a3d06
-  data.tar.gz: 060d23ac565f5250a60b7cc59fcd0cd77e628af07a8a64023fff0f9f35d23f96
+  metadata.gz: 1c7021eaff35161ce9760b1b9a68d3889644a0176b81c9a7fc6a3f52f083c1d0
+  data.tar.gz: e9915cda1dee1e375c00d603354ceb8d5a560a0fdf8140a3fbfb41d56fed5c45
 SHA512:
-  metadata.gz: 2288a826f57548c7ebd4f73e6b054295ced881c976b8ddbe705b4dff16280ca3c1511c58941e3a785a118f7ebc78e7959083eed05a8725c354e63008427c6f46
-  data.tar.gz: 0407f1da3ddad9047dfcc5df09edc3bac25f991e9ae290b097871789ef0609b2b6969c7febed8fb2c7fbab0da016d17e616e648a7da05aacc8c62ad7424497ee
+  metadata.gz: b49b4d2941ebb911ce20d8c47a38d7f426ebbbe833837d30f3a8058bdc3c5ecc7463372d3484697b85f834cb726b5521ea5021f95578a03e5184ba1b1b4d6c6f
+  data.tar.gz: 41ae6d1b8d3ae8996269819545f5931d44049efa5f57ec8a523949864f9e3116062606778f511cd1597d1ad472efc90cee28ace1c76ab94ea636be41d7070d01

data/lib/nanoc/cli/command_runner.rb

@@ -40,7 +40,8 @@ module Nanoc
       def self.enter_site_dir
         dir = find_site_dir
         if dir.nil?
-          raise ::Nanoc::Core::TrivialError, 'The current working directory, nor any of its parents, seems to be a Nanoc site.'
+          raise ::Nanoc::Core::TrivialError,
+                'The current working directory, nor any of its parents, seems to be a Nanoc site.'
         end
 
         return if Dir.getwd == dir
@@ -57,7 +58,8 @@ module Nanoc
 
         $stderr.print 'Loading site… '
         $stderr.flush
-        site = Nanoc::Core::SiteLoader.new.new_from_cwd
+        config = Nanoc::Core::ConfigLoader.new.new_from_cwd
+        site = Nanoc::Core::SiteLoader.new.new_from_config(config)
 
         $stderr.puts 'done'
         site

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

@@ -33,16 +33,18 @@ module Nanoc::CLI::Commands
     def run_once
       time_before = Time.now
 
-      @site = load_site
+      config = Nanoc::Core::ConfigLoader.new.new_from_cwd
 
-      puts 'Compiling site…'
-      compiler = Nanoc::Core::Compiler.new_for(@site, focus: options[:focus])
       listener = Nanoc::CLI::CompileListeners::Aggregate.new(
         command_runner: self,
-        site: @site,
-        compiler:,
+        config:,
       )
       listener.run_while do
+        puts 'Loading site…'
+        site = Nanoc::Core::SiteLoader.new.new_from_config(config)
+
+        puts 'Compiling site…'
+        compiler = Nanoc::Core::Compiler.new_for(site, focus: options[:focus])
         compiler.run_until_end
       end
 

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

@@ -9,15 +9,6 @@ param :path
 
 module Nanoc::CLI::Commands
   class CreateSite < ::Nanoc::CLI::CommandRunner
-    class << self
-      protected
-
-      # Converts the given array to YAML format
-      def array_to_yaml(array)
-        '[ ' + array.map { |s| "'" + s + "'" }.join(', ') + ' ]'
-      end
-    end
-
     DEFAULT_GEMFILE = <<~EOS.freeze unless defined? DEFAULT_GEMFILE
       # frozen_string_literal: true
 
@@ -30,7 +21,7 @@ module Nanoc::CLI::Commands
       # 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
       # will be considered as binary.
-      text_extensions: #{array_to_yaml(Nanoc::Core::Configuration::DEFAULT_CONFIG[:text_extensions])}
+      text_extensions: #{JSON.dump(Nanoc::Core::Configuration::DEFAULT_CONFIG[:text_extensions])}
 
       prune:
         auto_prune: true
@@ -43,6 +34,8 @@ module Nanoc::CLI::Commands
     DEFAULT_RULES = <<~EOS unless defined? DEFAULT_RULES
       #!/usr/bin/env ruby
 
+      passthrough '/robots.txt'
+
       compile '/**/*.html' do
         layout '/default.*'
 
@@ -73,6 +66,11 @@ module Nanoc::CLI::Commands
       layout '/**/*', :erb
     EOS
 
+    ROBOTS_TXT_ITEM = <<~EOS unless defined? ROBOTS_TXT_ITEM
+      User-agent: *
+      Allow: /
+    EOS
+
     DEFAULT_ITEM = <<~EOS unless defined? DEFAULT_ITEM
       ---
       title: Home
@@ -230,7 +228,7 @@ module Nanoc::CLI::Commands
       path = arguments[:path]
 
       # Check whether site exists
-      if File.exist?(path) && (!File.directory?(path) || !(Dir.entries(path) - %w[. ..]).empty?) && !options[:force]
+      if File.exist?(path) && (!File.directory?(path) || !(Dir.entries(path) - ['.', '..']).empty?) && !options[:force]
         raise(
           Nanoc::Core::TrivialError,
           "The site was not created because '#{path}' already exists. " \
@@ -250,6 +248,7 @@ module Nanoc::CLI::Commands
         write('nanoc.yaml', DEFAULT_CONFIG)
         write('Rules', DEFAULT_RULES)
         write('content/index.html', DEFAULT_ITEM)
+        write('content/robots.txt', ROBOTS_TXT_ITEM)
         write('content/stylesheet.css', DEFAULT_STYLESHEET)
         write('layouts/default.html', DEFAULT_LAYOUT)
       end

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

@@ -23,7 +23,7 @@ module Nanoc::CLI::Commands
       reps = res.fetch(:reps)
 
       listener_class = Nanoc::CLI::CompileListeners::FileActionPrinter
-      listener = listener_class.new(reps:)
+      listener = listener_class.new
       listener.start_safely
 
       if options.key?(:yes)
@@ -31,9 +31,14 @@ module Nanoc::CLI::Commands
       elsif options.key?(:'dry-run')
         Nanoc::Core::Pruner.new(@site.config, reps, exclude: prune_config_exclude, dry_run: true).run
       else
-        $stderr.puts 'WARNING: Since the prune command is a destructive command, it requires an additional --yes flag in order to work.'
+        $stderr.puts 'WARNING: Since the prune command is a destructive ' \
+                     'command, it requires an additional --yes flag in order to work.'
         $stderr.puts
-        $stderr.puts 'Please ensure that the output directory does not contain any files (such as images or stylesheets) that are necessary but are not managed by Nanoc. If you want to get a list of all files that would be removed, pass --dry-run.'
+        $stderr.puts 'Please ensure that the output directory does not ' \
+                     'contain any files (such as images or stylesheets) that ' \
+                     'are necessary but are not managed by Nanoc. If you ' \
+                     'want to get a list of all files that would be removed, ' \
+                     'pass --dry-run.'
         exit 1
       end
     ensure

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

@@ -28,10 +28,10 @@ module Nanoc::CLI::Commands
 
     def run
       # Get list of plugins (before and after)
-      plugins_before = PLUGIN_CLASSES.keys.each_with_object({}) { |c, acc| acc[c] = c.all }
+      plugins_before = PLUGIN_CLASSES.keys.to_h { |c| [c, c.all] }
       site = load_site
       site&.code_snippets
-      plugins_after = PLUGIN_CLASSES.keys.each_with_object({}) { |c, acc| acc[c] = c.all }
+      plugins_after = PLUGIN_CLASSES.keys.to_h { |c| [c, c.all] }
 
       # Divide list of plugins into builtin and custom
       plugins_builtin = plugins_before
@@ -55,7 +55,7 @@ module Nanoc::CLI::Commands
         puts
 
         # Print plugins organised by subtype
-        %i[builtin custom].each do |type|
+        [:builtin, :custom].each do |type|
           # Find relevant plugins
           relevant_plugins = plugins_with_this_superclass[type]
 

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

@@ -8,10 +8,13 @@ description <<~EOS
   `adsf` (not `asdf`!).
 EOS
 
-option :H, :handler,       'specify the handler to use (webrick/puma/...)', argument: :required
-option :o, :host,          'specify the host to listen on', default: '127.0.0.1', argument: :required
-option :p, :port,          'specify the port to listen on', transform: Nanoc::CLI::Transform::Port, default: 3000, argument: :required
-flag   :L, :'live-reload', 'reload on changes'
+option :H, :handler,       'specify the handler to use (webrick/puma/...)',
+       argument: :required
+option :o, :host,          'specify the host to listen on',
+       default: '127.0.0.1', argument: :required
+option :p, :port,          'specify the port to listen on',
+       transform: Nanoc::CLI::Transform::Port, default: 3000, argument: :required
+flag :L, :'live-reload', 'reload on changes'
 no_params
 
 module Nanoc::CLI::Commands

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

@@ -6,7 +6,7 @@ module Nanoc::CLI::CompileListeners
       super()
     end
 
-    def self.enable_for?(command_runner, site) # rubocop:disable Lint/UnusedMethodArgument
+    def self.enable_for?(command_runner, config) # rubocop:disable Lint/UnusedMethodArgument
       true
     end
 

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

@@ -2,9 +2,10 @@
 
 module Nanoc::CLI::CompileListeners
   class Aggregate < Abstract
-    def initialize(command_runner:, site:, compiler:)
-      @site = site
-      @compiler = compiler
+    def initialize(command_runner:, config:)
+      super()
+
+      @config = config
       @command_runner = command_runner
 
       @listener_classes = self.class.default_listener_classes
@@ -30,13 +31,10 @@ module Nanoc::CLI::CompileListeners
     protected
 
     def setup_listeners
-      res = @compiler.run_until_reps_built
-      reps = res.fetch(:reps)
-
       @listeners =
         @listener_classes
-        .select { |klass| klass.enable_for?(@command_runner, @site) }
-        .map    { |klass| klass.new(reps:) }
+        .select { |klass| klass.enable_for?(@command_runner, @config) }
+        .map(&:new)
 
       @listeners.each(&:start_safely)
     end

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

@@ -3,7 +3,7 @@
 module Nanoc::CLI::CompileListeners
   class DebugPrinter < Abstract
     # @see Listener#enable_for?
-    def self.enable_for?(command_runner, _site)
+    def self.enable_for?(command_runner, _config)
       command_runner.debug?
     end
 
@@ -12,7 +12,6 @@ module Nanoc::CLI::CompileListeners
       'content' => :green,
       'filtering' => :yellow,
       'dependency_tracking' => :blue,
-      'phase' => :magenta,
       'stage' => :cyan,
     }.freeze
 
@@ -51,26 +50,6 @@ module Nanoc::CLI::CompileListeners
         log('dependency_tracking', "Dependency created from #{src.inspect} onto #{dst.inspect}")
       end
 
-      on(:phase_started) do |phase_name, rep|
-        log('phase', "Phase started: #{phase_name} (rep: #{rep})")
-      end
-
-      on(:phase_yielded) do |phase_name, rep|
-        log('phase', "Phase yielded: #{phase_name} (rep: #{rep})")
-      end
-
-      on(:phase_resumed) do |phase_name, rep|
-        log('phase', "Phase resumed: #{phase_name} (rep: #{rep})")
-      end
-
-      on(:phase_ended) do |phase_name, rep|
-        log('phase', "Phase ended: #{phase_name} (rep: #{rep})")
-      end
-
-      on(:phase_aborted) do |phase_name, rep|
-        log('phase', "Phase aborted: #{phase_name} (rep: #{rep})")
-      end
-
       on(:stage_started) do |stage_name|
         log('stage', "Stage started: #{stage_name}")
       end

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

@@ -46,8 +46,8 @@ module Nanoc::CLI::CompileListeners
     end
 
     # @see Listener#enable_for?
-    def self.enable_for?(command_runner, site)
-      site.config[:enable_output_diff] || command_runner.options[:diff]
+    def self.enable_for?(command_runner, config)
+      config[:enable_output_diff] || command_runner.options[:diff]
     end
 
     # @see Listener#start

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

@@ -2,8 +2,8 @@
 
 module Nanoc::CLI::CompileListeners
   class FileActionPrinter < Abstract
-    def initialize(reps:)
-      @reps = reps
+    def initialize
+      super
 
       @stopwatches = {}
     end
@@ -47,9 +47,7 @@ module Nanoc::CLI::CompileListeners
             :identical
           end
         level =
-          if is_created
-            :high
-          elsif is_modified
+          if is_created || is_modified
             :high
           else
             :low
@@ -81,17 +79,7 @@ module Nanoc::CLI::CompileListeners
           path = path[(Dir.getwd.size + 1)..path.size]
         end
 
-        Nanoc::CLI::Logger.instance.file(:high, :delete, '(dry run) ' + path)
-      end
-    end
-
-    # @see Listener#stop
-    def stop
-      @reps.reject(&:compiled?).each do |rep|
-        raw_paths = rep.raw_paths.values.flatten.uniq
-        raw_paths.each do |raw_path|
-          log(:low, :skip, raw_path, nil)
-        end
+        Nanoc::CLI::Logger.instance.file(:high, :delete, "(dry run) #{path}")
       end
     end
 

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

@@ -2,22 +2,100 @@
 
 module Nanoc::CLI::CompileListeners
   class TimingRecorder < Abstract
+    class Table
+      TOP = 1
+      MIDDLE = 2
+      BOTTOM = 3
+
+      def initialize(header_row, body_rows, footer_row)
+        @header_row = header_row
+        @body_rows = body_rows
+        @footer_row = footer_row
+
+        @rows = [header_row] + body_rows + [footer_row]
+      end
+
+      def to_s
+        columns = @rows.transpose
+        column_lengths = columns.map { |c| c.map(&:size).max }
+
+        [].tap do |lines|
+          # header
+          lines << separator(column_lengths, TOP)
+          lines << row_to_s(@header_row, column_lengths)
+          lines << separator(column_lengths, MIDDLE)
+
+          # body
+          rows = sort_rows(@body_rows)
+          lines.concat(rows.map { |r| row_to_s(r, column_lengths) })
+
+          # footer
+          lines << separator(column_lengths, MIDDLE)
+          lines << row_to_s(@footer_row, column_lengths)
+          lines << separator(column_lengths, BOTTOM)
+        end.join("\n")
+      end
+
+      private
+
+      def sort_rows(rows)
+        rows.sort_by(&:last).reverse
+      end
+
+      def row_to_s(row, column_lengths)
+        values = row.zip(column_lengths).map { |text, length| text.rjust(length) }
+        "│ #{values[0]} │ #{values.drop(1).join('   ')} │"
+      end
+
+      def separator(column_lengths, pos)
+        (+'').tap do |s|
+          s << case pos
+               when TOP
+                 '┌─'
+               when MIDDLE
+                 '├─'
+               when BOTTOM
+                 '└─'
+               end
+
+          s << column_lengths.take(1).map { |l| '─' * l }.join('───')
+
+          s << case pos
+               when TOP
+                 '─┬─'
+               when MIDDLE
+                 '─┼─'
+               when BOTTOM
+                 '─┴─'
+               end
+
+          s << column_lengths.drop(1).map { |l| '─' * l }.join('───')
+
+          s << case pos
+               when TOP
+                 '─┐'
+               when MIDDLE
+                 '─┤'
+               when BOTTOM
+                 '─┘'
+               end
+        end
+      end
+    end
+
     attr_reader :stages_summary
-    attr_reader :phases_summary
     attr_reader :outdatedness_rules_summary
     attr_reader :filters_summary
 
     # @see Listener#enable_for?
-    def self.enable_for?(_command_runner, _site)
+    def self.enable_for?(_command_runner, _config)
       Nanoc::CLI.verbosity >= 1
     end
 
-    # @param [Enumerable<Nanoc::Core::ItemRep>] reps
-    def initialize(reps:)
-      @reps = reps
+    def initialize
+      super
 
       @stages_summary = DDMetrics::Summary.new
-      @phases_summary = DDMetrics::Summary.new
       @outdatedness_rules_summary = DDMetrics::Summary.new
       @filters_summary = DDMetrics::Summary.new
       @load_stores_summary = DDMetrics::Summary.new
@@ -61,8 +139,6 @@ module Nanoc::CLI::CompileListeners
       on(:store_stored) do |duration, klass|
         @store_stores_summary.observe(duration, name: klass.to_s)
       end
-
-      setup_phase_notifications
     end
 
     # @see Listener#stop
@@ -74,44 +150,11 @@ module Nanoc::CLI::CompileListeners
 
     protected
 
-    def setup_phase_notifications
-      stopwatches = {}
-
-      on(:phase_started) do |phase_name, rep|
-        stopwatch = stopwatches[[phase_name, rep]] = DDMetrics::Stopwatch.new
-        stopwatch.start
-      end
-
-      on(:phase_ended) do |phase_name, rep|
-        stopwatch = stopwatches[[phase_name, rep]]
-        stopwatch.stop
-
-        @phases_summary.observe(stopwatch.duration, name: phase_name)
-      end
-
-      on(:phase_yielded) do |phase_name, rep|
-        stopwatch = stopwatches[[phase_name, rep]]
-        stopwatch.stop
-      end
-
-      on(:phase_resumed) do |phase_name, rep|
-        # It probably looks weird that a phase can be resumed even though it was not suspended earlier. This can happen when compilation is suspended, where you’d get the sequence started -> suspended -> started -> resumed.
-        stopwatch = stopwatches[[phase_name, rep]]
-        stopwatch.start unless stopwatch.running?
-      end
-
-      on(:phase_aborted) do |phase_name, rep|
-        stopwatch = stopwatches[[phase_name, rep]]
-        stopwatch.stop if stopwatch.running?
-
-        @phases_summary.observe(stopwatch.duration, name: phase_name)
-      end
-    end
-
     def table_for_summary(name, summary)
-      headers = [name.to_s, 'count', 'min', '.50', '.90', '.95', 'max', 'tot']
+      header_row = [name.to_s, 'count', 'min', '.50', '.90', '.95', 'max', 'tot']
 
-      rows = summary.map do |label, stats|
+      grand_total = 0.0
+      body_rows = summary.map do |label, stats|
         name = label.fetch(:name)
 
         count = stats.count
@@ -122,26 +165,33 @@ module Nanoc::CLI::CompileListeners
         tot   = stats.sum
         max   = stats.max
 
+        grand_total += tot
+
         [name, count.to_s] + [min, p50, p90, p95, max, tot].map { |r| "#{format('%4.2f', r)}s" }
       end
 
-      [headers] + rows
+      footer_row = ['tot', '', '', '', '', '', '', "#{format('%4.2f', grand_total)}s"]
+
+      Table.new(header_row, body_rows, footer_row)
     end
 
     def table_for_summary_durations(name, summary)
-      headers = [name.to_s, 'tot']
+      header_row = [name.to_s, 'tot']
 
-      rows = summary.map do |label, stats|
+      tot = 0.0
+      body_rows = summary.map do |label, stats|
         name = label.fetch(:name)
+        tot += stats.sum
         [name, "#{format('%4.2f', stats.sum)}s"]
       end
 
-      [headers] + rows
+      footer_row = ['tot', "#{format('%4.2f', tot)}s"]
+
+      Table.new(header_row, body_rows, footer_row)
     end
 
     def print_profiling_feedback
       print_table_for_summary(:filters, @filters_summary)
-      print_table_for_summary(:phases, @phases_summary) if Nanoc::CLI.verbosity >= 2
       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
@@ -152,18 +202,14 @@ module Nanoc::CLI::CompileListeners
       return unless summary.any?
 
       puts
-      print_table(table_for_summary(name, summary))
+      puts table_for_summary(name, summary)
     end
 
     def print_table_for_summary_duration(name, summary)
       return unless summary.any?
 
       puts
-      print_table(table_for_summary_durations(name, summary))
-    end
-
-    def print_table(rows)
-      puts DDMetrics::Table.new(rows)
+      puts table_for_summary_durations(name, summary)
     end
   end
 end

data/lib/nanoc/cli/error_handler.rb

@@ -35,7 +35,7 @@ module Nanoc::CLI
     # @return [void]
     def handle_while(exit_on_error:)
       # Set exit handler
-      %w[INT TERM].each do |signal|
+      ['INT', 'TERM'].each do |signal|
         Signal.trap(signal) do
           puts
           exit(0)
@@ -271,7 +271,7 @@ module Nanoc::CLI
       stream.puts
 
       if verbose
-        stream.puts '===== ' + title.upcase + ':'
+        stream.puts "===== #{title.upcase}:"
         stream.puts
       end
     end
@@ -293,7 +293,7 @@ module Nanoc::CLI
     def message_for_error(error)
       case error
       when JsonSchema::AggregateError
-        "\n" + error.errors.map { |e| "  * #{e.pointer}: #{e.message}" }.join("\n")
+        "\n#{error.errors.map { |e| "  * #{e.pointer}: #{e.message}" }.join("\n")}"
       else
         error.message
       end

data/lib/nanoc/cli/logger.rb

@@ -41,10 +41,13 @@ module Nanoc
       # @return [void]
       def file(level, action, name, duration = nil)
         colorizer = Nanoc::CLI::ANSIStringColorizer.new($stdout)
-        colored_action = colorizer.c(action.to_s, *ACTION_COLORS[action.to_sym])
+        colored_action = colorizer.c(
+          format('%9s', action.to_s),
+          *ACTION_COLORS[action.to_sym],
+        )
 
         message = format(
-          '%12s  %s%s',
+          '  %s  %s%s',
           colored_action,
           duration.nil? ? '' : format('[%2.2fs]  ', duration),
           name,

data/lib/nanoc/cli/stream_cleaners/utf8.rb

@@ -13,7 +13,7 @@ module Nanoc
           # FIXME: this decomposition is not generally usable
           str
             .unicode_normalize(:nfkd)
-            .tr('─┼“”‘’', '-+""\'\'')
+            .tr('─│┌┬┐├┼┤└┴┘“”‘’', '-|+++++++++""\'\'')
             .gsub('©', '(c)')
         end
       end

data/lib/nanoc/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module CLI
-    VERSION = '4.14.6'
+    VERSION = '4.14.7'
   end
 end

data/lib/nanoc/cli.rb

@@ -63,7 +63,7 @@ module Nanoc
     def self.enable_utf8?(io)
       return true unless io.tty?
 
-      %w[LC_ALL LC_CTYPE LANG].any? { |e| ENV.fetch(e, nil) =~ /UTF/i }
+      ['LC_ALL', 'LC_CTYPE', 'LANG'].any? { |e| ENV.fetch(e, nil) =~ /UTF/i }
     end
 
     # @return [Boolean] true if color support is present, false if not
@@ -130,7 +130,7 @@ module Nanoc
       @root_command = nil
 
       # Add root command
-      filename = __dir__ + '/cli/commands/nanoc.rb'
+      filename = "#{__dir__}/cli/commands/nanoc.rb"
       @root_command = Cri::Command.load_file(filename, infer_name: true)
 
       # Add help command
@@ -138,7 +138,7 @@ module Nanoc
       add_command(help_cmd)
 
       # Add other commands
-      cmd_filenames = Dir[__dir__ + '/cli/commands/*.rb']
+      cmd_filenames = Dir["#{__dir__}/cli/commands/*.rb"]
       cmd_filenames.each do |cmd_filename|
         basename = File.basename(cmd_filename, '.rb')
 
@@ -198,7 +198,7 @@ module Nanoc
     def self.recursive_contents_of(path)
       return [] unless File.directory?(path)
 
-      files, dirs = *Dir[path + '/*'].sort.partition { |e| File.file?(e) }
+      files, dirs = *Dir["#{path}/*"].partition { |e| File.file?(e) }
       dirs.each { |d| files.concat recursive_contents_of(d) }
       files
     end
@@ -229,8 +229,8 @@ end
 
 loader = Zeitwerk::Loader.new
 loader.inflector = inflector_class.new
-loader.push_dir(__dir__ + '/..')
-loader.ignore(__dir__ + '/../nanoc-cli.rb')
-loader.ignore(__dir__ + '/cli/commands')
+loader.push_dir("#{__dir__}/..")
+loader.ignore("#{__dir__}/../nanoc-cli.rb")
+loader.ignore("#{__dir__}/cli/commands")
 loader.setup
 loader.eager_load

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-cli
 version: !ruby/object:Gem::Version
-  version: 4.14.6
+  version: 4.14.7
 platform: ruby
 authors:
 - Denis Defreyne
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.6
+        version: 4.14.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.6
+        version: 4.14.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-cli-v4.14.6/nanoc-cli
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-cli-v4.14.7/nanoc-cli
 rdoc_options: []
 require_paths:
 - lib