nanoc-cli 4.12.20 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75718c2d05f009f344a77d79bf30525a0c0639a4f0cfd34b4b27017ff5de70bf
-  data.tar.gz: 2e1780b02a4d021ad6dd14d6cd5f76e5410ca19de826c08b6c38b4df53ce035c
+  metadata.gz: 4f128a32f18562448ea9aa76e5f9ec8c123753d72868a99e928d1f0c3ce39782
+  data.tar.gz: 7b7385b30702c3b5e6062ab5aadd9d84eaffa6f3de52d282892e51df01a1f13f
 SHA512:
-  metadata.gz: 401911ef51c5273bf09c85ab89f2c3adb45f8608748bd901ec24faf987cebff4d73e157ca7d3aade7b2f9718f70a528d038751b6712d83ed5e7e00ee5f932404
-  data.tar.gz: 979f6e303b057b1568b3bababf5222a80cc08df5a565ff6d90752658f41fd50745f3a7c6b1845bd31ad4ec4c1a5fd5129c5e2fa48d7dde3254b96b2cc016e18d
+  metadata.gz: 8b4038d82337732797ab3de5045f4016e73836fb9b5a688120275a526100c1f49bca732a3d3647e953142890f731547953b44f5fc1735bf9fb7ed738a5187b50
+  data.tar.gz: 4c7696dbf5772faa47a079cca94092f2395ceba6a9e5b95dfa4743fcbe6e9adced430d8de086c8470a9b971dbc76471ed5457734e8b76f807fb435424194dd85

data/lib/nanoc/cli/cleaning_stream.rb

@@ -81,6 +81,11 @@ module Nanoc
         end
       end
 
+      # @see IO#printf
+      def printf(*args)
+        @stream.printf(*args)
+      end
+
       # @see IO#puts
       def puts(*str)
         _nanoc_swallow_broken_pipe_errors_while do

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

@@ -9,6 +9,7 @@ no_params
 
 flag nil, :diff, 'generate diff'
 flag :W, :watch, 'watch for changes and recompile when needed'
+option nil, :focus, 'compile only items matching the given pattern', argument: :required, multiple: true
 
 module Nanoc::CLI::Commands
   class Compile < ::Nanoc::CLI::CommandRunner
@@ -26,7 +27,7 @@ module Nanoc::CLI::Commands
 
     def run_repeat
       require 'nanoc/live'
-      Nanoc::Live::LiveRecompiler.new(command_runner: self).run
+      Nanoc::Live::LiveRecompiler.new(command_runner: self, focus: options[:focus]).run
     end
 
     def run_once
@@ -35,11 +36,11 @@ module Nanoc::CLI::Commands
       @site = load_site
 
       puts 'Compiling site…'
-      compiler = Nanoc::Core::Compiler.new_for(@site)
+      compiler = Nanoc::Core::Compiler.new_for(@site, focus: options[:focus])
       listener = Nanoc::CLI::CompileListeners::Aggregate.new(
         command_runner: self,
         site: @site,
-        compiler: compiler,
+        compiler:,
       )
       listener.run_while do
         compiler.run_until_end
@@ -48,6 +49,11 @@ module Nanoc::CLI::Commands
       time_after = Time.now
       puts
       puts "Site compiled in #{format('%.2f', time_after - time_before)}s."
+
+      if options[:focus]
+        warn 'CAUTION: A --focus option is specified. Not the entire site has been compiled.'
+        warn 'Re-run without --focus to compile the entire site.'
+      end
     end
   end
 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: reps)
+      listener = listener_class.new(reps:)
       listener.start_safely
 
       if options.key?(:yes)

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

@@ -8,10 +8,10 @@ description <<~EOS
   `adsf` (not `asdf`!).
 EOS
 
-required :H, :handler, 'specify the handler to use (webrick/puma/...)'
-required :o, :host,    'specify the host to listen on', default: '127.0.0.1'
-required :p, :port,    'specify the port to listen on', transform: Nanoc::CLI::Transform::Port, default: 3000
-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/aggregate.rb

@@ -36,7 +36,7 @@ module Nanoc::CLI::CompileListeners
       @listeners =
         @listener_classes
         .select { |klass| klass.enable_for?(@command_runner, @site) }
-        .map    { |klass| klass.new(reps: reps) }
+        .map    { |klass| klass.new(reps:) }
 
       @listeners.each(&:start_safely)
     end

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

@@ -55,6 +55,7 @@ module Nanoc::CLI::CompileListeners
             :low
           end
 
+        # Make path relative (to current working directory)
         # FIXME: do not depend on working directory
         if path.start_with?(Dir.getwd)
           path = path[(Dir.getwd.size + 1)..path.size]
