Merge pull request #239 from ptarjan/patch-1

make `require 'timecop'` a bit more threadsafe
travisjeffery · Sep 12, 2019 · 9593299 · 9593299
2 parents cbaaf0c + 82d81bd
commit 9593299
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/History.md b/History.md
@@ -1,5 +1,9 @@
 # History
 
+## v0.9.2
+
+- Make `require 'timecop'` threadsafe (#239)
+
 ## v0.9.1
 
 - fix Date.parse when month/year only given (#206)

diff --git a/lib/timecop/timecop.rb b/lib/timecop/timecop.rb
@@ -1,5 +1,4 @@
 require 'singleton'
-require File.join(File.dirname(__FILE__), "time_extensions")
 require File.join(File.dirname(__FILE__), "time_stack_item")
 
 # Timecop
@@ -236,3 +235,6 @@ def initialize
     end
   end
 end
+
+# This must be done after TimeCop is available
+require File.join(File.dirname(__FILE__), "time_extensions")
diff --git a/lib/timecop/version.rb b/lib/timecop/version.rb
@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end