ruby-version 0.3.1 → 0.4.2

data/.travis.yml

@@ -0,0 +1,16 @@
+script: "rake test --trace"
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+  - 1.8.7
+  - ree
+jdk:
+  - openjdk7
+  - oraclejdk7
+  - openjdk6

data/Gemfile

@@ -5,7 +5,9 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.5.2"
-  gem "riot", ">= 0.12.3"
+  gem "bundler"
+  gem "jeweler"
+  gem "rake"
+  gem "rspec"
+  gem "simplecov"
 end

data/Gemfile.lock

@@ -1,20 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
-    riot (0.12.5)
-      rr
-    rr (1.0.4)
+      rdoc
+    json (1.7.5)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
-  jeweler (>= 1.5.2)
-  riot (>= 0.12.3)
+  bundler
+  jeweler
+  rake
+  rspec
+  simplecov

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+Copyright (c) 2011-2012 Martin Kozák (martinkozak@martinkozak.net)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,13 +1,24 @@
 Ruby Version
 ============
 
-**ruby-version** wraps the `RUBY_VERSION` constant and allows version
-number matching. Usage is simple:
+**ruby-version** wraps the `RUBY_VERSION` and `RUBY_ENGINE` constant and 
+allows the elegant Ruby version number matching on all major Ruby platforms. 
+Usage is simple:
 
     require "ruby-version"
     
     Ruby::Version > "1.8.7"
     # will return true for 1.9.2 and false for 1.8.3
