memcache-client 1.8.0 → 1.8.1

data/History.rdoc

@@ -1,3 +1,8 @@
+= 1.8.1 (2010-03-20)
+
+ * Only require SystemTimer if the Ruby VM looks like MRI.
+ * Remove VERSION.yml usage as we should avoid using files outside of lib at runtime. (josh)
+
 = 1.8.0 (2010-03-05)
 
  * Add support for EventMachine-based connections.

data/Rakefile

@@ -3,10 +3,12 @@ require 'rubygems'
 require 'rake/rdoctask'
 require 'rake/testtask'
 
+require File.dirname(__FILE__) + "/lib/memcache/version.rb"
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "memcache-client"
+    s.version = MemCache::VERSION
     s.summary = s.description = "A Ruby library for accessing memcached."
     s.email = "mperham@gmail.com"
     s.homepage = "http://github.com/mperham/memcache-client"

data/lib/memcache.rb

@@ -4,22 +4,22 @@ $TESTING = defined?($TESTING) && $TESTING
 require 'socket'
 require 'thread'
 require 'zlib'
-require 'yaml'
 require 'digest/sha1'
 require 'net/protocol'
+require 'memcache/version'
 
 begin
   # Try to use the SystemTimer gem instead of Ruby's timeout library
-  # when running on something that looks like Ruby 1.8.x. See:
+  # when running on Ruby 1.8.x. See:
   #   http://ph7spot.com/articles/system_timer
-  # We don't want to bother trying to load SystemTimer on jruby and
-  # ruby 1.9+
-  if defined?(JRUBY_VERSION) || (RUBY_VERSION >= '1.9')
-    require 'timeout'
-    MemCacheTimer = Timeout
-  else
+  # We don't want to bother trying to load SystemTimer on jruby,
+  # ruby 1.9+ and rbx.
+  if !defined?(RUBY_ENGINE) || (RUBY_ENGINE == 'ruby' && RUBY_VERSION < '1.9.0')
     require 'system_timer'
     MemCacheTimer = SystemTimer
+  else
+    require 'timeout'
+    MemCacheTimer = Timeout
   end
 rescue LoadError => e
   puts "[memcache-client] Could not load SystemTimer gem, falling back to Ruby's slower/unsafe timeout library: #{e.message}"
@@ -34,14 +34,6 @@ end
 
 class MemCache
 
-  ##
-  # The version of MemCache you are using.
-
-  VERSION = begin
-    config = YAML.load(File.read(File.dirname(__FILE__) + '/../VERSION.yml'))
-    "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  end
-
   ##
   # Default options for the cache object.
 

data/lib/memcache/version.rb

@@ -0,0 +1,6 @@
+class MemCache
+  ##
+  # The version of MemCache you are using.
+
+  VERSION = "1.8.1"
+end

data/test/test_benchmark.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'benchmark'
 require 'test/unit'
 

data/test/test_mem_cache.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
+require 'rubygems'
 require 'logger'
 require 'stringio'
 require 'test/unit'
 $TESTING = true
 require 'memcache'
 
-require 'rubygems'
 begin
   gem 'flexmock'
   require 'flexmock/test_unit'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 0
-  version: 1.8.0
+  - 1
+  version: 1.8.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -06:00
+date: 2010-03-20 00:00:00 -05:00
 default_executable: memcached_top
 dependencies: []
 
@@ -35,10 +35,10 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - lib/continuum_native.rb
 - lib/memcache.rb
 - lib/memcache/event_machine.rb
+- lib/memcache/version.rb
 - lib/memcache_util.rb
 - performance.txt
 - test/test_benchmark.rb

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:build: 
-:major: 1
-:minor: 8
-:patch: 0