the_force 0.3.2 → 0.3.3

data/Rakefile

@@ -7,7 +7,7 @@ exclude_file_globs = []
 
 spec = Gem::Specification.new do |s| 
   s.name              = "the_force"
-  s.version           = '0.3.2'
+  s.version           = '0.3.3'
   s.author            = "Ryan Ziegler"
   s.email             = "info@symbolforce.com"
   s.homepage          = "http://www.symbolforce.com"

data/lib/the_force/keep_trying.rb

@@ -1,12 +1,16 @@
-module TheForce; end
+require 'the_force/ruby_version'
 
 begin
-  require 'system_timer'
+  require 'system_timer' if TheForce.ruby_version.is18?
+rescue LoadError => e
+  puts "WARNING - SystemTimer gem not found...reverting to Timeout::timeout"
+end
+
+if defined? SystemTimer and TheForce.ruby_version.is18?
   def TheForce.timeout(*args, &b)
     SystemTimer.timeout_after(*args, &b)
   end
-rescue LoadError => e
-  puts "WARNING - SystemTimer gem not found...reverting to Timeout::timeout"
+else
   require 'timeout'
   def TheForce.timeout(*args, &b)
     Timeout.timeout(*args, &b)

data/lib/the_force/ruby_version.rb

@@ -14,6 +14,10 @@ module TheForce
       [major, minor] == [1,9]
     end
 
+    def v.is18?
+      [major, minor] == [1,8]
+    end
+
     v.freeze
   end
 end

data/lib/the_force.rb

@@ -1,4 +1,5 @@
 ROOT = File.join(File.dirname(__FILE__), 'the_force')
+require File.join(ROOT, 'ruby_version')
 require File.join(ROOT, 'keep_trying')
 require File.join(ROOT, 'thread_pool')
 require File.join(ROOT, 'timer')

data/test/unit/test_keep_trying.rb

@@ -44,6 +44,10 @@ class TestKeepTrying < Test::Unit::TestCase
   
   #def test_works_without_systemtimer
   #def test_works_with_systemtimer
+  
+  def test_systemtimer_is_not_loaded_in_19
+    assert false, "PENDING"
+  end
 end
 
 class TestKeepTryingSpecialError < StandardError

data/test/unit/test_rails_support.rb

@@ -1,5 +1,5 @@
 require 'the_force/rails_support'
-require 'rails'
+#require 'rails'
 
 class TestRailsSupport < Test::Unit::TestCase
   def test_collect_column

data/test/unit/test_ruby_version.rb

@@ -27,6 +27,10 @@ class TestRubyVersion < Test::Unit::TestCase
   def test_is19?
     assert_equal [@v.major, @v.minor] == [1,9], @v.is19?
   end
+
+  def test_is18?
+    assert_equal [@v.major, @v.minor] == [1,8], @v.is18?
+  end
     
   def test_is_frozen
     assert @v.frozen?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Ryan Ziegler