diffy 2.0.7 → 2.0.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 2.0.8 ==
+Handle non-UTF-8 byte sequences in Ruby 1.9.
+Avoid non-deterministic deletion of temp files when GC runs
+
 == 2.0.7 ==
 Added :allow_empty_diff option
 

data/VERSION

@@ -1 +1 @@
-2.0.7
+2.0.8

data/diffy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "diffy"
-  s.version = "2.0.7"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = "2012-05-31"
+  s.date = "2012-07-06"
   s.description = "Convenient diffing in ruby"
   s.email = "sgrock@gmail.com"
   s.extra_rdoc_files = [

data/lib/diffy/diff.rb

@@ -46,6 +46,7 @@ module Diffy
           end
         diff_opts = options[:diff].is_a?(Array) ? options[:diff] : [options[:diff]]
         diff = Open3.popen3(diff_bin, *(diff_opts + paths)) { |i, o, e| o.read }
+        diff.force_encoding('ASCII-8BIT') if diff.respond_to?(:valid_encoding?) && !diff.valid_encoding?
         if diff =~ /\A\s*\Z/ && !options[:allow_empty_diff]
           diff = case options[:source]
           when 'strings' then string1
@@ -90,8 +91,12 @@ module Diffy
 
     def tempfile(string)
       t = Tempfile.new('diffy')
+      # ensure tempfiles aren't unlinked when GC runs by maintaining a
+      # reference to them.
+      @tempfiles ||=[]
+      @tempfiles.push(t)
       t.print(string)
-      t.close
+      t.flush
       t.path
     end
 

data/spec/diffy_spec.rb

@@ -6,6 +6,10 @@ describe Diffy::Diff do
   describe "diffing two files" do
     def tempfile(string)
       t = Tempfile.new('diffy-spec')
+      # ensure tempfiles aren't unlinked when GC runs by maintaining a
+      # reference to them.
+      @tempfiles ||=[]
+      @tempfiles.push(t)
       t.print(string)
       t.flush
       t.path
@@ -58,6 +62,19 @@ describe Diffy::Diff do
       end
     end
 
+     describe "with non valid UTF bytes" do
+       before do
+         string1 = "Foo ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000\n"
+         string2 = "Bar ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000\n"
+         @path1, @path2 = tempfile(string1), tempfile(string2)
+       end
+       it "should not raise invalid encoding issues" do
+         Diffy::Diff.new(@path1, @path2, :source => 'files').to_s.should == <<-DIFF
+-Foo ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000
++Bar ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000
+         DIFF
+       end
+     end
 
   end
 

data/tags

@@ -0,0 +1,37 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME	Exuberant Ctags	//
+!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
+!_TAG_PROGRAM_VERSION	5.8	//
+Diff	lib/diffy/diff.rb	/^  class Diff$/;"	c	class:Diffy
+Diffy	lib/diffy.rb	/^module Diffy; end$/;"	m
+Diffy	lib/diffy/css.rb	/^module Diffy$/;"	m
+Diffy	lib/diffy/diff.rb	/^module Diffy$/;"	m
+Diffy	lib/diffy/format.rb	/^module Diffy$/;"	m
+Diffy	lib/diffy/html_formatter.rb	/^module Diffy$/;"	m
+Format	lib/diffy/format.rb	/^  module Format$/;"	m	class:Diffy
+HtmlFormatter	lib/diffy/html_formatter.rb	/^  class HtmlFormatter$/;"	c	class:Diffy
+clean_line	lib/diffy/html_formatter.rb	/^    def clean_line(line)$/;"	f	class:Diffy.HtmlFormatter
+color	lib/diffy/format.rb	/^    def color$/;"	f	class:Diffy.Format
+default_format	lib/diffy/diff.rb	/^      def default_format$/;"	f	class:Diffy.Diff
+default_options	lib/diffy/diff.rb	/^      def default_options$/;"	f	class:Diffy.Diff
+diff	lib/diffy/diff.rb	/^    def diff$/;"	f	class:Diffy
+diff_bin	lib/diffy/diff.rb	/^    def diff_bin$/;"	f
+each	lib/diffy/diff.rb	/^    def each$/;"	f
+each_chunk	lib/diffy/diff.rb	/^    def each_chunk$/;"	f
+highlight	lib/diffy/html_formatter.rb	/^    def highlight(lines)$/;"	f	class:Diffy.HtmlFormatter.clean_line.split_characters
+highlighted_words	lib/diffy/html_formatter.rb	/^    def highlighted_words$/;"	f	class:Diffy.HtmlFormatter.clean_line
+html	lib/diffy/format.rb	/^    def html$/;"	f	class:Diffy.Format.color
+html_simple	lib/diffy/format.rb	/^    def html_simple$/;"	f	class:Diffy.Format.color
+initialize	lib/diffy/diff.rb	/^    def initialize(string1, string2, options = {})$/;"	f	class:Diffy
+initialize	lib/diffy/html_formatter.rb	/^    def initialize(diff, options = {})$/;"	f	class:Diffy.HtmlFormatter
+reconstruct_characters	lib/diffy/html_formatter.rb	/^    def reconstruct_characters(line_diff, type)$/;"	f	class:Diffy.HtmlFormatter.clean_line.split_characters
+split_characters	lib/diffy/html_formatter.rb	/^    def split_characters(chunk)$/;"	f	class:Diffy.HtmlFormatter.clean_line
+tempfile	lib/diffy/diff.rb	/^    def tempfile(string)$/;"	f
+tempfile	spec/diffy_spec.rb	/^    def tempfile(string)$/;"	f
+text	lib/diffy/format.rb	/^    def text$/;"	f	class:Diffy.Format.color
+to_s	lib/diffy/diff.rb	/^    def to_s(format = nil)$/;"	f
+to_s	lib/diffy/html_formatter.rb	/^    def to_s$/;"	f	class:Diffy.HtmlFormatter
+wrap_line	lib/diffy/html_formatter.rb	/^    def wrap_line(line)$/;"	f	class:Diffy.HtmlFormatter
+wrap_lines	lib/diffy/html_formatter.rb	/^    def wrap_lines(lines)$/;"	f	class:Diffy.HtmlFormatter.clean_line

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70218594623100 !ruby/object:Gem::Requirement
+  requirement: &70226907218480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70218594623100
+  version_requirements: *70226907218480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70218594622520 !ruby/object:Gem::Requirement
+  requirement: &70226907217820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70218594622520
+  version_requirements: *70226907217820
 description: Convenient diffing in ruby
 email: sgrock@gmail.com
 executables: []
@@ -57,6 +57,7 @@ files:
 - lib/diffy/html_formatter.rb
 - spec/demo_app.rb
 - spec/diffy_spec.rb
+- tags
 homepage: http://github.com/samg/diffy/tree/master
 licenses: []
 post_install_message: