diffy 2.1.0 → 2.1.1

data/README.md

@@ -175,11 +175,24 @@ symbols in the output.
       </ul>
     </div>
 
+### Number of lines of context around changes
+
+You can use the `:context` option to override the number of lines of context
+that are shown around each change (this defaults to 10000 to show the full
+file).
+
+    >> puts Diffy::Diff.new("foo\nfoo\nBAR\nbang\nbaz", "foo\nfoo\nbar\nbang\nbaz", :context => 1)
+     foo
+    -BAR
+    +bar
+     bang
+
 
 ### Overriding the command line options passed to diff.
 
 You can use the `:diff` option to override the command line options that are
-passed to unix diff. They default to `-U 10000`.
+passed to unix diff. They default to `-U 10000`.  This option will noop if
+combined with the `:context` option.
 
     >> puts Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n", :diff => "-w")
       foo

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/diffy.gemspec

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

data/lib/diffy.rb

@@ -1,11 +1,15 @@
 require 'tempfile'
 require 'erb'
+require 'rbconfig'
 # 1.9 compatibility
 if defined? Enumerator and ! defined? Enumerable::Enumerator
   Enumerable::Enumerator = Enumerator
 end
 
-module Diffy; end
+module Diffy
+  WINDOWS = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+end
+require 'open3' unless Diffy::WINDOWS
 require File.join(File.dirname(__FILE__), 'diffy', 'format')
 require File.join(File.dirname(__FILE__), 'diffy', 'html_formatter')
 require File.join(File.dirname(__FILE__), 'diffy', 'diff')

data/lib/diffy/diff.rb

@@ -13,7 +13,8 @@ module Diffy
           :diff => '-U 10000',
           :source => 'strings',
           :include_diff_info => false,
-          :include_plus_and_minus_in_html => false
+          :include_plus_and_minus_in_html => false,
+          :context => nil
         }
       end
 
@@ -44,9 +45,14 @@ module Diffy
           when 'files'
             [string1, string2]
           end
-        diff_opts = options[:diff].is_a?(Array) ? options[:diff] : [options[:diff]]
-        cmd = "#{diff_bin} #{diff_opts.join(' ')} #{paths.join(' ')}"
-        diff = `#{cmd}`
+
+        if WINDOWS
+          # don't use open3 on windows
+          cmd = "#{diff_bin} #{diff_options.join(' ')} #{paths.join(' ')}"
+          diff = `#{cmd}`
+        else
+          diff = Open3.popen3(diff_bin, *(diff_options + paths)) { |i, o, e| o.read }
+        end
         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,10 +122,14 @@ module Diffy
     end
     private
 
+    @@bin = nil
     def diff_bin
-      @@bin ||=""
-      
-      @@bin = `which diff.exe`.chomp if @@bin.empty?
+      return @@bin if @@bin
+
+      @@bin ||= ""
+      if WINDOWS
+        @@bin = `which diff.exe`.chomp if @@bin.empty?
+      end
       @@bin = `which diff`.chomp if @@bin.empty?
 
       if @@bin.empty?
@@ -128,5 +138,10 @@ module Diffy
       @@bin
     end
 
+    # options pass to diff program
+    def diff_options
+      Array(options[:context] ? "-U #{options[:context]}" : options[:diff])
+    end
+
   end
 end

data/spec/diffy_spec.rb

@@ -79,6 +79,19 @@ describe Diffy::Diff do
 
   end
 
+  describe "options[:context]" do
+    it "should limit context lines to 1" do
+      diff = Diffy::Diff.new("foo\nfoo\nBAR\nbang\nbaz", "foo\nfoo\nbar\nbang\nbaz", :context => 1)
+      puts diff
+      diff.to_s.should == <<-DIFF
+ foo
+-BAR
++bar
+ bang
+      DIFF
+    end
+  end
+
   describe "options[:include_plus_and_minus_in_html]" do
     it "defaults to false" do
       @diffy = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n")

metadata

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