rubyzip 2.3.1 → 3.0.0.alpha

data/lib/zip/dos_time.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
+require 'rubygems'
+
 module Zip
-  class DOSTime < Time #:nodoc:all
+  class DOSTime < Time # :nodoc:all
     # MS-DOS File Date and Time format as used in Interrupt 21H Function 57H:
 
     # Register CX, the Time:
@@ -24,9 +28,16 @@ module Zip
         ((year - 1980) << 9)
     end
 
-    # Dos time is only stored with two seconds accuracy
     def dos_equals(other)
-      to_i / 2 == other.to_i / 2
+      warn 'Zip::DOSTime#dos_equals is deprecated. Use `==` instead.'
+      self == other
+    end
+
+    # Dos time is only stored with two seconds accuracy.
+    def <=>(other)
+      return unless other.kind_of?(Time)
+
+      (to_i / 2) <=> (other.to_i / 2)
     end
 
     # Create a DOSTime instance from a vanilla Time instance.
@@ -41,9 +52,34 @@ module Zip
       day    = (0b11111 & bin_dos_date)
       month  = (0b111100000 & bin_dos_date) >> 5
       year   = ((0b1111111000000000 & bin_dos_date) >> 9) + 1980
-      begin
-        local(year, month, day, hour, minute, second)
+
+      local(year, month, day, hour, minute, second)
+    end
+
+    if defined? JRUBY_VERSION && Gem::Version.new(JRUBY_VERSION) < '9.2.18.0'
+      module JRubyCMP # :nodoc:
+        def ==(other)
+          (self <=> other).zero?
+        end
+
+        def <(other)
+          (self <=> other).negative?
+        end
+
+        def <=(other)
+          (self <=> other) <= 0
+        end
+
+        def >(other)
+          (self <=> other).positive?
+        end
+
+        def >=(other)
+          (self <=> other) >= 0
+        end
       end
+
+      include JRubyCMP
     end
   end
 end