Make tweaks for Ruby 2.1.0 compatibility

Looks like everything should work as before under 2.1.0.

Signed-off-by: Wincent Colaiuta <win@wincent.com>

diff --git a/.ruby-version b/.ruby-version
index c031dda588c67816f7b54f3c6586b2a42c1acc25..7ec1d6db40877765247db18e7f9a4e36a0def4ad 100644 (file)
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.0.0-p0
+2.1.0

diff --git a/Gemfile.lock b/Gemfile.lock
index bcdea55bb2ba04766ad4b59f7141d87d963cf0be..31c5731ee020844b248c15137c1511aa57dc4601 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    wikitext (4.0.2)
+    wikitext (4.0.2.99)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ZenTest (4.9.0)
+    ZenTest (4.9.5)
     diff-lcs (1.2.1)
     rake (10.0.3)
     rspec (2.13.0)

diff --git a/ext/wikitext/extconf.rb b/ext/wikitext/extconf.rb
index 04f4b351ec0ae487899366e19bc96470c6ce5472..c5bb46c9550a21bd43caf8442da6b13cae970616 100644 (file)
--- a/ext/wikitext/extconf.rb
+++ b/ext/wikitext/extconf.rb
@@ -28,10 +28,7 @@ def missing item
   exit 1
 end
 
-case RUBY_VERSION
-when /\A2\.0/
-  $CFLAGS += ' -DRUBY_2_0_x'
-else
+if RUBY_VERSION !~ /\A2\.[01]\./
   raise "unsupported Ruby version: #{RUBY_VERSION}"
 end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1ade42d8097817da8d87850492153dc135563ffb..eb868d093a7a374799c762bbfc2075ef4ace3c8e 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -52,7 +52,7 @@ end
 
 # prepend local directories to search path if not already present
 basedir     = Pathname.new(__dir__) + '..'
-extdir      = (basedir + 'ext').realpath
+extdir      = (basedir + 'ext' + 'wikitext').realpath
 libdir      = (basedir + 'lib').realpath
 normalized  = $:.map { |path| Pathname.new(path).realpath rescue path }
 [libdir, extdir].each { |d| $:.unshift(d) unless normalized.include?(d) }