Require Ruby >= 2.1.0

travisjeffery · Aug 15, 2024 · 5f00ba5 · 5f00ba5
1 parent ce3e6bb
commit 5f00ba5
Show file tree

Hide file tree

Showing 4 changed files with 178 additions and 184 deletions.
diff --git a/lib/timecop/time_extensions.rb b/lib/timecop/time_extensions.rb
@@ -168,58 +168,56 @@ def mocked_time_stack_item
  end
 end
 
-if RUBY_VERSION >= '2.1.0'
- module Process #:nodoc:
- class << self
- alias_method :clock_gettime_without_mock, :clock_gettime
-
- def clock_gettime_mock_time(clock_id, unit = :float_second)
- mock_time = case clock_id
- when Process::CLOCK_MONOTONIC
- mock_time_monotonic
- when Process::CLOCK_REALTIME
- mock_time_realtime
- end
-
- return clock_gettime_without_mock(clock_id, unit) unless Timecop.mock_process_clock? && mock_time
-
- divisor = case unit
- when :float_second
- 1_000_000_000.0
- when :second
- 1_000_000_000
- when :float_millisecond
- 1_000_000.0
- when :millisecond
- 1_000_000
- when :float_microsecond
- 1000.0
- when :microsecond
- 1000
- when :nanosecond
- 1
+module Process #:nodoc:
+ class << self
+ alias_method :clock_gettime_without_mock, :clock_gettime
+
+ def clock_gettime_mock_time(clock_id, unit = :float_second)
+ mock_time = case clock_id
+ when Process::CLOCK_MONOTONIC
+ mock_time_monotonic
+ when Process::CLOCK_REALTIME
+ mock_time_realtime
  end
 
- (mock_time / divisor)
- end
+ return clock_gettime_without_mock(clock_id, unit) unless Timecop.mock_process_clock? && mock_time
+
+ divisor = case unit
+ when :float_second
+ 1_000_000_000.0
+ when :second
+ 1_000_000_000
+ when :float_millisecond
+ 1_000_000.0
+ when :millisecond
+ 1_000_000
+ when :float_microsecond
+ 1000.0
+ when :microsecond
+ 1000
+ when :nanosecond
+ 1
+ end
+
+ (mock_time / divisor)
+ end
 
-  alias_method :clock_gettime, :clock_gettime_mock_time
+ alias_method :clock_gettime, :clock_gettime_mock_time
 
-  private
+ private
 
-  def mock_time_monotonic
-  mocked_time_stack_item = Timecop.top_stack_item
-  mocked_time_stack_item.nil? ? nil : mocked_time_stack_item.monotonic
-  end
+ def mock_time_monotonic
+ mocked_time_stack_item = Timecop.top_stack_item
+ mocked_time_stack_item.nil? ? nil : mocked_time_stack_item.monotonic
+ end
 
-  def mock_time_realtime
-  mocked_time_stack_item = Timecop.top_stack_item
+ def mock_time_realtime
+ mocked_time_stack_item = Timecop.top_stack_item
 
-  return nil if mocked_time_stack_item.nil?
+ return nil if mocked_time_stack_item.nil?
 
- t = mocked_time_stack_item.time
- t.to_i * 1_000_000_000 + t.nsec
- end
+ t = mocked_time_stack_item.time
+ t.to_i * 1_000_000_000 + t.nsec
  end
  end
 end
diff --git a/lib/timecop/time_stack_item.rb b/lib/timecop/time_stack_item.rb
@@ -9,7 +9,7 @@ def initialize(mock_type, *args)
  @travel_offset = @scaling_factor = nil
  @scaling_factor = args.shift if mock_type == :scale
  @mock_type = mock_type
- @monotonic = parse_monotonic_time(*args) if RUBY_VERSION >= '2.1.0'
+ @monotonic = parse_monotonic_time(*args)
  @time = parse_time(*args)
  @time_was = Time.now_without_mock_time
  @travel_offset = compute_travel_offset
@@ -55,24 +55,22 @@ def scaling_factor
  @scaling_factor
  end
 
- if RUBY_VERSION >= '2.1.0'
- def monotonic
- if travel_offset.nil?
- @monotonic
- elsif scaling_factor.nil?
- current_monotonic + travel_offset * (10 ** 9)
- else
- (@monotonic + (current_monotonic - @monotonic) * scaling_factor).to_i
- end
+ def monotonic
+ if travel_offset.nil?
+ @monotonic
+ elsif scaling_factor.nil?
+ current_monotonic + travel_offset * (10 ** 9)
+ else
+ (@monotonic + (current_monotonic - @monotonic) * scaling_factor).to_i
  end
+ end
 
-  def current_monotonic
-  Process.clock_gettime_without_mock(Process::CLOCK_MONOTONIC, :nanosecond)
-  end
+ def current_monotonic
+ Process.clock_gettime_without_mock(Process::CLOCK_MONOTONIC, :nanosecond)
+ end
 
- def current_monotonic_with_mock
- Process.clock_gettime_mock_time(Process::CLOCK_MONOTONIC, :nanosecond)
- end
+ def current_monotonic_with_mock
+ Process.clock_gettime_mock_time(Process::CLOCK_MONOTONIC, :nanosecond)
  end
 
  def time(time_klass = Time) #:nodoc: