modalsupport 0.8.1 → 0.8.2

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/modalsupport/ruby_version.rb

@@ -5,18 +5,25 @@ unless defined? Gem
 end
 
 # Compare the Ruby version with a version string
-def ruby_version?(cmp, v)
-  Gem::Version.create(RUBY_VERSION.dup).send(cmp, Gem::Version.create(v))
+def ruby_version?(cmp, v)  
+  rv =  Gem::Version.create(RUBY_VERSION.dup)
+  v = Gem::Version.create(v)
+  if cmp.to_sym==:'~>'
+    rv = rv.release
+    rv >= v && rv < v.bump
+  else
+    rv.send(cmp,v)
+  end
 end
 
 # ruby_version_between?(v1,v2) == ruby_version?(:>=,v1) && ruby_version?(:<=,v2)
 def ruby_version_between?(v1, v2)  
-  (Gem::Version.create(v1)..Gem::Version.create(v2)).include?(Ger::Version.create(RUBY_VERSION))
+  (Gem::Version.create(v1)..Gem::Version.create(v2)).include?(Gem::Version.create(RUBY_VERSION))
 end
 
 # ruby_version_between?(v1,v2) == ruby_version?(:>=,v1) && ruby_version?(:<,v2)
 def ruby_version_between_ex?(v1, v2)  
-  (Gem::Version.create(v1).-.Gem::Version.create(v2)).include?(Ger::Version.create(RUBY_VERSION))
+  (Gem::Version.create(v1).-.Gem::Version.create(v2)).include?(Gem::Version.create(RUBY_VERSION))
 end
 
 # Execute code conditinally on Ruby version:
@@ -36,10 +43,9 @@ def if_ruby_version_between_ex(v1, v2)
 end
 
 def ruby_19(&blk)
-  if_ruby_version :>=, '1.9.0', &blk
+  if_ruby_version :'~>', '1.9.0', &blk
 end
 
 def ruby_18(&blk)
-  # if_ruby_version :<, '1.9.0', &blk
-  if_ruby_version_between_ex '1.8.0', '1.9.0'
+  if_ruby_version :'~>', '1.8.0', &blk
 end

data/modalsupport.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Javier Goizueta