xcop 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa06bb31a6307eaf1ce56b0795be9724317f602a
-  data.tar.gz: 626fd201fd723fd081fc112cb40e282f3d972a95
+  metadata.gz: 01042721d40f4868f1355ca93371d489f1b464c7
+  data.tar.gz: 6503c87b8e09558e0ca2b4431feee7aca28242d1
 SHA512:
-  metadata.gz: 8329081d4b7977c9be2afcca650704e5dc77370af182772538dc27bf1c8568e1bd9e29a26a85c5d1ea52af1eb0feeedbb62ebf6ae4bd592b93f8143c11b2637f
-  data.tar.gz: 1702c751578d7ff9ca5c6ad4b8353d9f21b7c907627d74d0d68980a535527c6481e35ab91333d163660c77c49958d77891dee22dbe24975af179bd82b79ba933
+  metadata.gz: ce82cc3f7318a3a0fc66f33159eec3f62432cda9280df83473ff8f32abbe22936fd5806138dd580f5ca24a5009386bbada55ffc47ed99e0097eb6a570f200581
+  data.tar.gz: eb150e198aa055abbf30b4510be56c0533750c5d8a02bb941b66f63dce59f39b6eb4b0c5c13e48737dbb07a8b6422984275879077612445e271e22ed0ec66d73

data/features/rake.feature

@@ -8,7 +8,7 @@ Feature: Rake tasks
     """
     require 'xcop/rake_task'
     Xcop::RakeTask.new(:xcop) do |task|
-      task.includes = ['**/*.xml']
+      task.includes = ['good.xml']
     end
     """
     And I have a "good.xml" file with content:

data/features/step_definitions/steps.rb

@@ -66,7 +66,7 @@ Then(/^Stdout is empty$/) do
 end
 
 Then(/^Exit code is zero$/) do
-  raise "Non-zero exit code #{@exitstatus}" unless @exitstatus == 0
+  raise "Non-zero exit code #{@exitstatus}:\n#{@stdout}" unless @exitstatus == 0
 end
 
 Then(/^Exit code is not zero$/) do

data/lib/xcop.rb

@@ -78,9 +78,7 @@ module Xcop
       xml = Nokogiri::XML(File.open(@path), &:noblanks)
       ideal = xml.to_xml(indent: 2)
       now = File.read(@path)
-      Differ.format = :color
-      return Differ.diff_by_line(ideal, now).to_s unless now == ideal
-      ''
+      differ(ideal, now)
     end
 
     # Return the difference for the license.
@@ -89,9 +87,7 @@ module Xcop
       comment = xml.xpath('/comment()')[0]
       now = comment.nil? ? '' : comment.text.to_s.strip
       ideal = license.strip
-      Differ.format = :color
-      return Differ.diff_by_line(ideal, now).to_s unless now == ideal
-      ''
+      differ(ideal, now)
     end
 
     # Fixes the document.
@@ -106,5 +102,17 @@ module Xcop
       ideal = xml.to_xml(indent: 2)
       File.write(@path, ideal)
     end
+
+    private
+
+    def differ(ideal, fact)
+      return '' if ideal == fact
+      Differ.format = :color
+      Differ.diff_by_line(schars(ideal), schars(fact)).to_s
+    end
+
+    def schars(text)
+      text.gsub(/\n/, "\\n\n")
+    end
   end
 end

data/lib/xcop/version.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2017 Yegor Bugayenko
 # License:: MIT
 module Xcop
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.5.6'.freeze
 end

data/test/test_xcop.rb

@@ -39,6 +39,14 @@ class TestXcop < Minitest::Test
     end
   end
 
+  def test_file_without_tail_eol
+    Dir.mktmpdir 'test9' do |dir|
+      f = File.join(dir, 'no-eol.xml')
+      File.write(f, "<?xml version=\"1.0\"?>\n<x/>")
+      assert(Xcop::Document.new(f).diff != '')
+    end
+  end
+
   def test_license_presence
     Dir.mktmpdir 'test2' do |dir|
       f = File.join(dir, 'a.xml')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcop
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri