Merge pull request #200 from enthuseinc/feature/support_diff-lcs_1.2.x

Add support for diff-lcs 1.2.x while maintaining backwards compatibility with 1.1.3

Author: myronmarston

lib/rspec/expectations/differ.rb

@@ -25,7 +25,13 @@ def diff_as_string(data_new, data_old)
             # diff includes lines of context. Otherwise, we might print
             # redundant lines.
             if (context_lines > 0) and hunk.overlaps?(oldhunk)
-              hunk.unshift(oldhunk)
+              if hunk.respond_to?(:merge)
+                # diff-lcs 1.2.x
+                hunk.merge(oldhunk)
+              else
+                # diff-lcs 1.1.3
+                hunk.unshift(oldhunk)
+              end
             else
               output << oldhunk.diff(format)
             end

rspec-expectations.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 
-  s.add_runtime_dependency     'diff-lcs', '~> 1.1.3'
+  s.add_runtime_dependency     'diff-lcs', '>= 1.1.3'
 
   s.add_development_dependency 'rake',     '~> 10.0.0'
   s.add_development_dependency 'cucumber', '~> 1.1.9'