nanoc-live 1.0.0b5 → 1.0.0b6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d82aefea83eadf92f24e9efa6415df3f254bb92531476c927feeeba51fde9f5e
-  data.tar.gz: c9b02ff923a7aaf90e89a523cfd1789755f49feb84300981828fab7273cbf24d
+  metadata.gz: dc4fb7c9249c44322e8f50d6ef2cded2d659a8be4856f229c1824f86f76505ba
+  data.tar.gz: 0b15b54e3543b0b22f7b3b27ab2d9374d41fde0525f8b0ca22fe0ae0e61c70f7
 SHA512:
-  metadata.gz: 33a969f03f9693ee9f1bb907d9d7c864ff994ebd5f07c7bfb4b1cc55d3cca6c60a144bf86d239c41057d9df5f6fc1319b11922d921e6ee053c511c90510e27ab
-  data.tar.gz: 2200627f081074bf6112352dae1d160cb60b1d38d20d21910f80a759ac30ebbf3cb1d3451b698ac70067c4110a13c140159b64558e965ae9403c1d50726f97e3
+  metadata.gz: 91412105e6511340a5baf4cefbf44b72f5e213733a62d33b9d6f394c0829a23e2bec96bd4725582984d3f713b66b237b259e018b65ae1927b439b749d0b318f4
+  data.tar.gz: 26ff48778052bcdc691c33b5556047e91cda9832ada694aedacfdd06295bdf3e8d2b93393367cb42e4b6e912314c93c22f955531214a961d4910d6b9489cd017

data/NEWS.md

@@ -1,5 +1,11 @@
 # Release notes for nanoc-live
 
+## 1.0.0b6 (2020-03-07)
+
+Fixes:
+
+* Restored compatibility with Nanoc 4.11.14.
+
 ## 1.0.0b5 (2019-11-16)
 
 Fixes:

data/lib/nanoc/live.rb

@@ -12,9 +12,12 @@ end
 
 require_relative 'live/version'
 require_relative 'live/live_recompiler'
+require_relative 'live/command_runners/live'
+
+root = File.dirname(__FILE__)
+live_command_path = File.join(root, 'live', 'commands', 'live.rb')
+command = Cri::Command.load_file(live_command_path, infer_name: true)
 
 Nanoc::CLI.after_setup do
-  root = File.dirname(__FILE__)
-  live_command_path = File.join(root, 'live', 'commands', 'live.rb')
-  Nanoc::CLI.add_command(Cri::Command.load_file(live_command_path, infer_name: true))
+  Nanoc::CLI.add_command(command)
 end

data/lib/nanoc/live/command_runners/live.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Live
+    module CommandRunners
+      class Live < ::Nanoc::CLI::CommandRunner
+        def run
+          if defined?(Guard::Nanoc)
+            $stderr.puts '-' * 40
+            $stderr.puts 'NOTE:'
+            $stderr.puts 'You are using the `nanoc live` command provided by `nanoc-live`, but the `guard-nanoc` gem is also installed, which also provides a `nanoc live` command.'
+            if defined?(Bundler)
+              $stderr.puts 'Recommendation: Remove `guard-nanoc` from your Gemfile.'
+            else
+              $stderr.puts 'Recommendation: Uninstall `guard-nanoc`.'
+            end
+            $stderr.puts '-' * 40
+          end
+
+          self.class.enter_site_dir
+
+          Thread.new do
+            Thread.current.abort_on_exception = true
+            if Thread.current.respond_to?(:report_on_exception)
+              Thread.current.report_on_exception = false
+            end
+
+            view_options = options.merge('live-reload': true)
+            Nanoc::CLI::Commands::View.new(view_options, [], self).run
+          end
+
+          Nanoc::Live::LiveRecompiler.new(command_runner: self).run
+        end
+      end
+    end
+  end
+end

data/lib/nanoc/live/commands/live.rb

@@ -13,24 +13,4 @@ required :o, :host,    'specify the host to listen on (default: 127.0.0.1)', def
 required :p, :port,    'specify the port to listen on (default: 3000)', transform: Nanoc::CLI::Transform::Port, default: 3000
 no_params
 
-module Nanoc::Live::Commands
-  class Live < ::Nanoc::CLI::CommandRunner
-    def run
-      self.class.enter_site_dir
-
-      Thread.new do
-        Thread.current.abort_on_exception = true
-        if Thread.current.respond_to?(:report_on_exception)
-          Thread.current.report_on_exception = false
-        end
-
-        view_options = options.merge('live-reload': true)
-        Nanoc::CLI::Commands::View.new(view_options, [], self).run
-      end
-
-      Nanoc::Live::LiveRecompiler.new(command_runner: self).run
-    end
-  end
-end
-
-runner Nanoc::Live::Commands::Live
+runner Nanoc::Live::CommandRunners::Live

