patience_diff 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d37dfbd16df805a3d8b286765fe5ea12c665c156
-  data.tar.gz: f3df94dd269cba9149197be6ea584fa3c8f3f103
+SHA256:
+  metadata.gz: ba503ae74842e740bb08c06a49d22672717bbad0cf00a5569eee6235ef021183
+  data.tar.gz: 6d280ee2817ac1108a40e947aa937a569a309c999a2e31e0865f7fe7046913a2
 SHA512:
-  metadata.gz: c82eb37da25cbecb994d98fba1de7e355887a4576c7a50afa688d0e62f76c4887cc6d9f5a014d303fbfc92a1e17e6e999f7989ea17fcba6a06810885d786a212
-  data.tar.gz: 3c1fc29891874a7de6fcd510c466ec9c6088bff9ce6f8695f5c44b2a8035b52e708344c266b3f36b0b25cfc56d0534d1b2286da1109f49502e61b745d5c9b2ff
+  metadata.gz: ba3bfdb540dd20e29cebb7d46d39201ee4d760964b774d812ebe29c476702b4b28cf54aa89bb4ef04d3d29b9b30ead8716c0cea3adb61cbe34859741ca4bb07f
+  data.tar.gz: d6ddac1875f078bc60b79c2c49a8ecbe53d70783a58c29a08ed2cd91c055b35f7a13ef3f918e07b2f444f7badb25481be76c522f2862f0b40a7d355707c2e1cb

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.2.0 / 2021-02-27
+
+* Updated dependency to Optimist, which was renamed
+* Add license to gemspec
+
 === 1.1.0 / 2012-08-12
 
 * Introduced HTML output

data/Rakefile

@@ -1,9 +1,8 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.plugin :rubyforge
-
 Hoe.spec 'patience_diff' do
   developer "Andrew Watt", "andrew@wattornot.com"
-  dependency "trollop", "~> 1.16"
+  dependency "optimist", "~> 3.0"
+  license "MIT"
 end

data/bin/patience_diff

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'English'
 require 'pathname'
-require 'trollop'
+require 'optimist'
 
 lib_path = Pathname(File.join(File.dirname(__FILE__),"..","lib")).realpath
 $LOAD_PATH.unshift(lib_path)
@@ -9,25 +9,25 @@ require 'patience_diff'
 
 begin
   program_name = File.basename($PROGRAM_NAME)
-  opts = Trollop::options do
+  opts = Optimist::options do
     banner <<-EOF.gsub(/^\s*/, '')
       Usage: #{program_name} [options] left-file right-file (left-file-2 right-file-2 ...)
       Options:
     EOF
-    
+
     version "#{program_name} #{PatienceDiff::VERSION}"
-    
+
     opt :debug, "Debugging mode"
     opt :context, "Lines of context", :default => 3
     opt :all_context, "Don't collapse common sections; output entire files. Ignored in html format."
     opt :format, "Specify output format. Currently 'text' and 'html' are supported.", :default => "text"
-    opt :ignore_whitespace, 
+    opt :ignore_whitespace,
       "Ignore trailing whitespace, and treat leading whitespace as either present or not. This switch is for compatibility with diff's -b option.",
       :short => '-b'
   end
-  
+
   raise PatienceDiff::UsageError unless ARGV.length and ARGV.length % 2 == 0
-  
+
   differ = PatienceDiff::Differ.new(opts)
   formatter = case opts.delete(:format)
     when 'text'
@@ -37,7 +37,7 @@ begin
     else
       raise PatienceDiff::UsageError
     end.new(differ)
-  
+
   formatter.format do |diff|
     ARGV.each_slice(2) do |(left_file, right_file)|
       diff.files left_file, right_file
@@ -45,9 +45,9 @@ begin
   end.tap do |result|
     print result
   end
-  
+
 rescue PatienceDiff::UsageError => e
-  Trollop.module_eval do
+  Optimist.module_eval do
     @last_parser.educate($stderr)
   end
 rescue StandardError => e

data/lib/patience_diff.rb

@@ -7,6 +7,6 @@ require 'patience_diff/usage_error'
 PatienceDiff.autoload(:Html, 'patience_diff/html/formatter')
 
 module PatienceDiff
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
   TEMPLATE_PATH = Pathname(File.join(File.dirname(__FILE__),'..','templates')).realpath
 end

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: patience_diff
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Watt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.22'
 description: |-
   A Ruby implementation of the Patience diff algorithm.
 
@@ -92,8 +98,9 @@ files:
 homepage: http://github.com/watt/ruby_patience_diff
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: http://github.com/watt/ruby_patience_diff
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -110,9 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A Ruby implementation of the Patience diff algorithm
 test_files: []