+    
+Or for the ruby engine name:
+
+    Ruby::Engine::NAME
+    # will return "ruby" typically (works on 1.8 too of sure)
+    
+    Ruby::Engine == "ruby"    # or something else
+    # will return appropriate boolean
+    
+[![Build Status](https://secure.travis-ci.org/martinkozak/ruby-version.png)](http://travis-ci.org/martinkozak/ruby-version)
 
 Contributing
 ------------
@@ -22,7 +33,7 @@ Contributing
 Copyright
 ---------
 
-Copyright © 2011 [Martin Kozák][10]. See `LICENSE.txt` for
+Copyright © 2011-2012 [Martin Kozák][10]. See `LICENSE.txt` for
 further details.
 
 [9]: http://github.com/martinkozak/ruby-version/issues

data/Rakefile

@@ -10,6 +10,8 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
+### Jeweler
+
 require 'rake'
 require 'jeweler'
 
@@ -18,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "ruby-version"
   gem.homepage = "http://github.com/martinkozak/ruby-version"
   gem.license = "MIT"
-  gem.summary = 'Wraps the RUBY_VERSION constant and allows version number matching.'
+  gem.summary = 'Wraps the RUBY_VERSION and RUBY_ENGINE constants and allows the elegant Ruby version number matching on all major Ruby platforms.'
   gem.email = "martinkozak@martinkozak.net"
   gem.authors = ["Martin Kozák"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
@@ -26,4 +28,13 @@ Jeweler::Tasks.new do |gem|
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
-Jeweler::RubygemsDotOrgTasks.new
+Jeweler::RubygemsDotOrgTasks.new 
+
+### RSpec
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:test) do |t|
+  t.pattern = 'tests.rb'
+  t.rspec_opts = '--format d -c'
+end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.2

data/lib/ruby-version.rb

@@ -1,11 +1,41 @@
 # encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+# (c) 2011-2012 Martin Kozák (martinkozak@martinkozak.net)
 
 ##
 # Outer wrapper for the {Ruby::Version} module.
 #
 
 module Ruby
+
+    ##
+    # Wraps the +RUBY_ENGINE+ constant. In fact, handles returning the
+    # correct value on Ruby 1.8 in the main.
+    #
+    
+    module Engine
+    
+        ##
+        # Contains the Ruby engine identification in frozen string.
+        #
+    
+        begin
+            NAME = RUBY_ENGINE.dup.freeze
+        rescue NameError
+            NAME = "ruby".freeze
+        end
+     
+        ##
+        # Equality operator.
+        #
+        # @param [String, Symbol] value engine identifier
+        # @return [Boolean] +true+ if yes, +false otherwise
+        #
+        
+        def self.==(value)
+            return self::NAME == value.to_s
+        end
+        
+    end
     
     ##
     # Wraps the +RUBY_VERSION+ constant and provides some handling

data/ruby-version.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-version"
-  s.version = "0.3.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2011-10-13"
+  s.date = "2012-10-06"
   s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -25,30 +26,36 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/ruby-version.rb",
     "ruby-version.gemspec",
-    "test"
+    "tests.rb"
   ]
   s.homepage = "http://github.com/martinkozak/ruby-version"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "Wraps the RUBY_VERSION constant and allows version number matching."
+  s.rubygems_version = "1.8.24"
+  s.summary = "Wraps the RUBY_VERSION and RUBY_ENGINE constants and allows the elegant Ruby version number matching on all major Ruby platforms."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
-      s.add_development_dependency(%q<riot>, [">= 0.12.3"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
-      s.add_dependency(%q<riot>, [">= 0.12.3"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
-    s.add_dependency(%q<riot>, [">= 0.12.3"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/tests.rb

@@ -0,0 +1,133 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
+$:.push("./lib")
+
+require "rubygems"
+require "rspec"
+
+require "simplecov"
+SimpleCov.start
+
+require "ruby-version"
+
+###
+
+LOWER = :"1.1.3"
+CURRENT = RUBY_VERSION.to_sym
+HIGHER = :"4.0.1"
+
+###
+
+describe Ruby::Engine do
+    specify "NAME shoud be something reasonable" do
+        not ['ruby', 'jruby', 'rbx'].include? Ruby::Engine::NAME
+    end
+    it "shoud be comparable" do
+        Ruby::Engine == "foo"
+        true
+    end
+end
+
+describe Ruby::Version, "-- algebraic comparsion operators" do
+    
+    context "against higher version" do
+        it "should be lower" do
+            Ruby::Version < HIGHER
+        end
+        it "should be lower or equal" do
+            Ruby::Version <= HIGHER
+        end
+        it "shouldn't be equal" do
+            not Ruby::Version == HIGHER
+        end
+        it "should be higher or equal" do
+            Ruby::Version >= HIGHER
+        end
+        it "should be higher" do
+            Ruby::Version > HIGHER
+        end
+    end
+    
+    context "against current version" do
+        it "shouldn't be lower" do
+            not Ruby::Version < CURRENT
+        end
+        it "should be lower or equal" do
+            Ruby::Version <= CURRENT
+        end
+        it "should be equal" do
+            Ruby::Version == CURRENT
+        end
+        it "should be higher or equal" do
+            Ruby::Version >= CURRENT
+        end
+        it "shouldn't be higher" do
+            not Ruby::Version > HIGHER
+        end
+    end
+    
+    context "against lower version" do
+        it "should be lower" do
+            Ruby::Version < LOWER
+        end
+        it "should be lower or equal" do
+            Ruby::Version <= LOWER
+        end
+        it "shouldn't be equal" do
+            not Ruby::Version == LOWER
+        end
+        it "shouldn't be higher or equal" do
+            not Ruby::Version >= LOWER
+        end
+        it "shouldn't be higher" do
+            not Ruby::Version > LOWER
+        end
+        
+    end
+end
+
+describe Ruby::Version, "-- fuzzy operators" do
+    
+    context "against higher version" do
+        specify "#<=> should return -1" do
+            (Ruby::Version <=> HIGHER) == -1
+        end
+        specify "#compare should return -1" do
+            Ruby::Version::compare(HIGHER) == -1
+        end
+    end
+    
+    context "against current version" do
+        specify "#<=> should return 0" do
+            (Ruby::Version <=> CURRENT) == 0
+        end
+        specify "#compare should return 0" do
+            Ruby::Version::compare(CURRENT) == 0
+        end
+    end
+    
+    context "against lower version" do
+        specify "#<=> should return 1" do
+            (Ruby::Version <=> LOWER) == 1
+        end
+        specify "#compare should return 1" do
+            Ruby::Version::compare(LOWER) == -1
+        end
+    end
+end
+
+describe Ruby::Version do
+
+    specify "TOKENS constant content the same as broking result" do
+        Ruby::Version::TOKENS == Ruby::Version::broke(RUBY_VERSION)
+    end
+    specify "VERSION constant should be equal to RUBY_VERSION" do
+        Ruby::Version::VERSION == RUBY_VERSION
+    end
+    specify "broking components should equal to version string components" do
+        Ruby::Version::broke("1.2.3") == [1, 2, 3]
+    end
+    
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-version
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,41 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13809960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13809960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13809320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13809320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: riot
-  requirement: &13808760 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13808760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -53,6 +100,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -61,7 +109,7 @@ files:
 - VERSION
 - lib/ruby-version.rb
 - ruby-version.gemspec
-- test
+- tests.rb
 homepage: http://github.com/martinkozak/ruby-version
 licenses:
 - MIT
@@ -77,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1698263661555787734
+      hash: 1902862411478104695
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,8 +134,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Wraps the RUBY_VERSION constant and allows version number matching.
+summary: Wraps the RUBY_VERSION and RUBY_ENGINE constants and allows the elegant Ruby
+  version number matching on all major Ruby platforms.
 test_files: []

data/test

@@ -1,44 +0,0 @@
-#!/usr/bin/ruby
-# encoding: utf-8
-# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
-
-$:.push("./lib")
-require "ruby-version"
-require "riot"
-
-DOWN = :"1.8.7"
-CURRENT = :"1.9.2"
-UP = :"2.0.1"
-
-context "Ruby::Version" do
-    asserts("#<") do
-        Ruby::Version < UP and not Ruby::Version < DOWN and not Ruby::Version < CURRENT
-    end
-    asserts("#<=") do
-        Ruby::Version <= UP and not Ruby::Version <= DOWN and Ruby::Version <= CURRENT
-    end
-    asserts("#==") do
-        not Ruby::Version == UP and not Ruby::Version == DOWN and Ruby::Version == CURRENT
-    end
-    asserts("#>") do
-        not Ruby::Version > UP and Ruby::Version > DOWN and not Ruby::Version > CURRENT
-    end
-    asserts("#>=") do
-        not Ruby::Version >= UP and Ruby::Version >= DOWN and Ruby::Version >= CURRENT
-    end
-    asserts("#<=>") do
-        (Ruby::Version <=> UP) == -1 and (Ruby::Version <=> DOWN) == 1 and (Ruby::Version <=> CURRENT) == 0
-    end
-    asserts("#TOKENS") do
-        Ruby::Version::TOKENS == Ruby::Version::broke(RUBY_VERSION)
-    end
-    asserts("#VERSION") do
-        Ruby::Version::VERSION == RUBY_VERSION
-    end
-    asserts("#broke") do
-        Ruby::Version::broke("1.2.3") == [1, 2, 3]
-    end
-    asserts("#compare") do
-        Ruby::Version::compare(DOWN) == 1 and Ruby::Version::compare(CURRENT) == 0 and Ruby::Version::compare(UP) == -1
-    end
-end