guard-nanoc 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22e34cd6176b6a69c72d384a85820fd7098f44e
-  data.tar.gz: fb31749a5ec8eb5cb63c2814695b59fc993f20c3
+  metadata.gz: fff47ff5d9595eacde533cda03abaaa36ba4e139
+  data.tar.gz: 54585047267e1306f8a3283d8352481c554418ed
 SHA512:
-  metadata.gz: 8e407b627a021beb105a0fc8b9e2544e5d16849a12fa99452d6fb6b531758b050d221073afac9e2683f900450c6598e9a8acf844fc7ffe26ab214e88135447de
-  data.tar.gz: 0ba2544d2313791615bd773e004ac34ab1fc4ceedc7bf36f97a5153a23a63d938e186a6c691b644ab1a96ad70268140700e6d4cdadb406c60f674f749cae684e
+  metadata.gz: e399310c51f91d72032167b7d7ef297dcea6d2057cdf54d92017edcd6167f753afd95d0d1098367327f39ba01e77b9e01c385bc92b04c1d47508faa132109e46
+  data.tar.gz: c65be4f560cf146e7da775f4897984a9b547feb4fd3fc108e8706a84081ad10cde584b86ab920a46c214cafba93d250a683d3a770c20e7059df409da4a752146

data/Gemfile.lock

@@ -1,10 +1,11 @@
 GIT
   remote: git://github.com/nanoc/nanoc.git
-  revision: 43fd2911c5d41310ca0bd44e5e185788617c851e
+  revision: 14f662e9f1a58c3d49195c16511146a6289a8a1f
   specs:
-    nanoc (4.3.0)
+    nanoc (4.3.8)
       cri (~> 2.3)
       hamster (~> 3.0)
+      parallel (~> 1.9)
       ref (~> 2.0)
 
 PATH
@@ -13,7 +14,7 @@ PATH
     guard-nanoc (2.1.0)
       guard (~> 2.8)
       guard-compat (~> 1.0)
-      nanoc (~> 4.0)
+      nanoc (>= 4.3.8, < 5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -48,12 +49,13 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    parallel (1.9.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (11.2.2)
-    rb-fsevent (0.9.7)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     ref (2.0.0)
@@ -70,7 +72,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    ruby_dep (1.4.0)
+    ruby_dep (1.5.0)
     shellany (0.0.1)
     slop (3.6.0)
     thor (0.19.1)
@@ -85,4 +87,4 @@ DEPENDENCIES
   rspec (~> 3.1)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/NEWS.md

@@ -1,5 +1,10 @@
 # guard-nanoc Release Notes
 
+## 2.1.1 (2016-11-18)
+
+* Fixed compatibility with Nanoc 4.3.8 (#32)
+* Fixed issue which would cause “constants redefined” warnings to be printed (#26, #34)
+
 ## 2.1.0 (2016-08-21)
 
 * Add `nanoc live` command, combining guard-nanoc with `nanoc view` [whitequark]

data/README.md

@@ -6,7 +6,7 @@ This is a guard for [nanoc](http://nanoc.ws/).
 
 ## Installation
 
-Add these lines to your application's Gemfile:
+Add the `guard-nanoc` gem inside the `nanoc` group to your application's Gemfile:
 
     group :nanoc do
       gem 'guard-nanoc'
@@ -16,6 +16,10 @@ Unless your Gemfile already specifies a web server, you'll need one as well:
 
     gem 'adsf'
 
+Lastly, ensure that Nanoc is at least version 4.3:
+
+    gem 'nanoc', '~> 4.3'
+
 And then execute:
 
     $ bundle

data/guard-nanoc.gemspec

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

data/lib/guard/nanoc/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Guard
-  GUARD_NANOC_VERSION = '2.1.0'
+  GUARD_NANOC_VERSION = '2.1.1'
 end

data/lib/guard/nanoc.rb

@@ -6,47 +6,37 @@ require 'nanoc'
 require 'nanoc/cli'
 
 module Guard
-
   class Nanoc < Plugin
-
     def initialize(options={})
       @dir = options[:dir] || '.'
       super
     end
 
     def start
-      self.setup_nanoc_notifications
+      self.setup_listeners
       self.recompile_in_subprocess
     end
 
     def run_all
-      self.recompile
+      self.recompile_in_subprocess
     end
 
     def run_on_changes(paths)
-      self.recompile
+      self.recompile_in_subprocess
     end
 
     def run_on_removals(paths)
-      self.recompile
+      self.recompile_in_subprocess
     end
 
   protected
 
-    def setup_nanoc_notifications
-      @rep_times = {}
-      ::Nanoc::Int::NotificationCenter.on(:compilation_started) do |rep|
-        @rep_times[rep.raw_path] = Time.now
-      end
-      ::Nanoc::Int::NotificationCenter.on(:compilation_ended) do |rep|
-        @rep_times[rep.raw_path] = Time.now - @rep_times[rep.raw_path]
-      end
-      ::Nanoc::Int::NotificationCenter.on(:rep_written) do |rep, path, is_created, is_modified|
-        action = (is_created ? :create : (is_modified ? :update : :identical))
-        level  = (is_created ? :high   : (is_modified ? :high   : :low))
-        duration = Time.now - @rep_times[rep.raw_path] if @rep_times[rep.raw_path]
-        ::Nanoc::CLI::Logger.instance.file(level, action, path, duration)
-      end
+    def setup_listeners
+      ::Nanoc::CLI.setup
+
+      ::Nanoc::CLI::Commands::Compile::FileActionPrinter
+        .new(reps: [])
+        .start
     end
 
     def recompile_in_subprocess
@@ -62,7 +52,6 @@ module Guard
       Dir.chdir(@dir) do
         site = ::Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
-        self.prune(site)
       end
       self.notify_success
     rescue => e
@@ -70,15 +59,6 @@ module Guard
       ::Nanoc::CLI::ErrorHandler.print_error(e)
     end
 
-    def prune(site)
-      prune_config = site.config.fetch(:prune, {})
-      auto_prune_enabled = prune_config.fetch(:auto_prune, false)
-      if auto_prune_enabled
-        exclude = prune_config.fetch(:exclude, [])
-        ::Nanoc::Extra::Pruner.new(site, :exclude => exclude).run
-      end
-    end
-
     def notify_success
       Compat::UI.notify('Compilation succeeded', :title => 'nanoc', :image => :success)
       Compat::UI.info 'Compilation succeeded.'
@@ -88,7 +68,5 @@ module Guard
       Compat::UI.notify('Compilation FAILED', :title => 'nanoc', :image => :failed)
       Compat::UI.error 'Compilation failed!'
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-nanoc
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -42,16 +42,22 @@ dependencies:
   name: nanoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.8
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.8
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 description: Automatically rebuilds nanoc sites
 email: denis.defreyne@stoneship.org
 executables: []
@@ -90,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: guard gem for nanoc