diffy 2.0.10 → 2.1.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 2.1.0 ==
+Windows support
+
 == 2.0.10 ==
 Close tempfile after it's been written to to avoid too many open file handles
 

data/CONTRIBUTORS

@@ -2,3 +2,4 @@
 * joelash
 * chaffeqa
 * Lincoln Ritter
+* Bernhard Weichel

data/README.md

@@ -1,4 +1,4 @@
-Diffy - Easy Diffing With Ruby
+Diffy - Easy Diffing With Ruby [![Build Status](https://secure.travis-ci.org/samg/diffy.png)](http://travis-ci.org/samg/diffy)
 ============================
 
 Need diffs in your ruby app?  Diffy has you covered.  It provides a convenient
@@ -21,11 +21,41 @@ A default format can be set like so:
 
     Diffy::Diff.default_format = :html
 
+Installation
+------------
+
+###on Unix
+
+    gem install diffy
+
+###on Windows:
+
+1.  ensure that you have a working `which` and `diff` on your machine and on
+    your search path.
+
+    There are two options:
+
+    1.  install unxutils <http://sourceforge.net/projects/unxutils>
+
+        note that these tools contain diff 2.7 which has a different handling
+        of whitespace in the diff results. This makes diffy spec tests
+        yielding one fail on windows.
+
+    2.  install these two individually from the gnuwin32 project
+        <http://gnuwin32.sourceforge.net/>
+
+        note that this delivers diff 2.8 which makes diffy spec pass
+        even on windows.
+
+
+2.   install the gem by
+
+         gem install diffy
+
+
 Getting Started
 ---------------
 
-    sudo gem install diffy
-
 Here's an example of using Diffy to diff two strings
 
     $ irb
@@ -121,8 +151,8 @@ 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 
+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.
 
@@ -203,6 +233,14 @@ If you want to use Diffy and Ruby 1.8.6 then:
 
     $ gem install diffy -v1.1.0
 
+Testing
+------------
+
+Diffy includes a full set of rspec tests.  When contributing please include
+tests for your changes.
+
+[![Build Status](https://secure.travis-ci.org/samg/diffy.png)](http://travis-ci.org/samg/diffy)
+
 ---------------------------------------------------------------------
 
 Report bugs or request features at http://github.com/samg/diffy/issues

data/Rakefile

@@ -1,4 +1,8 @@
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 

data/VERSION

@@ -1 +1 @@
-2.0.10
+2.1.0

data/diffy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "diffy"
-  s.version = "2.0.10"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = "2012-10-27"
+  s.date = "2012-11-06"
   s.description = "Convenient diffing in ruby"
   s.email = "sgrock@gmail.com"
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".travis.yml",
     "CHANGELOG",
     "CONTRIBUTORS",
     "Gemfile",

data/lib/diffy.rb

@@ -1,5 +1,4 @@
 require 'tempfile'
-require 'open3'
 require 'erb'
 # 1.9 compatibility
 if defined? Enumerator and ! defined? Enumerable::Enumerator

data/lib/diffy/diff.rb

@@ -45,7 +45,8 @@ module Diffy
             [string1, string2]
           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 }
+        cmd = "#{diff_bin} #{diff_opts.join(' ')} #{paths.join(' ')}"
+        diff = `#{cmd}`
         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]
@@ -116,7 +117,11 @@ module Diffy
     private
 
     def diff_bin
-      @@bin ||= `which diff`.chomp
+      @@bin ||=""
+      
+      @@bin = `which diff.exe`.chomp if @@bin.empty?
+      @@bin = `which diff`.chomp if @@bin.empty?
+
       if @@bin.empty?
         raise "Can't find a diff executable in PATH #{ENV['PATH']}"
       end

data/spec/diffy_spec.rb

@@ -12,6 +12,7 @@ describe Diffy::Diff do
       @tempfiles.push(t)
       t.print(string)
       t.flush
+      t.close
       t.path
     end
 
@@ -487,7 +488,6 @@ baz
         line
       end.should == [" foo\n", " bar\n", "+baz\n"]
     end
-
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec