modalsupport 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/modalsupport.rb

@@ -1,5 +1,8 @@
 require 'active_support'
 require 'hobosupport'
+require 'modalsupport/ruby_version'
+require 'modalsupport/ruby_platform'
+require 'modalsupport/ruby_engine'
 require 'modalsupport/string'
 require 'modalsupport/regexp'
 require 'modalsupport/enumerable'

data/lib/modalsupport/enumerable.rb

@@ -4,7 +4,7 @@ module Enumerable
     grep(pattern){|str| yield(Regexp.last_match)}
   end
 
-  if RUBY_VERSION < "1.8.7"
+  if_ruby_version :<, "1.8.7" do
     require 'enumerator'
     alias enumerator_each_slice each_slice
     def each_slice(n, &blk)

data/lib/modalsupport/regexp.rb

@@ -1,6 +1,6 @@
 class Regexp
  
-  if RUBY_VERSION < "1.9"
+  if_ruby_version :<, "1.9.0" do
     alias match_old match
     # Modify String#match to work as in Ruby 1.9
     def match(str, i=0)

data/lib/modalsupport/ruby_engine.rb

@@ -0,0 +1,11 @@
+# Detect Ruby engine:
+# :ruby, :rbx/:rubinius, :jruby/:java, ...
+def ruby_engine_is?(engine) # "ruby" "jruby" "rbx"
+  engine = {:rubinius=>:rbx, :java=>:jruby}[engine] || engine
+  current_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
+  engine.to_s == current_engine
+end
+
+def if_ruby_engine_is(engine)
+  yield if ruby_engine_is?(engine)
+end

data/lib/modalsupport/ruby_platform.rb

@@ -0,0 +1,33 @@
+# detection of some generic platform families
+# * :unix (UN*X systems) with distinguished subfamilies: :linux, :osx/:darwin, :bsd, :cygwin
+# * :windows with variants :mswin32, :mingw32
+# * :java
+def ruby_platform_is?(platform)
+  ruby_platform = ruby_version?(:<,'1.9.0') ? PLATFORM : RUBY_PLATFORM
+  case platform
+  when :unix
+    ruby_platform =~ /linux|darwin|freebsd|netbsd|solaris|aix|hpux|cygwin/
+  when :linux
+    ruby_platform =~ /linux/
+  when :osx, :darwin
+    ruby_platform =~ /darwin/
+  when :bsd
+    ruby_platform =~ /freebsd|netbsd/
+  when :cygwin
+    ruby_platform =~ /cygwin/
+  when :windows
+    ruby_platform =~ /mswin32|mingw32/
+  when :mswin32
+    ruby_platform =~ /mswin32/
+  when :mingw32
+    ruby_platform =~ /mingw32/
+  when :java
+    ruby_platform =~ /java/
+  else
+    raise RuntimeError, "Invalid platform specifier"
+  end ? true : false
+end
+
+def if_ruby_platform_is(platform)
+  yield if platform_is?(platform)
+end

data/lib/modalsupport/ruby_version.rb

@@ -0,0 +1,45 @@
+# Helpers to detect Ruby versions
+
+unless defined? Gem
+  require 'rubygems'
+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))
+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))
+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))
+end
+
+# Execute code conditinally on Ruby version:
+#    if_ruby_version :>=, '1.9.2' do
+#      ...
+#    end
+def if_ruby_version(cmp, v)
+  yield if ruby_version?(cmp, v)
+end
+
+def if_ruby_version_between(v1, v2)  
+  yield if ruby_version_between?(v1, v2)
+end
+
+def if_ruby_version_between_ex(v1, v2)  
+  yield if ruby_version_between_ex?(v1, v2)
+end
+
+def ruby_19(&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'
+end

data/lib/modalsupport/string.rb

@@ -1,6 +1,6 @@
 class String
 
-  if RUBY_VERSION < "1.9"
+  if_ruby_version :<, "1.9" do
     alias match_old match
     # Modify String#match to work as in Ruby 1.9
     def match(re, i=0)

data/modalsupport.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
@@ -29,6 +29,9 @@ Gem::Specification.new do |s|
      "lib/modalsupport/mixins/bracket_constructor.rb",
      "lib/modalsupport/mixins/state_equivalent.rb",
      "lib/modalsupport/regexp.rb",
+     "lib/modalsupport/ruby_engine.rb",
+     "lib/modalsupport/ruby_platform.rb",
+     "lib/modalsupport/ruby_version.rb",
      "lib/modalsupport/string.rb",
      "modalsupport.gemspec",
      "test/helper.rb",
@@ -45,7 +48,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jgoizueta/modalsupport}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{simple extensions to core classes}
   s.test_files = [
     "test/helper.rb",
@@ -64,7 +67,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<hobosupport>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])

