timecop 0.5.4 → 0.5.5

data/lib/timecop.rb

@@ -1,2 +1,2 @@
-require 'timecop/timecop'
-require 'timecop/version'
+require File.join(File.dirname(__FILE__), "timecop", "timecop")
+require File.join(File.dirname(__FILE__), "timecop", "version")

data/lib/timecop/timecop.rb

@@ -1,6 +1,6 @@
 require 'singleton'
-require 'timecop/time_extensions'
-require 'timecop/time_stack_item'
+require File.join(File.dirname(__FILE__), "time_extensions")
+require File.join(File.dirname(__FILE__), "time_stack_item")
 
 # Timecop
 # * Wrapper class for manipulating the extensions to the Time, Date, and DateTime objects
@@ -49,9 +49,7 @@ class Timecop
     #
     # Returns the value of the block if one is given, or the mocked time.
     def freeze(*args, &block)
-      val = instance.send(:travel, :freeze, *args, &block)
-
-      block_given? ? val : Time.now
+      send_travel(:freeze, *args, &block)
     end
 
     # Allows you to run a block of code and "fake" a time throughout the execution of that block.
@@ -62,9 +60,7 @@ class Timecop
     #
     # Returns the value of the block if one is given, or the mocked time.
     def travel(*args, &block)
-      val = instance.send(:travel, :travel, *args, &block)
-
-      block_given? ? val : Time.now
+      send_travel(:travel, *args, &block)
     end
 
     # Allows you to run a block of code and "scale" a time throughout the execution of that block.
@@ -76,9 +72,7 @@ class Timecop
     #
     # Returns the value of the block if one is given, or the mocked time.
     def scale(*args, &block)
-      val = instance.send(:travel, :scale, *args, &block)
-
-      block_given? ? val : Time.now
+      send_travel(:scale, *args, &block)
     end
 
     def baseline
@@ -109,6 +103,12 @@ class Timecop
     def top_stack_item #:nodoc:
       instance.instance_variable_get(:@_stack).last
     end
+
+    private
+    def send_travel(mock_type, *args, &block)
+      val = instance.send(:travel, mock_type, *args, &block)
+      block_given? ? val : Time.now  
+    end
   end
 
   private

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/test/test_helper.rb

@@ -1,7 +1,11 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'test/unit'
-require 'mocha'
+begin
+  require 'mocha/setup'
+rescue LoadError
+  require 'mocha'
+end
 
 class Test::Unit::TestCase
 

data/test/time_stack_item_test.rb

@@ -1,5 +1,5 @@
 require 'date'
-require 'test_helper'
+require File.join(File.dirname(__FILE__), "test_helper")
 require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
 
 class TestTimeStackItem < Test::Unit::TestCase

data/test/timecop_test.rb

@@ -1,5 +1,5 @@
 require 'date'
-require 'test_helper'
+require File.join(File.dirname(__FILE__), "test_helper")
 require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
 
 class TestTimecop < Test::Unit::TestCase
@@ -429,4 +429,10 @@ class TestTimecop < Test::Unit::TestCase
     assert_equal date, Time.now
     assert_equal date, Time.new
   end
+
+  def test_not_callable_send_travel
+    assert_raise NoMethodError do
+      Timecop.send_travel(:travel, Time.now - 100)
+    end
+  end
 end

data/test/timecop_without_date_test.rb

@@ -1,5 +1,5 @@
 
-require 'test_helper'
+require File.join(File.dirname(__FILE__), "test_helper")
 require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
 
 class TestTimecopWithoutDate < Test::Unit::TestCase

metadata

@@ -1,34 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: timecop
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 4
-  version: 0.5.4
+version: !ruby/object:Gem::Version
+  version: 0.5.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Travis Jeffery
 - John Trupiano
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-29 00:00:00 -05:00
-default_executable: 
+date: 2012-12-20 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 Time.now, Date.today, and DateTime.now in a single call.
+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
+  Time.now, Date.today, and DateTime.now in a single call.
 email: travisjeffery@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - History.rdoc
 - LICENSE
 - README.markdown
@@ -44,37 +37,34 @@ files:
 - test/timecop_test.rb
 - test/timecop_without_date_test.rb
 - test/timecop_without_date_but_with_time_test.rb
-has_rdoc: true
 homepage: https://github.com/travisjeffery/timecop
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: timecop
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: 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 Time.now, Date.today, and DateTime.now in a single call.
-test_files: 
+summary: 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 Time.now,
+  Date.today, and DateTime.now in a single call.
+test_files:
 - test/test_helper.rb
 - test/time_stack_item_test.rb
 - test/timecop_test.rb