guard-nanoc 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63b4e13d1627f430ef6774ee933a056e4593f8ceedf4746193496f0ff9c3aeae
-  data.tar.gz: e79fb40f05dff6b3707fb8b7797c8da7223c79d5e9252e86fdca0acfadbf66e1
+  metadata.gz: a6679df87e78b79d78396ad0c002b41b882625a4a83415d37b114783e2ea98c4
+  data.tar.gz: 96120c4ef6548b7f3b0efa7a3899a6c9dcaa2fa165cb3450cdcfc678bcb89522
 SHA512:
-  metadata.gz: d3073b4c344cd7710af4416a559876d14e8afb133e22a9889aac7f3fb19d1c4945e864e5932e6e0ef8c2c3e8fd9040b082df934c1bc93e6274f2499014bec76a
-  data.tar.gz: a3ea5d577fbbf0c1989fbca574811d21584cb49bc259595ea11191da876d048e95d5e723bd063cfa8f9846858a415741589184abe4b0193f36e5abaa6e9b01eb
+  metadata.gz: ad13e7ec7bc29796e34c330472a09f1ac35d7bd90076c8b48de8796866e0fdc2c26affe39847ac1dfca35fea771e07ade9e36e2785b636cd400e61e001b9f92c
+  data.tar.gz: 13674f766409963d3a59348fbb98aa16361caa7e95d341959503d3932eed33e47db00088434abf11c9081f9ae56c7691ac5900ff3a04917792f2f269e6528e57

data/NEWS.md

@@ -1,5 +1,9 @@
 # guard-nanoc Release Notes
 
+## 2.1.8 (2020-03-07)
+
+* Fixed an incompatibility with Nanoc 4.11.14.
+
 ## 2.1.7 (2019-11-16)
 
 * Fixed an incompatibility with Nanoc 4.11.13.

data/guard-nanoc.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'guard', '~> 2.8'
   s.add_dependency 'guard-compat', '~> 1.0'
-  s.add_dependency 'nanoc', '>= 4.11.13', '< 5.0'
+  s.add_dependency 'nanoc-cli', '~> 4.11', '>= 4.11.14'
+  s.add_dependency 'nanoc-core', '~> 4.11', '>= 4.11.14'
 
   s.files         = Dir['[A-Z]*'] + Dir['lib/**/*'] + ['guard-nanoc.gemspec']
   s.require_paths = ['lib']

data/lib/guard/nanoc.rb

@@ -9,7 +9,7 @@ module Guard
   class Nanoc < Plugin
     def self.live_cmd
       @_live_cmd ||= begin
-        path = File.join(File.dirname(__FILE__), '..', 'nanoc', 'orig_cli', 'commands', 'live.rb')
+        path = File.join(File.dirname(__FILE__), 'nanoc', 'live_command.rb')
         Cri::Command.load_file(path, infer_name: true)
       end
     end

data/lib/guard/nanoc/live_command.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+usage 'live [options]'
+summary 'start the web server, and recompile the site when changed'
+description <<~EOS
+  Start the static web server (like `nanoc view` would), and watch for changes
+  in the background (like `guard start` would). See the documentation of those
+  two commands for details. The options are forwarded to `nanoc view` only.
+EOS
+
+required :H, :handler,       'specify the handler to use (webrick/mongrel/...)'
+required :o, :host,          'specify the host to listen on (default: 0.0.0.0)', default: '127.0.0.1'
+required :p, :port,          'specify the port to listen on (default: 3000)', transform: Nanoc::CLI::Transform::Port, default: 3000
+flag     :L, :'live-reload', 'reload on changes'
+
+module Guard
+  class Nanoc
+    class LiveCommand < ::Nanoc::CLI::CommandRunner
+      def run
+        require 'guard'
+        require 'guard/commander'
+
+        if defined?(Nanoc::Live)
+          $stderr.puts '-' * 40
+          $stderr.puts 'NOTE:'
+          $stderr.puts 'You are using the `nanoc live` command provided by `guard-nanoc`, but the `nanoc-live` 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
+
+        Thread.new do
+          # Crash the entire process if the viewer dies for some reason (e.g.
+          # the port is already bound).
+          Thread.current.abort_on_exception = true
+          Nanoc::CLI::Commands::View.new(options, arguments, command).run
+        end
+
+        Guard.start(no_interactions: true)
+      end
+    end
+  end
+end
+
+runner Guard::Nanoc::LiveCommand

data/lib/guard/nanoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Guard
-  GUARD_NANOC_VERSION = '2.1.7'
+  GUARD_NANOC_VERSION = '2.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-nanoc
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 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: guard
@@ -39,25 +39,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: nanoc
+  name: nanoc-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.13
-    - - "<"
+        version: '4.11'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.11.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.11.13
-    - - "<"
+        version: 4.11.14
+- !ruby/object:Gem::Dependency
+  name: nanoc-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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: '4.11'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.11.14
 description: Automatically rebuilds Nanoc sites
 email: denis.defreyne@stoneship.org
 executables: []
@@ -71,9 +91,9 @@ files:
 - guard-nanoc.gemspec
 - lib/guard-nanoc.rb
 - lib/guard/nanoc.rb
+- lib/guard/nanoc/live_command.rb
 - lib/guard/nanoc/templates/Guardfile
 - lib/guard/nanoc/version.rb
-- lib/nanoc/orig_cli/commands/live.rb
 homepage: https://nanoc.ws/
 licenses:
 - MIT
@@ -93,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: guard gem for Nanoc

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

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-usage 'live [options]'
-summary 'start the web server, and recompile the site when changed'
-description <<~EOS
-  Start the static web server (like `nanoc view` would), and watch for changes
-  in the background (like `guard start` would). See the documentation of those
-  two commands for details. The options are forwarded to `nanoc view` only.
-EOS
-
-required :H, :handler,       'specify the handler to use (webrick/mongrel/...)'
-required :o, :host,          'specify the host to listen on (default: 0.0.0.0)', default: '127.0.0.1'
-required :p, :port,          'specify the port to listen on (default: 3000)', transform: Nanoc::CLI::Transform::Port, default: 3000
-flag     :L, :'live-reload', 'reload on changes'
-
-module Nanoc::CLI::Commands
-  class Live < ::Nanoc::CLI::CommandRunner
-    def run
-      require 'guard'
-      require 'guard/commander'
-
-      Thread.new do
-        # Crash the entire process if the viewer dies for some reason (e.g.
-        # the port is already bound).
-        Thread.current.abort_on_exception = true
-        Nanoc::CLI::Commands::View.new(options, arguments, command).run
-      end
-
-      Guard.start(no_interactions: true)
-    end
-  end
-end
-
-runner Nanoc::CLI::Commands::Live