timecop 0.6.2.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d8a097f64ecc69c2fd97409fd484d4ae24ea32
-  data.tar.gz: 2331d9650b9cbcc142d4dbddf9a93c615bf18e1d
+  metadata.gz: 28306a2c78d6588f97b394b65bba1163a9a1cf4a
+  data.tar.gz: c2323a791bb954e70a70b9595cb56135e54ff64d
 SHA512:
-  metadata.gz: fe7d7dc16fa00728272702b53e7fb8dc9bc1736e43085696a20f3bd381941704d9112639e1c3623278bdf0709986361664777d1efb97a9e34961ff9f14d33dc1
-  data.tar.gz: e03aec0f8836e109a6d399e3a983757b35a31c701944396ac0a4154d2ba08be333c032af7af42836b6c3746cb3af09cfde30b0899ca0b39d8d3bea04c3b18989
+  metadata.gz: 5e445072106712764a97139527912b59ec29cb0e4a97b4a1203dd8c5d72aebea0788935ca56fec863285cb2d764f3312ad604f1d311fa51fcd4ea07a9bd4c8d8
+  data.tar.gz: 6f690a4c4d944c7f3df343616bb4e78c707e0efaf8b9c102d71da2a72029bffb0d26dcd64dea856e59183c04cc98d5c0c5d5c7549892338dc823ba3d963968cc

data/README.markdown

@@ -111,7 +111,25 @@ Time.now
 # => 2012-09-21 06:22:59 -0500
 ```
 
-See #42 for more information, thanks to Ken Mayer, David Holcomb, and Pivotal Labs.
+<<<<<<< HEAD
+### 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.
+
+``` ruby
+# turn on safe mode
+Timecop.safe_mode = true
+
+# check if you are in safe mode
+Timecop.safe_mode?
+# => true
+
+# using method without block
+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.
 
 ## Contribute
 
@@ -129,4 +147,3 @@ Here's the most direct way to get your work merged into the project.
 - Push the branch up to your fork
 - Send a pull request for your branch
 
-

data/lib/timecop/timecop.rb

@@ -102,6 +102,14 @@ class Timecop
       instance.instance_variable_get(:@_stack).last
     end
 
+    def safe_mode=(safe)
+      @safe_mode = safe
+    end
+
+    def safe_mode?
+      false || @safe_mode
+    end
+
     private
     def send_travel(mock_type, *args, &block)
       val = instance.send(:travel, mock_type, *args, &block)
@@ -121,6 +129,8 @@ class Timecop
   end
 
   def travel(mock_type, *args, &block) #:nodoc:
+    raise SafeModeException if Timecop.safe_mode? && !block_given?
+
     stack_item = TimeStackItem.new(mock_type, *args)
 
     stack_backup = @_stack.dup
@@ -156,4 +166,10 @@ class Timecop
       unmock!
     end
   end
+
+  class SafeModeException < StandardError
+    def initialize
+      super "Safe mode is enabled, only calls passing a block are allowed."
+    end
+  end
 end

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.6.2.2"
+  VERSION = "0.6.3"
 end

data/test/timecop_test.rb

@@ -459,4 +459,37 @@ class TestTimecop < Test::Unit::TestCase
     end
   end
 
+  def test_raises_when_safe_mode_and_no_block
+    with_safe_mode do
+      assert_raise Timecop::SafeModeException do
+        Timecop.freeze
+      end
+    end
+  end
+
+  def test_no_raise_when_safe_mode_and_block_used
+    with_safe_mode do
+      assert_nothing_raised do
+        Timecop.freeze {}
+      end
+    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
+  end
+
+  private
+
+  def with_safe_mode(enabled=true)
+    mode = Timecop.safe_mode?
+    Timecop.safe_mode = enabled
+    yield
+  ensure
+    Timecop.safe_mode = mode
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  version: 0.6.2.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Travis Jeffery
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-08-04 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