rubyzip 2.4.1 → 3.0.0.rc1

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:
@@ -12,6 +16,14 @@ module Zip
     # bits 5-8 month (1-12)
     # bits 9-15 year (four digit year minus 1980)
 
+    attr_writer :absolute_time # :nodoc:
+
+    def absolute_time?
+      # If absolute time is not set, we can assume it is an absolute time
+      # because times do have timezone information by default.
+      @absolute_time.nil? ? true : @absolute_time
+    end
+
     def to_binary_dos_time
       (sec / 2) +
         (min << 5) +
@@ -25,8 +37,7 @@ module Zip
     end
 
     def dos_equals(other)
-      Zip.warn_about_v3_api('DOSTime#dos_equals')
-
+      warn 'Zip::DOSTime#dos_equals is deprecated. Use `==` instead.'
       self == other
     end
 
@@ -50,7 +61,35 @@ module Zip
       month  = (0b111100000 & bin_dos_date) >> 5
       year   = ((0b1111111000000000 & bin_dos_date) >> 9) + 1980
 
-      local(year, month, day, hour, minute, second)
+      time = local(year, month, day, hour, minute, second)
+      time.absolute_time = false
+      time
+    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