data/lib/nanoc/live/live_recompiler.rb

@@ -1,135 +1,137 @@
 # frozen_string_literal: true
 
-module Nanoc::Live
-  class LiveRecompiler
-    def initialize(command_runner:)
-      @command_runner = command_runner
-    end
-
-    def run
-      run_parent do |site|
-        handle_changes(site, @command_runner)
+module Nanoc
+  module Live
+    class LiveRecompiler
+      def initialize(command_runner:)
+        @command_runner = command_runner
       end
-    end
 
-    private
-
-    def gen_changes_for_child(site)
-      changes = [
-        site.data_source.item_changes,
-        site.data_source.layout_changes,
-        gen_config_and_rules_changes,
-      ]
-
-      SlowEnumeratorTools.batch(SlowEnumeratorTools.merge(changes))
-    end
+      def run
+        run_parent do |site|
+          handle_changes(site, @command_runner)
+        end
+      end
 
-    def run_child(pipe_write, pipe_read)
-      pipe_write.close
+      private
 
-      site = Nanoc::Core::SiteLoader.new.new_from_cwd
-      changes_enum = gen_changes_for_child(site)
-      yield(site)
+      def gen_changes_for_child(site)
+        changes = [
+          site.data_source.item_changes,
+          site.data_source.layout_changes,
+          gen_config_and_rules_changes,
+        ]
 
-      quit = Object.new
-      parent_enum = Enumerator.new do |y|
-        pipe_read.read
-        y << quit
+        SlowEnumeratorTools.batch(SlowEnumeratorTools.merge(changes))
       end
 
-      puts 'Listening for site changes…'
-      SlowEnumeratorTools.merge([parent_enum, changes_enum]).each do |e|
-        break if quit.equal?(e)
-
-        $stderr.print 'Reloading site… '
-        $stderr.flush
-        site_loader = Nanoc::Core::SiteLoader.new
-        site = Nanoc::Core::Site.new(
-          config: Nanoc::Core::ConfigLoader.new.new_from_cwd,
-          data_source: site_loader.gen_data_source_for_config(site.config),
-          code_snippets: site.code_snippets,
-        )
-        $stderr.puts 'done'
+      def run_child(pipe_write, pipe_read)
+        pipe_write.close
 
+        site = Nanoc::Core::SiteLoader.new.new_from_cwd
+        changes_enum = gen_changes_for_child(site)
         yield(site)
-      end
-
-      exit 0
-    rescue Interrupt
-      exit 0
-    end
 
-    def run_parent
-      # create initial child
-      pipe_read, pipe_write = IO.pipe
-      fork { run_child(pipe_write, pipe_read) { |s| yield(s) } }
-      pipe_read.close
-
-      changes = gen_lib_changes
-      puts 'Listening for lib/ changes…'
-      changes.each do |_e|
-        # stop child
-        pipe_write.write('q')
-        pipe_write.close
-        Process.wait
+        quit = Object.new
+        parent_enum = Enumerator.new do |y|
+          pipe_read.read
+          y << quit
+        end
+
+        puts 'Listening for site changes…'
+        SlowEnumeratorTools.merge([parent_enum, changes_enum]).each do |e|
+          break if quit.equal?(e)
+
+          $stderr.print 'Reloading site… '
+          $stderr.flush
+          site_loader = Nanoc::Core::SiteLoader.new
+          site = Nanoc::Core::Site.new(
+            config: Nanoc::Core::ConfigLoader.new.new_from_cwd,
+            data_source: site_loader.gen_data_source_for_config(site.config),
+            code_snippets: site.code_snippets,
+          )
+          $stderr.puts 'done'
+
+          yield(site)
+        end
+
+        exit 0
+      rescue Interrupt
+        exit 0
+      end
 
-        # create new child
+      def run_parent
+        # create initial child
         pipe_read, pipe_write = IO.pipe
         fork { run_child(pipe_write, pipe_read) { |s| yield(s) } }
         pipe_read.close
-      end
-    rescue Interrupt
-    end
 
