From 60613d2af564a93dc5c19c8a71c3f674a5db6fdb Mon Sep 17 00:00:00 2001 From: Austin Ziegler Date: Tue, 30 Jun 2020 09:51:08 -0400 Subject: # This is a combination of 9 commits. # This is the 1st commit message: Fix improperly placed chunks Resolve #65 - Also add even more tests for checking `ldiff` results against `diff` results. - Fix issues with diff/ldiff output highlighted by the above tests. - Add a parameter to indicate that the hunk being processed is the _last_ hunk; this results in correct counting of the hunk size. - The misplaced chunks were happening because of an improper `.abs` on `#diff_size`, when the `.abs` needed to be on the finding of the maximum diff size. # This is the commit message #2: Ooops. Debugger # This is the commit message #3: Restore missing test - Fix some more format issues raised by the missing test. - Start fixing Rubocop formatting. # This is the commit message #4: Last RuboCop fixes # This is the commit message #5: Finalize diff-lcs 1.4 # This is the commit message #6: Fix #44 The problem here was the precedence of `or` vs `||`. Switching to `||` resulted in the expected behaviour. # This is the commit message #7: Resolve #43 # This is the commit message #8: Typo # This is the commit message #9: Resolve #35 with a comment --- Rakefile | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 7beb3b6..afd9307 100644 --- a/Rakefile +++ b/Rakefile @@ -10,18 +10,19 @@ Hoe.plugin :gemspec2 Hoe.plugin :git if RUBY_VERSION < '1.9' - class Array + class Array #:nodoc: def to_h - Hash[*self.flatten(1)] + Hash[*flatten(1)] end end - class Gem::Specification - def metadata=(*) - end + class Gem::Specification #:nodoc: + def metadata=(*); end + + def default_value(*); end end - class Object + class Object #:nodoc: def caller_locations(*) [] end @@ -55,3 +56,19 @@ if RUBY_VERSION >= '2.0' && RUBY_ENGINE == 'ruby' end end end + +task :ruby18 do + puts <<-MESSAGE +You are starting a barebones Ruby 1.8 docker environment. You will need to +do the following: + +- mv Gemfile.lock{,.v2} +- gem install bundler --version 1.17.2 --no-ri --no-rdoc +- ruby -S bundle +- rake + +Don't forget to restore your Gemfile.lock after testing. + + MESSAGE + sh "docker run -it --rm -v #{Dir.pwd}:/root/diff-lcs bellbind/docker-ruby18-rails2 bash -l" +end -- cgit v1.2.1