timecop 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a736f9ef7fd96e85e0575f736c0a507095012f41
-  data.tar.gz: c9819e7dca7ace18be6d27445538a0c8a0a36511
+  metadata.gz: 580525a47a6026f3d83689807d96949dd5269fa5
+  data.tar.gz: ffb9cc8cf58489f231f3348656f99597b3c79989
 SHA512:
-  metadata.gz: 5f58a4a57151a9fa501ca0dfbcd960ac0f12ccc0bee9a37198599f71fb9dd2b1ffa9781805cd8187ff2901992ea3df107845417eff4f9609b0ff6a6bd9f71810
-  data.tar.gz: 674f4a2d227d6aacbe0d8c4920c12ee9cd44597157b92fe16bafa1d4ed5839a3a61af66760f66144b7dc1df3a8ef07a6bc2a3a1aa283c7ca98ef2702443318d1
+  metadata.gz: dc3c024856bf2bbaab09a0734aa1d87712e26c8b1e47774edf2d65153ceb22ae6bbe3b04499a4f12c68acf5f9352fb26e614c8c4996c80e14353f75049899598
+  data.tar.gz: c759c9cc704c61d2bd1cf13b4d44a6ad8a1b36a03fc398b4796f1dd1bc0d055a6ddda86aa0a31addc753eb6accc57049648d3fd5334477ccb0cc8cbc594076b7

data/README.markdown

@@ -1,9 +1,6 @@
 # timecop
 