-    def handle_changes(site, command_runner)
-      Nanoc::CLI::ErrorHandler.handle_while(exit_on_error: false) do
-        unsafe_handle_changes(site, command_runner)
+        changes = gen_lib_changes
+        puts 'Listening for lib/ changes…'
+        changes.each do |_e|
+          # stop child
+          pipe_write.write('q')
+          pipe_write.close
+          Process.wait
+
+          # create new child
+          pipe_read, pipe_write = IO.pipe
+          fork { run_child(pipe_write, pipe_read) { |s| yield(s) } }
+          pipe_read.close
+        end
+      rescue Interrupt
       end
-    end
 
-    def unsafe_handle_changes(site, command_runner)
-      time_before = Time.now
-
-      puts 'Compiling site…'
-      compiler = Nanoc::Core::Compiler.new_for(site)
-      listener = Nanoc::CLI::CompileListeners::Aggregate.new(
-        command_runner: command_runner,
-        site: site,
-        compiler: compiler,
-      )
-      listener.run_while do
-        compiler.run_until_end
+      def handle_changes(site, command_runner)
+        Nanoc::CLI::ErrorHandler.handle_while(exit_on_error: false) do
+          unsafe_handle_changes(site, command_runner)
+        end
       end
 
-      time_after = Time.now
-      puts "Site compiled in #{format('%.2f', time_after - time_before)}s."
-      puts
-    end
+      def unsafe_handle_changes(site, command_runner)
+        time_before = Time.now
 
-    def gen_lib_changes
-      Nanoc::ChangesStream.new do |cl|
-        opts = {
-          latency: 0.0,
-          wait_for_delay: 0.0,
-        }
+        puts 'Compiling site…'
+        compiler = Nanoc::Core::Compiler.new_for(site)
+        listener = Nanoc::CLI::CompileListeners::Aggregate.new(
+          command_runner: command_runner,
+          site: site,
+          compiler: compiler,
+        )
+        listener.run_while do
+          compiler.run_until_end
+        end
 
-        listener = Listen.to('lib', opts) { |*| cl.lib }
-        listener.start
-        sleep
+        time_after = Time.now
+        puts "Site compiled in #{format('%.2f', time_after - time_before)}s."
+        puts
+      end
+
+      def gen_lib_changes
+        Nanoc::Core::ChangesStream.new do |cl|
+          opts = {
+            latency: 0.1,
+            wait_for_delay: 0.0,
+          }
+
+          listener = Listen.to('lib', opts) { |*| cl.lib }
+          listener.start
+          sleep
+        end
       end
-    end
 
-    def gen_config_and_rules_changes
-      Nanoc::ChangesStream.new do |cl|
-        opts = {
-          only: /(\/|\A)(nanoc\.yaml|config\.yaml|rules|Rules|rules\.rb|Rules\.rb)\z/,
-          latency: 0.0,
-          wait_for_delay: 0.0,
-        }
-
-        listener = Listen.to('.', opts) { |*| cl.unknown }
-        listener.start
-        sleep
+      def gen_config_and_rules_changes
+        Nanoc::Core::ChangesStream.new do |cl|
+          opts = {
+            only: /(\/|\A)(nanoc\.yaml|config\.yaml|rules|Rules|rules\.rb|Rules\.rb)\z/,
+            latency: 0.1,
+            wait_for_delay: 0.0,
+          }
+
+          listener = Listen.to('.', opts) { |*| cl.unknown }
+          listener.start
+          sleep
+        end
       end
     end
   end

data/lib/nanoc/live/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Live
-    VERSION = '1.0.0b5'
+    VERSION = '1.0.0b6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-live
 version: !ruby/object:Gem::Version
-  version: 1.0.0b5
+  version: 1.0.0b6
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-16 00:00:00.000000000 Z
+date: 2020-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adsf-live
@@ -25,35 +25,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: cri
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: nanoc-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.11.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.11.14
 - !ruby/object:Gem::Dependency
-  name: nanoc
+  name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -61,7 +67,7 @@ dependencies:
         version: '4.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.11.5
+        version: 4.11.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +77,7 @@ dependencies:
         version: '4.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.11.5
+        version: 4.11.14
 description: Provides support for auto-recompiling Nanoc sites.
 email: denis+rubygems@denis.ws
 executables: []
@@ -81,6 +87,7 @@ files:
 - NEWS.md
 - README.md
 - lib/nanoc/live.rb
+- lib/nanoc/live/command_runners/live.rb
 - lib/nanoc/live/commands/live.rb
 - lib/nanoc/live/live_recompiler.rb
 - lib/nanoc/live/version.rb
@@ -103,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Live recompilation support for Nanoc