diff-lcs 1.2.3 → 1.2.4

data.tar.gz.sig

@@ -1,4 +1,3 @@
-GZ���y}zx���g��zQ:>���
-���J��3�֎�z���w8�.�s<��?�:<]����f�D"��@c|��g��ÕM�}��](�B��0�3L�A
-.��9�6N�˽��-������漈KE}`4Ep	��Bg}��3��^�/fչ
-�Av�-�e
+K�T�*V׻���Gݢ�p�οy�M��b�#�����ܝt��ᮣsE-zZ�o7�=5���+����[Ŭ:�Ӿ�F��w��Ϯ��-�f�߁S8�0�s��K
u��o2*���H�V]�$F}+�
+=��
s��J?��
+�{��,F��m�=�
���=��كڀb���2{dm��ɌBf_���&�t

data/.hoerc

@@ -1,2 +1,2 @@
 ---
-exclude: !ruby/regexp /(tmp|swp)$|CVS|TAGS|\.(svn|git|hg|DS_Store|idea)|Gemfile.lock|research\//
+exclude: !ruby/regexp /(tmp|swp)$|CVS|TAGS|\.(svn|git|hg|DS_Store|idea)|Gemfile\.lock|research\/|\.gemspec$/

data/Gemfile

@@ -4,16 +4,17 @@
 
 source "https://rubygems.org/"
 
-gem "hoe", "~>3.4", :group => [:development, :test]
-gem "hoe-bundler", "~>1.2.0", :group => [:development, :test]
-gem "hoe-doofus", "~>1.0.0", :group => [:development, :test]
-gem "hoe-gemspec", "~>1.0.0", :group => [:development, :test]
-gem "hoe-git", "~>1.5.0", :group => [:development, :test]
-gem "hoe-rubygems", "~>1.0.0", :group => [:development, :test]
+
+gem "rubyforge", ">=2.0.4", :group => [:development, :test]
+gem "rdoc", "~>4.0", :group => [:development, :test]
+gem "hoe-bundler", "~>1.2", :group => [:development, :test]
+gem "hoe-doofus", "~>1.0", :group => [:development, :test]
+gem "hoe-gemspec2", "~>1.1", :group => [:development, :test]
+gem "hoe-git", "~>1.5", :group => [:development, :test]
+gem "hoe-rubygems", "~>1.0", :group => [:development, :test]
 gem "hoe-travis", "~>1.2", :group => [:development, :test]
 gem "rake", "~>10.0", :group => [:development, :test]
-gem "rdoc", "~>3.10", :group => [:development, :test]
 gem "rspec", "~>2.0", :group => [:development, :test]
-gem "rubyforge", ">=2.0.4", :group => [:development, :test]
+gem "hoe", "~>3.6", :group => [:development, :test]
 
 # vim: syntax=ruby

data/History.rdoc

@@ -1,3 +1,14 @@
+=== 1.2.4 / 2013-04-20
+
+* Bugs fixed:
+  * A bug was introduced after 1.1.3 when pruning common sequences at the start
+    of comparison. Paul Kunysch (@pck) fixed this in pull request 18. Thanks!
+    https://github.com/halostatue/diff-lcs/pull/18
+* The Rubinius (1.9 mode) bug in rubinius/rubinius#2268 has been fixed by the
+  Rubinius team two days after it was filed. Thanks for fixing this so quickly!
+  https://github.com/rubinius/rubinius/issues/2268
+* Switching to Raggi's hoe-gemspec2 for gemspec generation.
+
 == 1.2.3 / 2013-04-11
 
 * Bugs Fixed:

data/Manifest.txt

@@ -13,7 +13,6 @@ Rakefile
 autotest/discover.rb
 bin/htmldiff
 bin/ldiff
-diff-lcs.gemspec
 docs/COPYING.txt
 docs/artistic.txt
 lib/diff-lcs.rb

data/README.rdoc

@@ -11,16 +11,14 @@ Diff::LCS computes the difference between two Enumerable sequences using the
 McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
 to create a simple HTML diff output format and a standard diff-like tool.
 
-This is release 1.2.3, fixing a bug in value comparison where the left side of
-the comparison was the empty set, preventing the detection of encoding. Thanks
-to Jon Rowe for fixing this issue. This is a strongly recommended release.
-
-*Note*: There is a known issue with Rubinius in 1.9 mode reported in
-{rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268] and
-demonstrated in the Travis CI builds. For all other tested platforms, diff-lcs
-is considered stable. As soon as a suitably small test-case can be created for
-the Rubinius team to examine, this will be added to the Rubinius issue around
-this.
+This is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did
+not properly prune common sequences at the beginning of a comparison set.
+Thanks to Paul Kunysch for fixing this issue.
+
+Coincident with the release of diff-lcs 1.2.3, we reported an issue with
+Rubinius in 1.9 mode
+({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]).
+We are happy to report that this issue has been resolved.
 
 == Synopsis
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'hoe'
 Hoe.plugin :bundler
 Hoe.plugin :doofus
 Hoe.plugin :email
-Hoe.plugin :gemspec
+Hoe.plugin :gemspec2
 Hoe.plugin :git
 Hoe.plugin :rubyforge
 Hoe.plugin :travis
@@ -24,7 +24,7 @@ Hoe.spec 'diff-lcs' do
 
   self.extra_dev_deps << ['hoe-bundler', '~> 1.2']
   self.extra_dev_deps << ['hoe-doofus', '~> 1.0']
-  self.extra_dev_deps << ['hoe-gemspec', '~> 1.0']
+  self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
   self.extra_dev_deps << ['hoe-git', '~> 1.5']
   self.extra_dev_deps << ['hoe-rubygems', '~> 1.0']
   self.extra_dev_deps << ['hoe-travis', '~> 1.2']

data/lib/diff/lcs.rb

@@ -1,7 +1,7 @@
 # -*- ruby encoding: utf-8 -*-
 
 module Diff; end unless defined? Diff
-# = Diff::LCS 1.2.3
+# = Diff::LCS 1.2.4
 #
 # Computes "intelligent" differences between two sequenced Enumerables. This
 # is an implementation of the McIlroy-Hunt "diff" algorithm for Enumerable
@@ -129,7 +129,7 @@ module Diff; end unless defined? Diff
 # Common Subsequences</em>, CACM, vol.20, no.5, pp.350-353, May
 # 1977, with a few minor improvements to improve the speed."
 module Diff::LCS
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end
 
 require 'diff/lcs/callbacks'

data/lib/diff/lcs/internals.rb

@@ -49,6 +49,7 @@ class << Diff::LCS::Internals
            (a[a_start] == b[b_start]))
       vector[a_start] = b_start
       a_start += 1
+      b_start += 1
     end
     b_start = a_start
 

data/spec/diff_spec.rb

@@ -31,6 +31,12 @@ describe "Diff::LCS.diff" do
     change_diff(correct_diff).should == diff
   end
 
+  it "should correctly diff 'xx' and 'xaxb'" do
+    left = 'xx'
+    right = 'xaxb'
+    Diff::LCS.patch(left, Diff::LCS.diff(left, right)).should == right
+  end
+
   it "should return an empty diff with (hello, hello)" do
     Diff::LCS.diff(hello, hello).should == []
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,13 +117,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-gemspec
+  name: hoe-gemspec2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hoe-git
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -227,7 +227,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 description: ! 'Diff::LCS computes the difference between two Enumerable sequences
   using the
 
@@ -236,24 +236,20 @@ description: ! 'Diff::LCS computes the difference between two Enumerable sequenc
   to create a simple HTML diff output format and a standard diff-like tool.
 
 
-  This is release 1.2.3, fixing a bug in value comparison where the left side of
-
-  the comparison was the empty set, preventing the detection of encoding. Thanks
-
-  to Jon Rowe for fixing this issue. This is a strongly recommended release.
+  This is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did
 
+  not properly prune common sequences at the beginning of a comparison set.
 
-  *Note*: There is a known issue with Rubinius in 1.9 mode reported in
+  Thanks to Paul Kunysch for fixing this issue.
 
-  {rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268] and
 
-  demonstrated in the Travis CI builds. For all other tested platforms, diff-lcs
+  Coincident with the release of diff-lcs 1.2.3, we reported an issue with
 
-  is considered stable. As soon as a suitably small test-case can be created for
+  Rubinius in 1.9 mode
 
-  the Rubinius team to examine, this will be added to the Rubinius issue around
+  ({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]).
 
-  this.'
+  We are happy to report that this issue has been resolved.'
 email:
 - austin@rubyforge.org
 executables:
@@ -284,7 +280,6 @@ files:
 - autotest/discover.rb
 - bin/htmldiff
 - bin/ldiff
-- diff-lcs.gemspec
 - docs/COPYING.txt
 - docs/artistic.txt
 - lib/diff-lcs.rb

data/diff-lcs.gemspec

@@ -1,63 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "diff-lcs"
-  s.version = "1.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Austin Ziegler"]
-  s.date = "2013-02-09"
-  s.description = "Diff::LCS computes the difference between two Enumerable sequences using the\nMcIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities\nto create a simple HTML diff output format and a standard diff-like tool.\n\nThis is release 1.2.1, restoring the public API to what existed in Diff::LCS\n1.1.x. Everyone is strongly encouraged to upgrade to this version as it fixes\nall known outstanding issues."
-  s.email = ["austin@rubyforge.org"]
-  s.executables = ["htmldiff", "ldiff"]
-  s.extra_rdoc_files = ["Contributing.rdoc", "History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "docs/COPYING.txt", "docs/artistic.txt", "Contributing.rdoc", "History.rdoc", "License.rdoc", "README.rdoc"]
-  s.files = [".autotest", ".gemtest", ".rspec", ".travis.yml", "Contributing.rdoc", "Gemfile", "History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "autotest/discover.rb", "bin/htmldiff", "bin/ldiff", "diff-lcs.gemspec", "docs/COPYING.txt", "docs/artistic.txt", "lib/diff-lcs.rb", "lib/diff/lcs.rb", "lib/diff/lcs/array.rb", "lib/diff/lcs/block.rb", "lib/diff/lcs/callbacks.rb", "lib/diff/lcs/change.rb", "lib/diff/lcs/htmldiff.rb", "lib/diff/lcs/hunk.rb", "lib/diff/lcs/internals.rb", "lib/diff/lcs/ldiff.rb", "lib/diff/lcs/string.rb", "spec/change_spec.rb", "spec/diff_spec.rb", "spec/issues_spec.rb", "spec/lcs_spec.rb", "spec/patch_spec.rb", "spec/sdiff_spec.rb", "spec/spec_helper.rb", "spec/traverse_balanced_spec.rb", "spec/traverse_sequences_spec.rb"]
-  s.homepage = "http://diff-lcs.rubyforge.org/"
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "diff-lcs"
-  s.rubygems_version = "1.8.25"
-  s.summary = "Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe-bundler>, ["~> 1.2"])
-      s.add_development_dependency(%q<hoe-doofus>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe-gemspec>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe-git>, ["~> 1.5"])
-      s.add_development_dependency(%q<hoe-rubygems>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe-travis>, ["~> 1.2"])
-      s.add_development_dependency(%q<rake>, ["~> 10.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
-    else
-      s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
-      s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
-      s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
-      s.add_dependency(%q<hoe-git>, ["~> 1.5"])
-      s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
-      s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
-      s.add_dependency(%q<rake>, ["~> 10.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.5"])
-    end
-  else
-    s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
-    s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
-    s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
-    s.add_dependency(%q<hoe-git>, ["~> 1.5"])
-    s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
-    s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
-    s.add_dependency(%q<rake>, ["~> 10.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.5"])
-  end
-end