-[![Build Status](https://secure.travis-ci.org/travisjeffery/timecop.png)](http://travis-ci.org/travisjeffery/timecop)
-
-- [Source](http://github.com/travisjeffery/timecop)
-- [Documentation](http://johntrupiano.rubyforge.org/timecop)
+[![Build Status](https://secure.travis-ci.org/travisjeffery/timecop.svg)](http://travis-ci.org/travisjeffery/timecop)
 
 ## DESCRIPTION
 
@@ -54,7 +51,8 @@ describe "some set of tests to mock" do
     Timecop.return
   end
 
-  it "should do blah blah blah" {}
+  it "should do blah blah blah" do
+  end
 end
 ```
 
@@ -106,11 +104,13 @@ being able to simulate activity via subsequent calls to your application.
 Timecop.scale(3600)
 Time.now
 # => 2012-09-20 21:23:25 -0500
-# seconds later, hours have past it's gone from 9pm at night to 6am in the morning
+# seconds later, hours have passed and it's gone from 9pm at night to 6am in the morning
 Time.now
 # => 2012-09-21 06:22:59 -0500
 ```
 
+See [#42](https://github.com/travisjeffery/timecop/pull/42) for more information, thanks to Ken Mayer, David Holcomb, and Pivotal Labs.
+
 ### Timecop.safe_mode
 
 Safe mode forces you to use Timecop with the block syntax since it always puts time back the way it was. If you are running in safe mode and use Timecop without the block syntax `Timecop::SafeModeException` will be raised to tell the user they are not being safe.
@@ -128,7 +128,11 @@ Timecop.freeze
 # => Timecop::SafeModeException: Safe mode is enabled, only calls passing a block are allowed.
 ```
 
-See [#42](https://github.com/travisjeffery/timecop/pull/42) for more information, thanks to Ken Mayer, David Holcomb, and Pivotal Labs.
+### Rails v Ruby Date/Time libraries
+
+Sometimes [Rails Date/Time methods don't play nicely with Ruby Date/Time methods.](https://rails.lighthouseapp.com/projects/8994/tickets/6410-dateyesterday-datetoday)
+
+Be careful mixing Ruby `Date.today` with Rails `Date.tomorrow` / `Date.yesterday` as things might break.
 
 ## Contribute
 

data/Rakefile

@@ -3,8 +3,6 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rdoc/task'
 
-$LOAD_PATH.unshift("lib")
-
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION')
     version = File.read('VERSION')
@@ -21,7 +19,15 @@ Rake::RDocTask.new do |rdoc|
 end
 
 task :test do
-  system "cd test && ./run_tests.sh" or fail
+  failed = Dir["test/*_test.rb"].map do |test|
+    command = "ruby #{test}"
+    puts
+    puts command
+    command unless system(command)
+  end.compact
+  if failed.any?
+    abort "#{failed.count} Tests failed\n#{failed.join("\n")}"
+  end
 end
 
 desc 'Default: run tests'

data/lib/timecop/time_extensions.rb

@@ -1,5 +1,5 @@
-require 'date'
 require 'time'
+require 'date'
 
 class Time #:nodoc:
   class << self
@@ -29,7 +29,6 @@ end
 class Date #:nodoc:
   class << self
     def mock_date
-      mocked_time_stack_item = Timecop.top_stack_item
       mocked_time_stack_item.nil? ? nil : mocked_time_stack_item.date(self)
     end
 
@@ -43,29 +42,87 @@ class Date #:nodoc:
 
     alias_method :strptime_without_mock_date, :strptime
 
-    def strptime_with_mock_date(str, fmt)
+    def strptime_with_mock_date(str = '-4712-01-01', fmt = '%F', start = Date::ITALY)
+      unless start == Date::ITALY
+        raise ArgumentError, "Timecop's #{self}::#{__method__} only " +
+          "supports Date::ITALY for the start argument."
+      end
+
       Time.strptime(str, fmt).to_date
     end
 
     alias_method :strptime, :strptime_with_mock_date
+
+    def parse_with_mock_date(*args)
+      parsed_date = parse_without_mock_date(*args)
+      return parsed_date unless mocked_time_stack_item
+      date_hash = Date._parse(*args)
+
+      case
+      when date_hash[:year] && date_hash[:mon] && date_hash[:mday]
+        parsed_date
+      when date_hash[:mon] && date_hash[:mday]
+        Date.new(mocked_time_stack_item.year, date_hash[:mon], date_hash[:mday])
+      when date_hash[:wday]
+        closest_wday(date_hash[:wday])
+      else
+        parsed_date + mocked_time_stack_item.travel_offset_days
+      end
+    end
+
+    alias_method :parse_without_mock_date, :parse
+    alias_method :parse, :parse_with_mock_date
+
+    def mocked_time_stack_item
+      Timecop.top_stack_item
+    end
+
+    def closest_wday(wday)
+      today = Date.today
+      result = today - today.wday
+      result += 1 until wday == result.wday
+      result
+    end
   end
 end
 
 class DateTime #:nodoc:
   class << self
     def mock_time
-      mocked_time_stack_item = Timecop.top_stack_item
       mocked_time_stack_item.nil? ? nil : mocked_time_stack_item.datetime(self)
     end
 
-    def now_without_mock_time
-      Time.now_without_mock_time.to_datetime
-    end
-
     def now_with_mock_time
       mock_time || now_without_mock_time
     end
 
+    alias_method :now_without_mock_time, :now
+
     alias_method :now, :now_with_mock_time
+
+    def parse_with_mock_date(*args)
+      date_hash = Date._parse(*args)
+      parsed_date = parse_without_mock_date(*args)
+      return parsed_date unless mocked_time_stack_item
+      date_hash = DateTime._parse(*args)
+
+      case
+      when date_hash[:year] && date_hash[:mon] && date_hash[:mday]
+        parsed_date
+      when date_hash[:mon] && date_hash[:mday]
+        DateTime.new(mocked_time_stack_item.year, date_hash[:mon], date_hash[:mday])
+      when date_hash[:wday]
+        Date.closest_wday(date_hash[:wday]).to_datetime
+      else
+        parsed_date + mocked_time_stack_item.travel_offset_days
+      end
+    end
+
+    alias_method :parse_without_mock_date, :parse
+    alias_method :parse, :parse_with_mock_date
+
+    def mocked_time_stack_item
+      Timecop.top_stack_item
+    end
   end
 end

data/lib/timecop/time_stack_item.rb

@@ -6,6 +6,7 @@ class Timecop
 
       def initialize(mock_type, *args)
         raise "Unknown mock_type #{mock_type}" unless [:freeze, :travel, :scale].include?(mock_type)
+        @travel_offset  = @scaling_factor = nil
         @scaling_factor = args.shift if mock_type == :scale
         @mock_type      = mock_type
         @time           = parse_time(*args)
@@ -42,7 +43,11 @@ class Timecop
       end
 
       def travel_offset
-        @travel_offset
+        @travel_offset unless mock_type == :freeze
+      end
+
+      def travel_offset_days
+        (@travel_offset / 60 / 60 / 24).round
       end
 
       def scaling_factor
@@ -51,7 +56,7 @@ class Timecop
 
       def time(time_klass = Time) #:nodoc:
         if @time.respond_to?(:in_time_zone)
-          time = time_klass.at(@time.dup.utc.to_r)
+          time = time_klass.at(@time.dup.localtime)
         else
           time = time_klass.at(@time)
         end
@@ -59,7 +64,7 @@ class Timecop
         if travel_offset.nil?
           time
         elsif scaling_factor.nil?
-          time_klass.at((Time.now_without_mock_time + travel_offset).to_f)
+          time_klass.at(Time.now_without_mock_time + travel_offset)
         else
           time_klass.at(scaled_time)
         end
@@ -75,12 +80,8 @@ class Timecop
 
       def datetime(datetime_klass = DateTime)
         if Float.method_defined?(:to_r)
-          if !sec.zero?
-            fractions_of_a_second = time.to_f % 1
-            datetime_klass.new(year, month, day, hour, min, (fractions_of_a_second + sec), utc_offset_to_rational(utc_offset))
-          else 
-            datetime_klass.new(year, month, day, hour, min, sec, utc_offset_to_rational(utc_offset))
-          end
+          fractions_of_a_second = time.to_f % 1
+          datetime_klass.new(year, month, day, hour, min, (fractions_of_a_second + sec), utc_offset_to_rational(utc_offset))
         else
           datetime_klass.new(year, month, day, hour, min, sec, utc_offset_to_rational(utc_offset))
         end
@@ -104,13 +105,13 @@ class Timecop
           time_klass.at(arg.to_time.to_f).getlocal
         elsif Object.const_defined?(:Date) && arg.is_a?(Date)
           time_klass.local(arg.year, arg.month, arg.day, 0, 0, 0)
-        elsif args.empty? && arg.kind_of?(Integer)
-          Time.now + arg
+        elsif args.empty? && (arg.kind_of?(Integer) || arg.kind_of?(Float))
+          time_klass.now + arg
         elsif arg.nil?
-          Time.now
+          time_klass.now
         else
           if arg.is_a?(String) && Time.respond_to?(:parse)
-            Time.parse(arg)
+            time_klass.parse(arg)
           else
             # we'll just assume it's a list of y/m/d/h/m/s
             year   = arg        || 2000
@@ -125,7 +126,6 @@ class Timecop
       end
 
       def compute_travel_offset
-        return nil if mock_type == :freeze
         time - Time.now_without_mock_time
       end
 
@@ -137,4 +137,4 @@ class Timecop
         Time.respond_to?(:zone) && Time.zone ? Time.zone : Time
       end
     end
-  end
+end

data/lib/timecop/timecop.rb

@@ -31,6 +31,7 @@ class Timecop
     # 3. Timecop.freeze(date_inst)
     # 4. Timecop.freeze(offset_in_seconds)
     # 5. Timecop.freeze(year, month, day, hour=0, minute=0, second=0)
+    # 6. Timecop.freeze() # Defaults to Time.now
     #
     # When a block is also passed, Time.now, DateTime.now and Date.today are all reset to their
     # previous values after the block has finished executing.  This allows us to nest multiple
@@ -99,7 +100,7 @@ class Timecop
     end
 
     def top_stack_item #:nodoc:
-      instance.instance_variable_get(:@_stack).last
+      instance.send(:stack).last
     end
 
     def safe_mode=(safe)
@@ -107,7 +108,20 @@ class Timecop
     end
 
     def safe_mode?
-      false || @safe_mode
+      @safe_mode ||= false
+    end
+
+    def thread_safe=(t)
+      instance.send(:thread_safe=, t)
+    end
+
+    def thread_safe
+      instance.send(:thread_safe)
+    end
+
+    # Returns whether or not Timecop is currently frozen/travelled
+    def frozen?
+      !instance.send(:stack).empty?
     end
 
     private
@@ -119,49 +133,97 @@ class Timecop
 
   private
 
-  def baseline=(baseline)
-    @baseline = baseline
-    @_stack << TimeStackItem.new(:travel, baseline)
+  def baseline=(b)
+    set_baseline(b)
+    stack << TimeStackItem.new(:travel, b)
+  end
+
+  def baseline
+    if @thread_safe
+      Thread.current[:timecop_baseline]
+    else
+      @baseline
+    end
+  end
+
+  def set_baseline(b)
+    if @thread_safe
+      Thread.current[:timecop_baseline] = b
+    else
+      @baseline = b
+    end
+  end
+
+  def stack
+    if @thread_safe
+      Thread.current[:timecop_stack] ||= []
+      Thread.current[:timecop_stack]
+    else
+      @stack
+    end
+  end
+
+  def set_stack(s)
+    if @thread_safe
+      Thread.current[:timecop_stack] = s
+    else
+      @stack = s
+    end
   end
 
   def initialize #:nodoc:
-    @_stack = []
+    @stack = []
+    @safe = nil
+    @thread_safe = false
+  end
+
+  def thread_safe=(t)
+    initialize
+    @thread_safe = t
+  end
+
+  def thread_safe
+    @thread_safe
   end
 
   def travel(mock_type, *args, &block) #:nodoc:
-    raise SafeModeException if Timecop.safe_mode? && !block_given?
+    raise SafeModeException if Timecop.safe_mode? && !block_given? && !@safe
 
     stack_item = TimeStackItem.new(mock_type, *args)
 
-    stack_backup = @_stack.dup
-    @_stack << stack_item
+    stack_backup = stack.dup
+    stack << stack_item
 
     if block_given?
+      safe_backup = @safe
+      @safe = true
       begin
         yield stack_item.time
       ensure
-        @_stack.replace stack_backup
+        @stack.replace stack_backup
+        @safe = safe_backup
       end
     end
   end
 
   def return(&block)
-    current_stack = @_stack
-    current_baseline = @baseline
+    current_stack = stack
+    current_baseline = baseline
     unmock!
     yield
-    @_stack = current_stack
-    @baseline = current_baseline
+  ensure
+    set_stack current_stack
+    set_baseline current_baseline
   end
 
   def unmock! #:nodoc:
-    @baseline = nil
-    @_stack = []
+    set_baseline nil
+    set_stack []
   end
 
   def return_to_baseline
-    if @baseline
-      @_stack = [@_stack.shift]
+    if baseline
+      set_stack [stack.shift]
     else
       unmock!
     end

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

data/test/test_helper.rb

@@ -1,38 +1,38 @@
-require 'rubygems'
 require 'bundler/setup'
-require 'test/unit'
-begin
-  require 'mocha/setup'
-rescue LoadError
-  require 'mocha'
-end
+require 'minitest/autorun'
+require 'minitest/rg'
+
+$VERBOSE = true # enable ruby warnings
 
-class Test::Unit::TestCase
+require 'mocha/setup'
 
+class Minitest::Test
   private
     # Tests to see that two times are within the given distance,
     # in seconds, from each other.
     def times_effectively_equal(time1, time2, seconds_interval = 1)
       (time1 - time2).abs <= seconds_interval
     end
-    
+
     def assert_times_effectively_equal(time1, time2, seconds_interval = 1, msg = nil)
       assert times_effectively_equal(time1, time2, seconds_interval), "#{msg}: time1 = #{time1.to_s}, time2 = #{time2.to_s}"
     end
-    
+
     def assert_times_effectively_not_equal(time1, time2, seconds_interval = 1, msg = nil)
       assert !times_effectively_equal(time1, time2, seconds_interval), "#{msg}: time1 = #{time1.to_s}, time2 = #{time2.to_s}"
     end
-    
-    def local_offset
-      DateTime.now_without_mock_time.offset
+
+    # Gets the local offset (supplied by ENV['TZ'] or your computer's clock)
+    # At the given timestamp, or Time.now if not time is given.
+    def local_offset(time = Time.now)
+      Time.at(time.to_i).to_datetime.offset
     end
-  
-    TIMEZONES = ["Europe/Paris", "UTC", "EDT"]
-  
+
+    TIMEZONES = ["Europe/Paris", "UTC", "America/Chicago"]
+
     def each_timezone
       old_tz = ENV["TZ"]
-    
+
       begin
         TIMEZONES.each do |timezone|
           ENV["TZ"] = timezone
@@ -42,13 +42,17 @@ class Test::Unit::TestCase
         ENV["TZ"] = old_tz
       end
     end
-    
+
     def a_time_stack_item
       Timecop::TimeStackItem.new(:freeze, 2008, 1, 1, 0, 0, 0)
     end
-  
+
     def assert_date_times_equal(dt1, dt2)
       assert_in_delta dt1.to_time.to_f, dt2.to_time.to_f, 0.01, "Failed for timezone: #{ENV['TZ']}: #{dt1.to_s} not equal to #{dt2.to_s}"
     end
-    
+
+    def jruby?
+      RUBY_PLATFORM == "java"
+    end
+
 end

data/test/time_stack_item_test.rb

@@ -1,10 +1,10 @@
 require 'date'
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+require_relative "test_helper"
+require 'timecop'
 
 require 'active_support/all'
 
-class TestTimeStackItem < Test::Unit::TestCase
+class TestTimeStackItem < Minitest::Test
   def teardown
     Timecop.return
     Time.zone = nil
@@ -87,6 +87,19 @@ class TestTimeStackItem < Test::Unit::TestCase
     assert_equal s,   stack_item.sec
   end
 
+  def test_new_with_float
+    t = Time.now
+    y, m, d, h, min, s = t.year, t.month, t.day, t.hour, t.min, t.sec
+    stack_item = Timecop::TimeStackItem.new(:freeze, 0.0)
+
+    assert_equal y,   stack_item.year
+    assert_equal m,   stack_item.month
+    assert_equal d,   stack_item.day
+    assert_equal h,   stack_item.hour
+    assert_equal min, stack_item.min
+    assert_equal s,   stack_item.sec
+  end
+
   def test_new_with_individual_arguments
     y, m, d, h, min, s = 2008, 10, 10, 10, 10, 10
     stack_item = Timecop::TimeStackItem.new(:freeze, y, m, d, h, min, s)
@@ -179,6 +192,15 @@ class TestTimeStackItem < Test::Unit::TestCase
     end
   end
 
+  def test_timezones_with_parsed_string
+    Time.zone = "Europe/Zurich"
+    time_string = "2012-12-27 12:12"
+    expected_time = Time.zone.parse(time_string)
+    Timecop.freeze(time_string) do |frozen_time|
+      assert_equal expected_time, frozen_time
+    end
+  end
+
   def test_timezones_apply_dates
     Time.zone = "Central Time (US & Canada)"
     time = Time.zone.local(2013,1,3)
@@ -204,16 +226,12 @@ class TestTimeStackItem < Test::Unit::TestCase
   end
 
   def test_parse_date
-    assert_nothing_raised do
-      Timecop.freeze(Date.new(2012, 6, 9))
-    end
+    Timecop.freeze(Date.new(2012, 6, 9))
   end
 
   def test_time_zone_returns_nil
     Time.zone = nil
-    assert_nothing_raised do
-      Timecop.freeze
-    end
+    Timecop.freeze
   end
 
   def test_nsecs_are_set
@@ -273,7 +291,7 @@ class TestTimeStackItem < Test::Unit::TestCase
 
   def test_datetime_timezones
     dt = DateTime.new(2011,1,3,15,25,0,"-6")
-    Timecop.travel(dt) do
+    Timecop.freeze(dt) do
       now = DateTime.now
       assert_equal dt, now, "#{dt.to_f}, #{now.to_f}"
     end

data/test/timecop_test.rb

@@ -1,8 +1,7 @@
-require 'date'
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+require_relative "test_helper"
+require 'timecop'
 
-class TestTimecop < Test::Unit::TestCase
+class TestTimecop < Minitest::Test
   def teardown
     Timecop.return
   end
@@ -31,7 +30,7 @@ class TestTimecop < Test::Unit::TestCase
       assert_equal frozen_time, Time.now
     end
   end
-  
+
   def test_freeze_then_return_unsets_mock_time
     Timecop.freeze(1)
     Timecop.return
@@ -59,8 +58,11 @@ class TestTimecop < Test::Unit::TestCase
   def test_travel_does_not_reduce_precision_of_datetime
     # requires to_r on Float (>= 1.9)
     if Float.method_defined?(:to_r)
-      Timecop.travel(1)
-      assert_not_equal DateTime.now, DateTime.now
+      Timecop.travel(Time.new(2014, 1, 1, 0, 0, 0))
+      assert DateTime.now != DateTime.now
+
+      Timecop.travel(Time.new(2014, 1, 1, 0, 0, 59))
+      assert DateTime.now != DateTime.now
     end
   end
 
@@ -113,7 +115,7 @@ class TestTimecop < Test::Unit::TestCase
       end
       assert_equal t, Time.now
     end
-    assert_not_equal t, Time.now
+    assert t != Time.now
   end
 
   def test_freeze_with_time_instance_works_as_expected
@@ -124,9 +126,9 @@ class TestTimecop < Test::Unit::TestCase
       assert_equal Date.new(2008, 10, 10), Date.today
     end
 
-    assert_not_equal t, Time.now
-    assert_not_equal DateTime.new(2008, 10, 10, 10, 10, 10, local_offset), DateTime.now
-    assert_not_equal Date.new(2008, 10, 10), Date.today
+    assert t != Time.now
+    assert DateTime.new(2008, 10, 10, 10, 10, 10, local_offset) != DateTime.now
+    assert Date.new(2008, 10, 10) != Date.today
   end
 
   def test_freeze_with_datetime_on_specific_timezone_during_dst
@@ -185,9 +187,9 @@ class TestTimecop < Test::Unit::TestCase
       assert_equal Time.local(2008, 10, 10, 0, 0, 0), Time.now
       assert_date_times_equal DateTime.new(2008, 10, 10, 0, 0, 0, local_offset), DateTime.now
     end
-    assert_not_equal d, Date.today
-    assert_not_equal Time.local(2008, 10, 10, 0, 0, 0), Time.now
-    assert_not_equal DateTime.new(2008, 10, 10, 0, 0, 0, local_offset), DateTime.now
+    assert d != Date.today
+    assert Time.local(2008, 10, 10, 0, 0, 0) != Time.now
+    assert DateTime.new(2008, 10, 10, 0, 0, 0, local_offset) != DateTime.now
   end
 
   def test_freeze_with_integer_instance_works_as_expected
@@ -202,9 +204,9 @@ class TestTimecop < Test::Unit::TestCase
         assert_equal Date.new(2008, 10, 10), Date.today
       end
     end
-    assert_not_equal t, Time.now
-    assert_not_equal DateTime.new(2008, 10, 10, 10, 10, 10), DateTime.now
-    assert_not_equal Date.new(2008, 10, 10), Date.today
+    assert t != Time.now
+    assert DateTime.new(2008, 10, 10, 10, 10, 10) != DateTime.now
+    assert Date.new(2008, 10, 10) != Date.today
   end
 
   def test_exception_thrown_in_freeze_block_properly_resets_time
@@ -215,11 +217,19 @@ class TestTimecop < Test::Unit::TestCase
         raise "blah exception"
       end
     rescue
-      assert_not_equal t, Time.now
+      assert t != Time.now
       assert_nil Time.send(:mock_time)
     end
   end
 
+  def test_exception_thrown_in_return_block_restores_previous_time
+    t = Time.local(2008, 10, 10, 10, 10, 10)
+    Timecop.freeze(t) do
+      Timecop.return { raise 'foobar' } rescue nil
+      assert_equal t, Time.now
+    end
+  end
+
   def test_freeze_freezes_time
     t = Time.local(2008, 10, 10, 10, 10, 10)
     now = Time.now
@@ -241,7 +251,7 @@ class TestTimecop < Test::Unit::TestCase
       new_now = Time.now
       assert_times_effectively_equal(new_now, t, 1, "Looks like we failed to actually travel time")
       sleep(0.25)
-      assert_times_effectively_not_equal new_now, Time.now, 0.25, "Looks like time is not moving"
+      assert_times_effectively_not_equal new_now, Time.now, 0.24, "Looks like time is not moving"
     end
   end
 
@@ -249,6 +259,11 @@ class TestTimecop < Test::Unit::TestCase
     each_timezone do
       t = DateTime.parse("2009-10-11 00:38:00 +0200")
       Timecop.freeze(t) do
+        if ENV['TZ'] == 'UTC'
+          assert_equal(local_offset, 0, "Local offset not be zero for #{ENV['TZ']}")
+        else
+          assert(local_offset, 0 != "Local offset should not be zero for #{ENV['TZ']}")
+        end
         assert_equal local_offset, DateTime.now.offset, "Failed for timezone: #{ENV['TZ']}"
       end
     end
@@ -279,6 +294,19 @@ class TestTimecop < Test::Unit::TestCase
     end
   end
 
+  def test_freeze_without_arguments_instance_works_as_expected
+    t = Time.local(2008, 10, 10, 10, 10, 10)
+    Timecop.freeze(t) do
+      assert_equal t, Time.now
+      Timecop.freeze do
+        assert_equal t, Time.now
+        assert_equal Time.local(2008, 10, 10, 10, 10, 10), Time.now
+        assert_equal Date.new(2008, 10, 10), Date.today
+      end
+    end
+    assert t != Time.now
+  end
+
   def test_destructive_methods_on_frozen_time
     # Use any time zone other than UTC.
     ENV['TZ'] = 'EST'
@@ -309,13 +337,13 @@ class TestTimecop < Test::Unit::TestCase
   end
 
   def test_recursive_travel_yields_correct_time
-    Timecop.travel(2008, 10, 10, 10, 10, 10) do 
+    Timecop.travel(2008, 10, 10, 10, 10, 10) do
       Timecop.travel(2008, 9, 9, 9, 9, 9) do |inner_freeze|
         assert_times_effectively_equal inner_freeze, Time.now, 1, "Failed to yield current time back to block"
       end
     end
   end
-  
+
   def test_recursive_travel_then_freeze
     t = Time.local(2008, 10, 10, 10, 10, 10)
     Timecop.travel(2008, 10, 10, 10, 10, 10) do
@@ -437,7 +465,7 @@ class TestTimecop < Test::Unit::TestCase
   end
 
   def test_not_callable_send_travel
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       Timecop.send_travel(:travel, Time.now - 100)
     end
   end
@@ -461,23 +489,39 @@ class TestTimecop < Test::Unit::TestCase
 
   def test_raises_when_safe_mode_and_no_block
     with_safe_mode do
-      assert_raise Timecop::SafeModeException do
+      assert_raises Timecop::SafeModeException do
         Timecop.freeze
       end
     end
   end
 
-  def test_no_raise_when_safe_mode_and_block_used
+  def test_raises_when_safe_mode_and_no_block_though_previously_block_given
+    Timecop.freeze do
+      Timecop.freeze
+    end
+
     with_safe_mode do
-      assert_nothing_raised do
-        Timecop.freeze {}
+      assert_raises Timecop::SafeModeException do
+        Timecop.freeze
       end
     end
   end
 
+  def test_no_raise_when_safe_mode_and_block_used
+    with_safe_mode do
+      Timecop.freeze {}
+    end
+  end
+
   def test_no_raise_when_not_safe_mode_and_no_block
     with_safe_mode(false) do
-      assert_nothing_raised do
+      Timecop.freeze
+    end
+  end
+
+  def test_no_raise_when_safe_mode_and_no_block_and_in_block_context
+    with_safe_mode do
+      Timecop.freeze do
         Timecop.freeze
       end
     end
@@ -489,6 +533,46 @@ class TestTimecop < Test::Unit::TestCase
     end
   end
 
+  def test_date_strptime_without_specifying_format
+    Timecop.freeze(Time.new(1984,2,28)) do
+      assert_equal Date.strptime('1999-04-14'), Date.new(1999, 4, 14)
+    end
+  end
+
+  def test_frozen_after_freeze
+    Timecop.freeze
+    assert Timecop.frozen?
+  end
+
+  def test_frozen_inside_freeze
+    Timecop.freeze do
+      assert Timecop.frozen?
+    end
+  end
+
+  def test_not_frozen_after_return
+    Timecop.freeze
+    Timecop.return
+    assert !Timecop.frozen?
+  end
+
+  def test_thread_safe_timecop
+    Timecop.thread_safe = true
+    date = Time.local(2011, 01, 02)
+    thread = Thread.new do
+      Timecop.freeze(date) do
+        sleep 1 #give main thread time to run
+        assert_equal date, Time.now
+      end
+    end
+
+    sleep 0.25
+    assert Time.now != date
+    thread.join
+  ensure
+    Timecop.thread_safe = false
+  end
+
   private
 
   def with_safe_mode(enabled=true)

data/test/timecop_without_date_but_with_time_test.rb

@@ -1,12 +1,8 @@
-require "test/unit"
-
-class TestTimecopWithoutDateButWithTime < Test::Unit::TestCase
-  TIMECOP_LIB = File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+require_relative "test_helper"
+require "time"
 
+class TestTimecopWithoutDateButWithTime < Minitest::Test
   def test_loads_properly_when_time_is_required_instead_of_date
-    assert_nothing_raised do
-      require "time"
-      require TIMECOP_LIB
-    end
+    require 'timecop'
   end
 end

data/test/timecop_without_date_test.rb

@@ -1,34 +1,33 @@
+require_relative "test_helper"
+require 'timecop'
 
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+class TestTimecopWithoutDate < Minitest::Test
 
-class TestTimecopWithoutDate < Test::Unit::TestCase
-  
   def setup
     Object.send(:remove_const, :Date) if Object.const_defined?(:Date)
     Object.send(:remove_const, :DateTime) if Object.const_defined?(:DateTime)
   end
-  
+
   # just in case...let's really make sure that Timecop is disabled between tests...
   def teardown
     Timecop.return
   end
-  
+
   def test_freeze_changes_and_resets_time
     # depending on how we're invoked (individually or via the rake test suite)
     assert !Time.respond_to?(:zone) || Time.zone.nil?
-    
+
     t = Time.local(2008, 10, 10, 10, 10, 10)
-    assert_not_equal t, Time.now
+    assert t != Time.now
     Timecop.freeze(2008, 10, 10, 10, 10, 10) do
       assert_equal t, Time.now
     end
-    assert_not_equal t, Time.now
+    assert t != Time.now
   end
-  
+
   def test_recursive_freeze
     t = Time.local(2008, 10, 10, 10, 10, 10)
-    Timecop.freeze(2008, 10, 10, 10, 10, 10) do 
+    Timecop.freeze(2008, 10, 10, 10, 10, 10) do
       assert_equal t, Time.now
       t2 = Time.local(2008, 9, 9, 9, 9, 9)
       Timecop.freeze(2008, 9, 9, 9, 9, 9) do
@@ -38,7 +37,7 @@ class TestTimecopWithoutDate < Test::Unit::TestCase
     end
     assert_nil Time.send(:mock_time)
   end
-  
+
   def test_exception_thrown_in_freeze_block_properly_resets_time
     t = Time.local(2008, 10, 10, 10, 10, 10)
     begin
@@ -47,11 +46,11 @@ class TestTimecopWithoutDate < Test::Unit::TestCase
         raise "blah exception"
       end
     rescue
-      assert_not_equal t, Time.now
+      assert t != Time.now
       assert_nil Time.send(:mock_time)
     end
   end
-  
+
   def test_freeze_freezes_time
     t = Time.local(2008, 10, 10, 10, 10, 10)
     now = Time.now
@@ -63,7 +62,7 @@ class TestTimecopWithoutDate < Test::Unit::TestCase
       assert_equal new_t, Time.now
     end
   end
-  
+
   def test_travel_keeps_time_moving
     t = Time.local(2008, 10, 10, 10, 10, 10)
     now = Time.now
@@ -71,13 +70,13 @@ class TestTimecopWithoutDate < Test::Unit::TestCase
       new_now = Time.now
       assert_times_effectively_equal new_now, t, 1, "Looks like we failed to actually travel time" # 0.1 seconds
       sleep(0.25)
-      assert_times_effectively_not_equal new_now, Time.now, 0.25, "Looks like time is not moving"
+      assert_times_effectively_not_equal new_now, Time.now, 0.24, "Looks like time is not moving"
     end
   end
-  
+
   def test_recursive_travel_maintains_each_context
     t = Time.local(2008, 10, 10, 10, 10, 10)
-    Timecop.travel(2008, 10, 10, 10, 10, 10) do 
+    Timecop.travel(2008, 10, 10, 10, 10, 10) do
       assert((t - Time.now).abs < 50, "Failed to travel time.")
       t2 = Time.local(2008, 9, 9, 9, 9, 9)
       Timecop.travel(2008, 9, 9, 9, 9, 9) do
@@ -88,10 +87,10 @@ class TestTimecopWithoutDate < Test::Unit::TestCase
     end
     assert_nil Time.send(:mock_time)
   end
-  
+
   def test_recursive_travel_then_freeze
     t = Time.local(2008, 10, 10, 10, 10, 10)
-    Timecop.travel(2008, 10, 10, 10, 10, 10) do 
+    Timecop.travel(2008, 10, 10, 10, 10, 10) do
       assert((t - Time.now).abs < 50, "Failed to travel time.")
       t2 = Time.local(2008, 9, 9, 9, 9, 9)
       Timecop.freeze(2008, 9, 9, 9, 9, 9) do
@@ -101,10 +100,10 @@ class TestTimecopWithoutDate < Test::Unit::TestCase
     end
     assert_nil Time.send(:mock_time)
   end
-  
+
   def test_recursive_freeze_then_travel
     t = Time.local(2008, 10, 10, 10, 10, 10)
-    Timecop.freeze(t) do 
+    Timecop.freeze(t) do
       assert_equal t, Time.now
       t2 = Time.local(2008, 9, 9, 9, 9, 9)
       Timecop.travel(t2) do
@@ -113,7 +112,7 @@ class TestTimecopWithoutDate < Test::Unit::TestCase
       end
       assert_equal t, Time.now
     end
-    assert_nil Time.send(:mock_time)    
+    assert_nil Time.send(:mock_time)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Travis Jeffery
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies: []
 description: A gem providing "time travel" and "time freezing" capabilities, making
   it dead simple to test time-dependent code.  It provides a unified method to mock
@@ -27,36 +27,35 @@ files:
 - lib/timecop.rb
 - lib/timecop/time_extensions.rb
 - lib/timecop/time_stack_item.rb
-- lib/timecop/version.rb
 - lib/timecop/timecop.rb
-- test/run_tests.sh
+- lib/timecop/version.rb
 - test/test_helper.rb
 - test/time_stack_item_test.rb
 - test/timecop_test.rb
-- test/timecop_without_date_test.rb
 - test/timecop_without_date_but_with_time_test.rb
+- test/timecop_without_date_test.rb
 homepage: https://github.com/travisjeffery/timecop
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: timecop
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 3
 summary: A gem providing "time travel" and "time freezing" capabilities, making it
@@ -68,3 +67,4 @@ test_files:
 - test/timecop_test.rb
 - test/timecop_without_date_test.rb
 - test/timecop_without_date_but_with_time_test.rb
+has_rdoc: 

data/test/run_tests.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-FAILEDCASES=0
-for f in *_test.rb; do
-  if ! ${RUBY:-ruby} -I../lib:. $f; then
-      FAILEDCASES=`expr "$FAILEDCASES" + 1`
-  fi
-done
-echo "$FAILEDCASES test cases had failures"
-exit $FAILEDCASES