nanoc 4.11.10 → 4.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f613b6428b6cfd9eb92da14ff7768e830aacae1872df99649a9ca9941026a189
-  data.tar.gz: f208c9e15638f9745c558ec12d8a71a0bfb77744c24e735c4f9af2a20f510670
+  metadata.gz: 481798e39546d0e6b7e7a2a98832958b1666d8ee34b68d3dea32cd59fd99cfe0
+  data.tar.gz: 01b653399a15957f5562bdb10757e75efa2f8368d1d37f336836804827de02d7
 SHA512:
-  metadata.gz: 45852ac268085e574f3b266f9ac96ec13848904ad6240a0411c46cefa21e867cc109a0ccdcdda9c9c40212e9b21de2f44338af053b6ed03b00d6a78c92de9c9e
-  data.tar.gz: 8e949b83020fb64bdb8fecd4a233d83a5a9d52c65e57d4a4b29909dc5bd7c723ac7e6a379fb240c7d34576031bf7122caf74b6502c4b041178086385531124e5
+  metadata.gz: f64c2863d201a92188b92df86808d629fe498365a900d02e8658978159fb027167a009e69924b6381ddfda11653b9511de463dde6c8766e7df3c96b57591fbaa
+  data.tar.gz: 61f913a10ccd33ce05431194be1edfdea46c5513789399cf9e3594118477ffac5b94a22c7d2ba840744af2bf1722362ce97483aec34e9cf5bbf64e2f17d289f5

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.11.11 (2019-09-07)
+
+Fixes:
+
+* Made output diff more reliable (#1455, #1456)
+
 ## 4.11.10 (2019-08-31)
 
 Fixes:

data/lib/nanoc.rb

@@ -33,6 +33,8 @@ end
 # Load general requirements
 require 'base64'
 require 'cgi'
+require 'diff/lcs'
+require 'diff/lcs/hunk'
 require 'digest'
 require 'English'
 require 'fiber'
@@ -52,7 +54,6 @@ require 'time'
 require 'timeout'
 require 'tomlrb'
 require 'tmpdir'
-require 'tty-file'
 require 'tty-platform'
 require 'tty-which'
 require 'uri'

data/lib/nanoc/base/services/item_rep_writer.rb

@@ -43,9 +43,6 @@ module Nanoc
           :rep_write_started, item_rep, raw_path
         )
 
-        # Sync (needed so that diff generator can read the old contents)
-        Nanoc::Core::NotificationCenter.sync
-
         content = compiled_content_store.get(item_rep, snapshot_name)
         if content.binary?
           temp_path = content.filename
@@ -57,6 +54,13 @@ module Nanoc
         # Check whether content was modified
         is_modified = is_created || !FileUtils.identical?(raw_path, temp_path)
 
+        # Notify ready for diff generation
+        if !is_created && is_modified && !content.binary?
+          Nanoc::Core::NotificationCenter.post(
+            :rep_ready_for_diff, raw_path, File.read(raw_path), content.string
+          )
+        end
+
         # Write
         if is_modified
           begin

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

@@ -2,6 +2,53 @@
 
 module Nanoc::CLI::Commands::CompileListeners
   class DiffGenerator < Abstract
+    class Differ
+      def initialize(path, str_a, str_b)
+        @path = path
+        @str_a = str_a
+        @str_b = str_b
+      end
+
+      def call
+        run
+      end
+
+      private
+
+      def run
+        lines_a = @str_a.lines.map(&:chomp)
+        lines_b = @str_b.lines.map(&:chomp)
+
+        diffs = Diff::LCS.diff(lines_a, lines_b)
+
+        # Find hunks
+        hunks = []
+        file_length_difference = 0
+        diffs.each do |piece|
+          hunk = Diff::LCS::Hunk.new(lines_a, lines_b, piece, 3, file_length_difference)
+          file_length_difference = hunk.file_length_difference
+          hunks << hunk
+        end
+
+        # Merge hunks
+        merged_hunks = []
+        hunks.each do |hunk|
+          merged = merged_hunks.any? && hunk.merge(merged_hunks.last)
+          merged_hunks << hunk unless merged
+        end
+
+        # Output hunks
+        output = +''
+        output << "--- #{@path}\n"
+        output << "+++ #{@path}\n"
+        merged_hunks.each do |hunk|
+          output << hunk.diff(:unified) << "\n"
+        end
+
+        output
+      end
+    end
+
     # @see Listener#enable_for?
     def self.enable_for?(command_runner, site)
       site.config[:enable_output_diff] || command_runner.options[:diff]
@@ -10,20 +57,9 @@ module Nanoc::CLI::Commands::CompileListeners
     # @see Listener#start
     def start
       setup_diffs
-      old_contents = {}
 
-      on(:rep_write_started) do |rep, path|
-        old_contents[rep] = File.file?(path) ? File.read(path) : nil
-      end
-
-      on(:rep_write_ended) do |rep, binary, path, _is_created, _is_modified|
-        unless binary
-          new_contents = File.file?(path) ? File.read(path) : nil
-          if old_contents[rep] && new_contents
-            generate_diff_for(path, old_contents[rep], new_contents)
-          end
-          old_contents.delete(rep)
-        end
+      on(:rep_ready_for_diff) do |raw_path, old_content, new_content|
+        generate_diff_for(raw_path, old_content, new_content)
       end
     end
 
@@ -55,7 +91,7 @@ module Nanoc::CLI::Commands::CompileListeners
         end
 
         # Generate diff
-        diff = ['--- ' + path, '+++ ' + path, diff_strings(old_content, new_content)].join("\n")
+        diff = Differ.new(path, old_content, new_content).call
 
         # Write diff
         @diff_lock.synchronize do
@@ -63,25 +99,5 @@ module Nanoc::CLI::Commands::CompileListeners
         end
       end
     end
-
-    def diff_strings(str_a, str_b)
-      # Create files
-      Tempfile.open('old') do |old_file|
-        Tempfile.open('new') do |new_file|
-          # Write files
-          old_file.write(str_a)
-          old_file.flush
-          new_file.write(str_b)
-          new_file.flush
-
-          # Diff
-          TTY::File.diff_files(old_file.path, new_file.path, verbose: false)
-        end
-      end
-    rescue Errno::ENOENT
-      warn 'Failed to run `diff`, so no diff with the previously compiled ' \
-           'content will be available.'
-      nil
-    end
   end
 end

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.11.10'
+  VERSION = '4.11.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.10
+  version: 4.11.11
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -52,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.10
+        version: 4.11.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.10
+        version: 4.11.11
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: tty-file
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: tty-platform
   requirement: !ruby/object:Gem::Requirement