diffy 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c0e0aee65a3f2117cd159a9eb746a1b9c79f880
-  data.tar.gz: 1b80f76baedd405410f97dfeb1eb9ed692e7c458
+  metadata.gz: 2cd5d2b187c4063456f8a018845cfa199d09b345
+  data.tar.gz: 9e83a4e588db04b655db5c64c30e8fda39201b4b
 SHA512:
-  metadata.gz: 491022a9aefc2c9a6b78228b6ba93a53363d7afbc28173d171ee841aaeabbb4eaa4a6d89679ec11e8d34fc7edfaa4a883cfdae2adb9051016f81ebc574d7b1ad
-  data.tar.gz: 59bfeadc59bf5186fe14305aa64a0b89cc35ff3878926635ac4b8414ccf86157a5e27ce193d9c4849f8590c854c4b304764a1c4521b1d47dd72415f634abaa65
+  metadata.gz: b031cbc1697f4334aa62df5eff024c51e89546225f386a38345feac5e73590bb7992862032c7fd99741a0c1e4fb47e7819c06348b72a7efbc70d88ce46172ec5
+  data.tar.gz: e524bece45facd115127d8f1a8814f0b8acc94b77e54caa87931312db00693d8ab55ebff76c00321733d13f04c8635d3d242c11389881f1ff83ad3a3748fe64a

data/CONTRIBUTORS

@@ -9,3 +9,4 @@
 * printercu
 * Bryan Ricker
 * JasonBarnabe
+* Skye Shaw

data/README.md

@@ -30,25 +30,29 @@ Installation
 
 ###on Windows:
 
-1.  ensure that you have a working `which` and `diff` on your machine and on
-    your search path.
+1.  Ensure that you have a working `diff` on your machine and in your search path.
 
-    There are two options:
+    There are several options:
 
-    1.  install unxutils <http://sourceforge.net/projects/unxutils>
+	1.  Install [Diff::LCS](https://github.com/halostatue/diff-lcs), which includes `ldiff`. [RSpec](https://www.relishapp.com/rspec/docs/gettingstarted)
+		depends on Diff::LCS so you may already have it installed.
+		
+	1.  If you're using [RubyInstaller](http://rubyinstaller.org), install the [devkit](http://rubyinstaller.org/add-ons/devkit).
+
+	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
+    1.  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
+2.   Install the gem by
 
          gem install diffy
 

data/lib/diffy/diff.rb

@@ -51,7 +51,7 @@ module Diffy
 
         if WINDOWS
           # don't use open3 on windows
-          cmd = "\"#{diff_bin}\" #{diff_options.join(' ')} #{paths.map{|s| "\"#{s}\""}.join(' ')}"
+          cmd = sprintf '"%s" %s %s', diff_bin, diff_options.join(' '), paths.map { |s| %("#{s}") }.join(' ')
           diff = `#{cmd}`
         else
           diff = Open3.popen3(diff_bin, *(diff_options + paths)) { |i, o, e| o.read }
@@ -142,15 +142,20 @@ module Diffy
     def diff_bin
       return @@bin if @@bin
 
-      @@bin ||= ""
-      if WINDOWS
-        @@bin = `which diff.exe`.chomp if @@bin.empty?
+      if @@bin = ENV['DIFFY_DIFF']
+        # system() trick from Minitest
+        raise "Can't execute diff program '#@@bin'" unless system(@@bin, __FILE__, __FILE__)
+        return @@bin
       end
-      @@bin = `which diff`.chomp if @@bin.empty?
 
-      if @@bin.empty?
+      diffs = ['diff', 'ldiff']
+      diffs.first << '.exe' if WINDOWS  # ldiff does not have exe extension
+      @@bin = diffs.find { |name| system(name, __FILE__, __FILE__) }
+
+      if @@bin.nil?
         raise "Can't find a diff executable in PATH #{ENV['PATH']}"
       end
+
       @@bin
     end
 

data/lib/diffy/version.rb

@@ -1,3 +1,3 @@
 module Diffy
-  VERSION = '3.0.6'
+  VERSION = '3.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake