diff options
-rw-r--r-- | .gemtest | 0 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Gemfile | 11 | ||||
-rw-r--r-- | License.rdoc | 11 | ||||
-rw-r--r-- | Manifest.txt | 1 | ||||
-rw-r--r-- | README.rdoc | 18 | ||||
-rw-r--r-- | Rakefile | 17 | ||||
-rw-r--r-- | diff-lcs.gemspec | 56 |
8 files changed, 49 insertions, 66 deletions
diff --git a/.gemtest b/.gemtest new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.gemtest @@ -1,3 +1,4 @@ +Gemfile.lock spec/ldap.yml .rvmrc pkg/ @@ -4,17 +4,16 @@ source "https://rubygems.org/" - -gem "rubyforge", ">=2.0.4", :group => [:development, :test] -gem "rdoc", "~>3.10", :group => [:development, :test] -gem "rspec", "~>2.0", :group => [:development, :test] -gem "rake", "~>10.0", :group => [:development, :test] +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 "hoe-travis", "~>1.2", :group => [:development, :test] -gem "hoe", "~>3.4", :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] # vim: syntax=ruby diff --git a/License.rdoc b/License.rdoc index 4237146..63b763d 100644 --- a/License.rdoc +++ b/License.rdoc @@ -4,12 +4,13 @@ This software is available under three licenses: the GNU GPL version 2 (or at your option, a later version), the Perl Artistic license, or the MIT license. Note that my preference for licensing is the MIT license, but Algorithm::Diff was dually originally licensed with the Perl Artistic and the GNU GPL ("the -same terms as Perl itself") and that the Ruby implementation hews pretty -closely to the Perl version, so I must maintain the additional licensing terms. +same terms as Perl itself") and given that the Ruby implementation originally +hewed pretty closely to the Perl version, I must maintain the additional +licensing terms. -* Copyright 2004–2011 Austin Ziegler. -* Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk versionby - Mario I. Wolczko <mario@wolczko.com> +* Copyright 2004–2013 Austin Ziegler. +* Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by + Mario I. Wolczko. === MIT License diff --git a/Manifest.txt b/Manifest.txt index ff96f2f..e267b2c 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -1,4 +1,5 @@ .autotest +.gemtest .rspec .travis.yml Contributing.rdoc diff --git a/README.rdoc b/README.rdoc index a2d92ea..4b95814 100644 --- a/README.rdoc +++ b/README.rdoc @@ -74,24 +74,6 @@ which was restrictively licensed. {<img src="https://travis-ci.org/halostatue/diff-lcs.png" />}[https://travis-ci.org/halostatue/diff-lcs] -== Contributing - -If you'd like to hack on Diff::LCS, start by forking the repo on GitHub: - -https://github.com/halostatue/diff-lcs - -The best way to get your changes merged back into core is as follows: - -1. Clone down your fork. -2. Create a thoughtfully named topic branch to contain your change. -3. Hack away. -4. Add tests and make sure everything still passes by running rake. -5. If you are adding new functionality, document it in the README. -6. Do not change the version number, we will do that on our end. -7. If necessary, rebase your commits into logical chunks, without errors. -8. Push the branch up to GitHub. -9. Send a pull request for your branch - :include: Contributing.rdoc :include: License.rdoc @@ -6,10 +6,10 @@ require 'hoe' Hoe.plugin :bundler Hoe.plugin :doofus +Hoe.plugin :email Hoe.plugin :gemspec Hoe.plugin :git Hoe.plugin :rubyforge -Hoe.plugin :email Hoe.plugin :travis Hoe.spec 'diff-lcs' do @@ -22,15 +22,14 @@ Hoe.spec 'diff-lcs' do self.readme_file = 'README.rdoc' self.extra_rdoc_files = FileList["*.rdoc"].to_a - self.extra_dev_deps << ['rspec', '~> 2.0'] - self.extra_dev_deps << ['rake', '~> 10.0'] - self.extra_dev_deps << ['hoe-bundler', '~> 1.2.0'] - self.extra_dev_deps << ['hoe-doofus', '~> 1.0.0'] - self.extra_dev_deps << ['hoe-gemspec', '~> 1.0.0'] - self.extra_dev_deps << ['hoe-git', '~> 1.5.0'] - self.extra_dev_deps << ['hoe-rubygems', '~> 1.0.0'] -# self.extra_dev_deps << ['hoe-seattlerb', '~> 1.2.9, 1.2.8'] + 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-git', '~> 1.5'] + self.extra_dev_deps << ['hoe-rubygems', '~> 1.0'] self.extra_dev_deps << ['hoe-travis', '~> 1.2'] + self.extra_dev_deps << ['rake', '~> 10.0'] + self.extra_dev_deps << ['rspec', '~> 2.0'] end unless Rake::Task.task_defined? :test diff --git a/diff-lcs.gemspec b/diff-lcs.gemspec index 0bbc4fe..ec1002e 100644 --- a/diff-lcs.gemspec +++ b/diff-lcs.gemspec @@ -2,21 +2,21 @@ Gem::Specification.new do |s| s.name = "diff-lcs" - s.version = "1.2.0' + s.version = "1.2.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Austin Ziegler"] - s.date = "2013-01-21" + s.date = "2013-02-04" 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. Everyone is strongly encouraged to upgrade to this version\nas it fixes all 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", ".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", ".gemtest"] + 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.24" + 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 @@ -25,39 +25,39 @@ Gem::Specification.new do |s| 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<rspec>, ["~> 2.0"]) - s.add_development_dependency(%q<rake>, ["~> 10.0"]) - s.add_development_dependency(%q<hoe-bundler>, ["~> 1.2.0"]) - s.add_development_dependency(%q<hoe-doofus>, ["~> 1.0.0"]) - s.add_development_dependency(%q<hoe-gemspec>, ["~> 1.0.0"]) - s.add_development_dependency(%q<hoe-git>, ["~> 1.5.0"]) - s.add_development_dependency(%q<hoe-rubygems>, ["~> 1.0.0"]) + 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<hoe>, ["~> 3.4"]) + 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<rspec>, ["~> 2.0"]) - s.add_dependency(%q<rake>, ["~> 10.0"]) - s.add_dependency(%q<hoe-bundler>, ["~> 1.2.0"]) - s.add_dependency(%q<hoe-doofus>, ["~> 1.0.0"]) - s.add_dependency(%q<hoe-gemspec>, ["~> 1.0.0"]) - s.add_dependency(%q<hoe-git>, ["~> 1.5.0"]) - s.add_dependency(%q<hoe-rubygems>, ["~> 1.0.0"]) + 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<hoe>, ["~> 3.4"]) + 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<rspec>, ["~> 2.0"]) - s.add_dependency(%q<rake>, ["~> 10.0"]) - s.add_dependency(%q<hoe-bundler>, ["~> 1.2.0"]) - s.add_dependency(%q<hoe-doofus>, ["~> 1.0.0"]) - s.add_dependency(%q<hoe-gemspec>, ["~> 1.0.0"]) - s.add_dependency(%q<hoe-git>, ["~> 1.5.0"]) - s.add_dependency(%q<hoe-rubygems>, ["~> 1.0.0"]) + 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<hoe>, ["~> 3.4"]) + s.add_dependency(%q<rake>, ["~> 10.0"]) + s.add_dependency(%q<rspec>, ["~> 2.0"]) + s.add_dependency(%q<hoe>, ["~> 3.5"]) end end |