data/test/test_relative_path.rb

@@ -57,7 +57,9 @@ class TestRelativePaths < Test::Unit::TestCase
       assert_equal '//aaa/bbb/ccc/ddd.eee', File.relative_path('//aaa/bbb/ccc/ddd.eee')
       assert_equal 'ccc/ddd.eee', File.relative_path('//aaa/bbb/ccc/ddd.eee', '//aaa/bbb')
       assert_equal '//aaa/bbb/ccc/ddd.eee', File.relative_path('//aaa/bbb/ccc/ddd.eee','aaa/bbb')
-      assert_equal '//aaa/bbb/ccc/ddd.eee', File.relative_path('//aaa/bbb/ccc/ddd.eee','/aaa/bbb')
+      unless ruby_engine_is?(:rbx)
+        assert_equal '//aaa/bbb/ccc/ddd.eee', File.relative_path('//aaa/bbb/ccc/ddd.eee','/aaa/bbb')
+      end
       assert_equal '//aaa/bbb/ccc/ddd.eee', File.relative_path('//aaa/bbb/ccc/ddd.eee','xxx/yyy')
       assert_equal '//aaa/bbb/ccc/ddd.eee', File.relative_path('//aaa/bbb/ccc/ddd.eee','/xxx/yyy')
       assert_equal '//aaa/bbb/ccc/ddd.eee', File.relative_path('//aaa/bbb/ccc/ddd.eee','//xxx/yyy')

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+    - 0
+    - 4
+    - 0
+  version: 0.4.0
 platform: ruby
 authors: 
-- Javier Goizueta
+  - Javier Goizueta
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -18,48 +17,42 @@ cert_chain: []
 date: 2010-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hobosupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: shoulda
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: hobosupport
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: activesupport
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id003
 description: additional support extensions to ActiveSupport and HoboSupport
 email: jgoizueta@gmail.com
 executables: []
@@ -67,75 +60,74 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+  - LICENSE
+  - README.rdoc
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- lib/modalsupport.rb
-- lib/modalsupport/enumerable.rb
-- lib/modalsupport/file.rb
-- lib/modalsupport/mixins/bracket_constructor.rb
-- lib/modalsupport/mixins/state_equivalent.rb
-- lib/modalsupport/regexp.rb
-- lib/modalsupport/string.rb
-- modalsupport.gemspec
-- test/helper.rb
-- test/test_bracket_constructor.rb
-- test/test_grep.rb
-- test/test_gsub.rb
-- test/test_match.rb
-- test/test_product.rb
-- test/test_relative_path.rb
-- test/test_slice.rb
-- test/test_state_equivalent.rb
-- test/test_unindent.rb
+  - .document
+  - .gitignore
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+  - VERSION
+  - lib/modalsupport.rb
+  - lib/modalsupport/enumerable.rb
+  - lib/modalsupport/file.rb
+  - lib/modalsupport/mixins/bracket_constructor.rb
+  - lib/modalsupport/mixins/state_equivalent.rb
+  - lib/modalsupport/regexp.rb
+  - lib/modalsupport/ruby_engine.rb
+  - lib/modalsupport/ruby_platform.rb
+  - lib/modalsupport/ruby_version.rb
+  - lib/modalsupport/string.rb
+  - modalsupport.gemspec
+  - test/helper.rb
+  - test/test_bracket_constructor.rb
+  - test/test_grep.rb
+  - test/test_gsub.rb
+  - test/test_match.rb
+  - test/test_product.rb
+  - test/test_relative_path.rb
+  - test/test_slice.rb
+  - test/test_state_equivalent.rb
+  - test/test_unindent.rb
 has_rdoc: true
 homepage: http://github.com/jgoizueta/modalsupport
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: simple extensions to core classes
 test_files: 
-- test/helper.rb
-- test/test_bracket_constructor.rb
-- test/test_grep.rb
-- test/test_gsub.rb
-- test/test_match.rb
-- test/test_product.rb
-- test/test_relative_path.rb
-- test/test_slice.rb
-- test/test_state_equivalent.rb
-- test/test_unindent.rb
+  - test/helper.rb
+  - test/test_bracket_constructor.rb
+  - test/test_grep.rb
+  - test/test_gsub.rb
+  - test/test_match.rb
+  - test/test_product.rb
+  - test/test_relative_path.rb
+  - test/test_slice.rb
+  - test/test_state_equivalent.rb
+  - test/test_unindent.rb