@@ -64,10 +65,22 @@ module Nanoc::CLI::CompileListeners
       end
 
       on(:file_pruned) do |path|
+        # Make path relative (to current working directory)
+        # FIXME: do not depend on working directory
+        if path.start_with?(Dir.getwd)
+          path = path[(Dir.getwd.size + 1)..path.size]
+        end
+
         Nanoc::CLI::Logger.instance.file(:high, :delete, path)
       end
 
       on(:file_listed_for_pruning) do |path|
+        # Make path relative (to current working directory)
+        # FIXME: do not depend on working directory
+        if path.start_with?(Dir.getwd)
+          path = path[(Dir.getwd.size + 1)..path.size]
+        end
+
         Nanoc::CLI::Logger.instance.file(:high, :delete, '(dry run) ' + path)
       end
     end

data/lib/nanoc/cli/error_handler.rb

@@ -12,7 +12,7 @@ module Nanoc::CLI
       if @disabled
         yield
       else
-        new.handle_while(exit_on_error: exit_on_error, &block)
+        new.handle_while(exit_on_error:, &block)
       end
     end
 
@@ -66,7 +66,7 @@ module Nanoc::CLI
         puts
         exit(1)
       when StandardError, ScriptError
-        handle_error(e, exit_on_error: exit_on_error)
+        handle_error(e, exit_on_error:)
       else
         raise e
       end
@@ -283,7 +283,7 @@ module Nanoc::CLI
     end
 
     def write_error_message(stream, error, verbose: false)
-      write_section_header(stream, 'Message', verbose: verbose)
+      write_section_header(stream, 'Message', verbose:)
 
       error = unwrap_error(error)
 
@@ -317,33 +317,33 @@ module Nanoc::CLI
     def write_item_rep(stream, error, verbose: false)
       return unless error.is_a?(Nanoc::Core::Errors::CompilationError)
 
-      write_section_header(stream, 'Item being compiled', verbose: verbose)
+      write_section_header(stream, 'Item being compiled', verbose:)
 
       item_rep = error.item_rep
       stream.puts "Current item: #{item_rep.item.identifier} (#{item_rep.name.inspect} representation)"
     end
 
     def write_stack_trace(stream, error, verbose: false)
-      write_section_header(stream, 'Stack trace', verbose: verbose)
+      write_section_header(stream, 'Stack trace', verbose:)
 
       writer = Nanoc::CLI::StackTraceWriter.new(stream)
-      writer.write(unwrap_error(error), verbose: verbose)
+      writer.write(unwrap_error(error), verbose:)
     end
 
     def write_version_information(stream, verbose: false)
-      write_section_header(stream, 'Version information', verbose: verbose)
+      write_section_header(stream, 'Version information', verbose:)
       stream.puts Nanoc::Core.version_information
     end
 
     def write_system_information(stream, verbose: false)
       uname = `uname -a`
-      write_section_header(stream, 'System information', verbose: verbose)
+      write_section_header(stream, 'System information', verbose:)
       stream.puts uname
     rescue Errno::ENOENT
     end
 
     def write_installed_gems(stream, verbose: false)
-      write_section_header(stream, 'Installed gems', verbose: verbose)
+      write_section_header(stream, 'Installed gems', verbose:)
       gems_and_versions.each do |g|
         stream.puts "  #{g.first} #{g.last.join(', ')}"
       end
@@ -351,13 +351,13 @@ module Nanoc::CLI
 
     def write_gemfile_lock(stream, verbose: false)
       if File.exist?('Gemfile.lock')
-        write_section_header(stream, 'Gemfile.lock', verbose: verbose)
+        write_section_header(stream, 'Gemfile.lock', verbose:)
         stream.puts File.read('Gemfile.lock')
       end
     end
 
     def write_load_paths(stream, verbose: false)
-      write_section_header(stream, 'Load paths', verbose: verbose)
+      write_section_header(stream, 'Load paths', verbose:)
       $LOAD_PATH.each_with_index do |i, index|
         stream.puts "  #{index}. #{i}"
       end

data/lib/nanoc/cli/transform.rb

@@ -5,7 +5,7 @@ module Nanoc
     # @api private
     module Transform
       module Port
-        RANGE = (0x0001..0xffff).freeze
+        RANGE = (0x0001..0xffff)
 
         def self.call(data)
           Integer(data).tap do |int|

data/lib/nanoc/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module CLI
-    VERSION = '4.12.20'
+    VERSION = '4.13.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-cli
 version: !ruby/object:Gem::Version
-  version: 4.12.20
+  version: 4.13.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-06-19 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.20
+        version: 4.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.20
+        version: 4.13.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-cli-v4.12.20/nanoc-cli
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-cli-v4.13.0/nanoc-cli
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -129,14 +129,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: CLI for Nanoc