diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | History.rdoc | 36 | ||||
| -rw-r--r-- | Manifest.txt | 6 | ||||
| -rw-r--r-- | diff-lcs.gemspec | 45 |
4 files changed, 53 insertions, 35 deletions
@@ -12,3 +12,4 @@ coverage.info .rake_tasks~ .DS_Store website/index.html +research/ diff --git a/History.rdoc b/History.rdoc index a8946c9..d016bb1 100644 --- a/History.rdoc +++ b/History.rdoc @@ -1,14 +1,38 @@ -== ? / 2012-03-?? -* Major Enhancements: +== 1.2.0 / 2013-01-20 +* This is being released as version 1.2 because of the feature changes and + internal migration. * Minor Enhancements: * Added special case handling for Diff::LCS.patch so that it handles patches that are empty or contain no changes. -* Bug Fixes: - * Resolved Issue #2 by handling string[string.size, 1] properly (it returns - "" not nil). + * Added two new methods (#patch_me and #unpatch_me) to the includable module. +* Bugs Fixed: + * Fixed issue #1 patch direction detection. + https://github.com/halostatue/diff-lcs/issues/1 + * Resolved issue #2 by handling string[string.size, 1] properly (it returns + "" not nil). https://github.com/halostatue/diff-lcs/issues/2 + * Michael Granger (ged) fixed an implementation error in Diff::LCS::Change + and added specs in pull request #8. Thanks! + https://github.com/halostatue/diff-lcs/issues/8 + * Made the code auto-testable. + * Vit Ondruch (voxik) provided the latest version of the GPL2 license file in + pull request #10. Thanks! https://github.com/halostatue/diff-lcs/issues/10 + * Fixed a documentation issue with the includable versions of #patch! and + #unpatch! where they implied that they would replace the original value. + Given that Diff::LCS.patch always returns a copy, the documentation was + incorrect and has been corrected. To provide the behaviour that was + originally documented, two new methods (#patch_me and #unpatch_me) were + added to provide this behaviour. Found by scooter-dangle in issue #12. + Thanks! https://github.com/halostatue/diff-lcs/issues/12 * Code Style Changes: - * Trailing spaces + * Removed trailing spaces. * Calling class methods using '.' instead of '::'. + * Vit Ondruch (voxik) removed unnecessary shebangs in pull request #9. + Thanks! https://github.com/halostatue/diff-lcs/issues/9 + * Kenichi Kamiya (kachick) removed some warnings of an unused variable in + lucky pull request #13. https://github.com/halostatue/diff-lcs/issues/13 + Thanks! + * Embarked on a major refactoring to make the files a little more manageable + and understand the code on a deeper level. == 1.1.3 / 2011-08-27 * Converted to 'hoe' for release. diff --git a/Manifest.txt b/Manifest.txt index 1a6fca7..023cff0 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -1,8 +1,11 @@ +.autotest +.rspec History.rdoc License.rdoc Manifest.txt README.rdoc Rakefile +autotest/discover.rb bin/htmldiff bin/ldiff diff-lcs.gemspec @@ -16,9 +19,12 @@ 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 diff --git a/diff-lcs.gemspec b/diff-lcs.gemspec index 671690b..a179ac3 100644 --- a/diff-lcs.gemspec +++ b/diff-lcs.gemspec @@ -1,51 +1,38 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| - s.name = %q{diff-lcs} - s.version = "1.1.3" + s.name = "diff-lcs" + s.version = "1.2.0.20130120032021" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Austin Ziegler"] - s.date = %q{2011-08-27} - s.description = %q{Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt -longest common subsequence (LCS) algorithm to compute intelligent differences -between two sequenced enumerable containers. The implementation is based on -Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st] -(1993) and Ned Konz's Perl version -{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/]. - -This is release 1.1.3, fixing several small bugs found over the years. Version -1.1.0 added new features, including the ability to #patch and #unpatch changes -as well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks, -that should improve the context sensitivity of patching. - -This library is called Diff::LCS because of an early version of Algorithm::Diff -which was restrictively licensed. This version has seen a minor license change: -instead of being under Ruby's license as an option, the third optional license -is the MIT license.} + s.date = "2013-01-20" + s.description = "Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt\nlongest common subsequence (LCS) algorithm to compute intelligent differences\nbetween two sequenced enumerable containers. The implementation is based on\nMario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st]\n(1993) and Ned Konz's Perl version\n{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/].\n\nThis is release 1.1.3, fixing several small bugs found over the years. Version\n1.1.0 added new features, including the ability to #patch and #unpatch changes\nas well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks,\nthat should improve the context sensitivity of patching.\n\nThis library is called Diff::LCS because of an early version of Algorithm::Diff\nwhich was restrictively licensed. This version has seen a minor license change:\ninstead of being under Ruby's license as an option, the third optional license\nis the MIT license." s.email = ["austin@rubyforge.org"] s.executables = ["htmldiff", "ldiff"] - s.extra_rdoc_files = ["Manifest.txt", "docs/COPYING.txt", "History.rdoc", "License.rdoc", "README.rdoc"] - s.files = ["History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "bin/htmldiff", "bin/ldiff", "diff-lcs.gemspec", "docs/COPYING.txt", "docs/artistic.html", "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/ldiff.rb", "lib/diff/lcs/string.rb", "spec/diff_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", ".gemtest"] + s.extra_rdoc_files = ["History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "docs/COPYING.txt", "History.rdoc", "License.rdoc", "README.rdoc"] + s.files = [".autotest", ".rspec", "History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "autotest/discover.rb", "bin/htmldiff", "bin/ldiff", "diff-lcs.gemspec", "docs/COPYING.txt", "docs/artistic.html", "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", ".gemtest"] s.rdoc_options = ["--main", "README.rdoc"] s.require_paths = ["lib"] - s.rubyforge_project = %q{ruwiki} - s.rubygems_version = %q{1.3.6} - s.summary = %q{Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers} + s.rubyforge_project = "ruwiki" + s.rubygems_version = "1.8.24" + s.summary = "Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers" if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 3 - if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_development_dependency(%q<rdoc>, ["~> 3.10"]) s.add_development_dependency(%q<rspec>, ["~> 2.0"]) - s.add_development_dependency(%q<hoe>, ["~> 2.10"]) + s.add_development_dependency(%q<hoe>, ["~> 3.4"]) else + s.add_dependency(%q<rdoc>, ["~> 3.10"]) s.add_dependency(%q<rspec>, ["~> 2.0"]) - s.add_dependency(%q<hoe>, ["~> 2.10"]) + s.add_dependency(%q<hoe>, ["~> 3.4"]) end else + s.add_dependency(%q<rdoc>, ["~> 3.10"]) s.add_dependency(%q<rspec>, ["~> 2.0"]) - s.add_dependency(%q<hoe>, ["~> 2.10"]) + s.add_dependency(%q<hoe>, ["~> 3.4"]) end end |