diffy 2.0.6 → 2.0.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 2.0.7 ==
+Added :allow_empty_diff option
+
+== Oops, need to backfill changelog ==
+
 == 1.0.1 ==
 * Compatibility with ruby 1.8.6 and 1.9
 

data/CONTRIBUTORS

@@ -1,3 +1,4 @@
 * Sam Goldstein
 * joelash
 * chaffeqa
+* Lincoln Ritter

data/README.md

@@ -119,6 +119,13 @@ option when initializing:
 
 And even deals a bit with the formatting!
 
+### Empty Diff Behavior
+
+By default diffy will return the full text of its first input if there are no 
+differences with the second input.  Sometimes it's useful to return the actual 
+diff, the empty string, in this case.  To enable this behavior, simply use the
+`:allow_empty_diff => true` option when initializing.
+
 ### Plus and Minus symbols in HTML output
 
 By default Diffy doesn't include the `+`, `-`, and ` ` at the beginning of line for

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.7

data/diffy.gemspec

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

data/lib/diffy/diff.rb

@@ -46,7 +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 }
-        if diff =~ /\A\s*\Z/
+        if diff =~ /\A\s*\Z/ && !options[:allow_empty_diff]
           diff = case options[:source]
           when 'strings' then string1
           when 'files' then File.read(string1)
@@ -91,7 +91,7 @@ module Diffy
     def tempfile(string)
       t = Tempfile.new('diffy')
       t.print(string)
-      t.flush
+      t.close
       t.path
     end
 

data/lib/diffy/html_formatter.rb

@@ -33,9 +33,9 @@ module Diffy
     # remove +/- or wrap in html
     def clean_line(line)
       if @options[:include_plus_and_minus_in_html]
-        line.gsub(/^(.)/, '<span class="symbol">\1</span>')
+        line.sub(/^(.)/, '<span class="symbol">\1</span>')
       else
-        line.gsub(/^./, '')
+        line.sub(/^./, '')
       end.chomp
     end
 

data/spec/diffy_spec.rb

@@ -36,6 +36,10 @@ describe Diffy::Diff do
  bang
         DIFF
       end
+
+      it "should not show everything if the :allow_empty_diff option is set" do
+        Diffy::Diff.new(@path1, @path2, :source => 'files', :allow_empty_diff => true).to_s.should == ''
+      end
     end
     describe "with lines that start with backslashes" do
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70147571059540 !ruby/object:Gem::Requirement
+  requirement: &70218594623100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70147571059540
+  version_requirements: *70218594623100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70147571058940 !ruby/object:Gem::Requirement
+  requirement: &70218594622520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70147571058940
+  version_requirements: *70218594622520
 description: Convenient diffing in ruby
 email: sgrock@gmail.com
 executables: []