summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--History.rdoc18
-rwxr-xr-x[-rw-r--r--]bin/htmldiff2
-rwxr-xr-x[-rw-r--r--]bin/ldiff2
-rw-r--r--diff-lcs.gemspec27
4 files changed, 26 insertions, 23 deletions
diff --git a/History.rdoc b/History.rdoc
index b6b4b60..ac8f7a3 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,15 +1,17 @@
-== 1.1.3 / 2011-07-30
+== 1.1.3 / 2011-08-27
* Converted to 'hoe' for release.
* Converted tests to RSpec 2.
+* Extracted the body of htmldiff into a class available from
+ diff/lcs/htmldiff.
+* Migrated development and issue tracking to GitHub.
* Bugs fixed:
- - Issue 4 (https://github.com/halostatue/diff-lcs/issues/4) fixed.
- In the process, HTMLDiff was made easier to use outside of the htmldiff
- command.
- - Issue 3 (https://github.com/halostatue/diff-lcs/issues/3) fixed.
+ - Eliminated the explicit use of RubyGems in both bin/htmldiff and bin/ldiff.
+ Resolves issue 4 (https://github.com/halostatue/diff-lcs/issues/4).
+ - Eliminated Ruby warnings. Resolves issue 3
+ (https://github.com/halostatue/diff-lcs/issues/3).
== 1.1.2 / 2004-10-20
-* Fixed a problem reported by Mauricio Fernandez in htmldiff. Future versions
- of Diff::LCS will be removing this program.
+* Fixed a problem reported by Mauricio Fernandez in htmldiff.
== 1.1.1 / 2004-09-25
* Fixed bug #891:
@@ -45,7 +47,7 @@
* Minor modifications to the gemspec, the README.
* Renamed the diff program to ldiff (as well as the companion batch file) so as
to not collide with the standard diff program.
-* Fixed issues with RubyGEMs. Requires RubyGems > 0.6.1 or >= 0.6.1 with the
+* Fixed issues with RubyGems. Requires RubyGems > 0.6.1 or >= 0.6.1 with the
latest CVS version.
== 1.0 / -
diff --git a/bin/htmldiff b/bin/htmldiff
index 056564c..1e4efe7 100644..100755
--- a/bin/htmldiff
+++ b/bin/htmldiff
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!ruby -w
require 'diff/lcs'
require 'diff/lcs/htmldiff'
diff --git a/bin/ldiff b/bin/ldiff
index 21b4ed8..a9b876f 100644..100755
--- a/bin/ldiff
+++ b/bin/ldiff
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!ruby -w
require 'diff/lcs'
require 'diff/lcs/ldiff'
diff --git a/diff-lcs.gemspec b/diff-lcs.gemspec
index 285b667..671690b 100644
--- a/diff-lcs.gemspec
+++ b/diff-lcs.gemspec
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
s.version = "1.1.3"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = [%q{Austin Ziegler}]
- s.date = %q{2011-08-24}
+ 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
@@ -23,28 +23,29 @@ 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.email = [%q{austin@rubyforge.org}]
- s.executables = [%q{htmldiff}, %q{ldiff}]
- s.extra_rdoc_files = [%q{Manifest.txt}, %q{docs/COPYING.txt}, %q{History.rdoc}, %q{License.rdoc}, %q{README.rdoc}]
- s.files = [%q{History.rdoc}, %q{License.rdoc}, %q{Manifest.txt}, %q{README.rdoc}, %q{Rakefile}, %q{bin/htmldiff}, %q{bin/ldiff}, %q{diff-lcs.gemspec}, %q{docs/COPYING.txt}, %q{docs/artistic.html}, %q{lib/diff-lcs.rb}, %q{lib/diff/lcs.rb}, %q{lib/diff/lcs/array.rb}, %q{lib/diff/lcs/block.rb}, %q{lib/diff/lcs/callbacks.rb}, %q{lib/diff/lcs/change.rb}, %q{lib/diff/lcs/htmldiff.rb}, %q{lib/diff/lcs/hunk.rb}, %q{lib/diff/lcs/ldiff.rb}, %q{lib/diff/lcs/string.rb}, %q{spec/diff_spec.rb}, %q{spec/lcs_spec.rb}, %q{spec/patch_spec.rb}, %q{spec/sdiff_spec.rb}, %q{spec/spec_helper.rb}, %q{spec/traverse_balanced_spec.rb}, %q{spec/traverse_sequences_spec.rb}]
- s.rdoc_options = [%q{--main}, %q{README.rdoc}]
- s.require_paths = [%q{lib}]
+ 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.rdoc_options = ["--main", "README.rdoc"]
+ s.require_paths = ["lib"]
s.rubyforge_project = %q{ruwiki}
- s.rubygems_version = %q{1.8.6}
+ 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}
if s.respond_to? :specification_version then
+ current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 3
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<rspec>, ["~> 2.0"])
- s.add_development_dependency(%q<hoe>, ["~> 2.12"])
+ s.add_development_dependency(%q<hoe>, ["~> 2.10"])
else
s.add_dependency(%q<rspec>, ["~> 2.0"])
- s.add_dependency(%q<hoe>, ["~> 2.12"])
+ s.add_dependency(%q<hoe>, ["~> 2.10"])
end
else
s.add_dependency(%q<rspec>, ["~> 2.0"])
- s.add_dependency(%q<hoe>, ["~> 2.12"])
+ s.add_dependency(%q<hoe>, ["~> 2.10"])
end
end