versionomy 0.1.3 → 0.2.0

data/tests/tc_standard_comparison.rb

@@ -36,20 +36,20 @@
 
 
 require 'test/unit'
-require File.expand_path("#{File.dirname(__FILE__)}/../lib/versionomy.rb")
+require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/versionomy.rb")
 
 
 module Versionomy
   module Tests  # :nodoc:
     
-    class TestStandardComparison < Test::Unit::TestCase  # :nodoc:
+    class TestStandardComparison < ::Test::Unit::TestCase  # :nodoc:
       
       
       # Test comparisons with difference in major.
       
       def test_comparison_major
-        value1_ = Versionomy.create(:major => 2, :tiny => 1, :tiny2 => 3, :release_type => :release_candidate, :release_candidate_version => 2)
-        value2_ = Versionomy.create(:major => 3, :release_type => :alpha)
+        value1_ = ::Versionomy.create(:major => 2, :tiny => 1, :tiny2 => 3, :release_type => :release_candidate, :release_candidate_version => 2)
+        value2_ = ::Versionomy.create(:major => 3, :release_type => :alpha)
         assert(value2_ > value1_)
       end
       
@@ -57,8 +57,8 @@ module Versionomy
       # Test comparisons with difference in minor.
       
       def test_comparison_minor
-        value1_ = Versionomy.create(:major => 2, :tiny => 1, :tiny2 => 3, :release_type => :release_candidate, :release_candidate_version => 2)
-        value2_ = Versionomy.create(:major => 2, :minor => 1, :release_type => :alpha)
+        value1_ = ::Versionomy.create(:major => 2, :tiny => 1, :tiny2 => 3, :release_type => :release_candidate, :release_candidate_version => 2)
+        value2_ = ::Versionomy.create(:major => 2, :minor => 1, :release_type => :alpha)
         assert(value2_ > value1_)
       end
       
@@ -66,8 +66,8 @@ module Versionomy
       # Test comparisons with difference in release type.
       
       def test_comparison_release_type
-        value1_ = Versionomy.create(:major => 2, :release_type => :alpha, :alpha_version => 5)
-        value2_ = Versionomy.create(:major => 2, :release_type => :release_candidate, :release_candidate_version => 2)
+        value1_ = ::Versionomy.create(:major => 2, :release_type => :alpha, :alpha_version => 5)
+        value2_ = ::Versionomy.create(:major => 2, :release_type => :release_candidate, :release_candidate_version => 2)
         assert(value2_ > value1_)
       end
       
@@ -75,8 +75,8 @@ module Versionomy
       # Test equality for a simple case.
       
       def test_equality_simple
-        value1_ = Versionomy.create(:major => 2, :minor => 0, :release_type => :alpha, :alpha_version => 5)
-        value2_ = Versionomy.create(:major => 2, :release_type => :alpha, :alpha_version => 5)
+        value1_ = ::Versionomy.create(:major => 2, :minor => 0, :release_type => :alpha, :alpha_version => 5)
+        value2_ = ::Versionomy.create(:major => 2, :release_type => :alpha, :alpha_version => 5)
         assert_equal(value2_, value1_)
         assert_equal(value2_.hash, value1_.hash)
       end
@@ -85,8 +85,8 @@ module Versionomy
       # Test equality from parsed values.
       
       def test_equality_parsed
-        value1_ = Versionomy.parse("1.8.7p72")
-        value2_ = Versionomy.parse("1.8.7.0-72.0")
+        value1_ = ::Versionomy.parse("1.8.7p72")
+        value2_ = ::Versionomy.parse("1.8.7.0-72.0")
         assert_equal(value2_, value1_)
         assert_equal(value2_.hash, value1_.hash)
       end
@@ -95,8 +95,8 @@ module Versionomy
       # Test non-equality from parsed values.
       
       def test_nonequality_parsed
-        value1_ = Versionomy.parse("1.8.7b7")
-        value2_ = Versionomy.parse("1.8.7a7")
+        value1_ = ::Versionomy.parse("1.8.7b7")
+        value2_ = ::Versionomy.parse("1.8.7a7")
         assert_not_equal(value2_, value1_)
         assert_not_equal(value2_.hash, value1_.hash)
       end
@@ -105,7 +105,7 @@ module Versionomy
       # Test equality with string.
       
       def test_equality_string
-        value1_ = Versionomy.parse("1.8.7p72")
+        value1_ = ::Versionomy.parse("1.8.7p72")
         assert_operator(value1_, :==, "1.8.7p72")
         assert_operator(value1_, :==, "1.8.7.0-72.0")
       end
@@ -114,7 +114,7 @@ module Versionomy
       # Test comparison with string.
       
       def test_comparison_string
-        value1_ = Versionomy.parse("1.8.7p72")
+        value1_ = ::Versionomy.parse("1.8.7p72")
         assert_operator(value1_, :<, "1.8.7p73")
         assert_operator(value1_, :<, "1.8.8pre1")
         assert_operator(value1_, :>, "1.8.7p71")
@@ -123,6 +123,19 @@ module Versionomy
       end
       
       
+      # Test sorting.
+      
+      def test_sort
+        value1_ = ::Versionomy.parse("1.8.7p73")
+        value2_ = ::Versionomy.parse("1.8.7p72")
+        value3_ = ::Versionomy.parse("1.8.8pre1")
+        value4_ = ::Versionomy.parse("1.8.7.0")
+        value5_ = ::Versionomy.parse("1.8.7rc2")
+        assert_equal([value5_, value4_, value2_, value1_, value3_],
+                     [value1_, value2_, value3_, value4_, value5_].sort)
+      end
+      
+      
     end
     
   end

data/tests/tc_standard_misc.rb

@@ -0,0 +1,95 @@
+# -----------------------------------------------------------------------------
+# 
+# Versionomy basic tests on standard schema
+# 
+# This file contains tests for the basic use cases on the standard schema
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2008-2009 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+
+
+require 'test/unit'
+require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/versionomy.rb")
+
+
+module Versionomy
+  module Tests  # :nodoc:
+    
+    class TestStandardMisc < ::Test::Unit::TestCase  # :nodoc:
+      
+      
+      # Test "prerelase?" custom method
+      
+      def test_method_prereleasep
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1, :release_type => :beta, :beta_version => 3)
+        assert_equal(true, value_.prerelease?)
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1, :release_type => :final, :patchlevel => 1)
+        assert_equal(false, value_.prerelease?)
+        value_ = ::Versionomy.create(:major => 2, :tiny => 1)
+        assert_equal(false, value_.prerelease?)
+      end
+      
+      
+      # Test "relase" custom method
+      
+      def test_method_release
+        value_ = ::Versionomy.create(:major => 1, :minor => 9, :tiny => 2, :release_type => :alpha, :alpha_version => 4)
+        value2_ = value_.release
+        assert_equal([1, 9, 2, 0, :final, 0, 0], value2_.values_array)
+        value_ = ::Versionomy.create(:major => 1, :minor => 9, :tiny => 2)
+        value2_ = value_.release
+        assert_equal(value_, value2_)
+      end
+      
+      
+      # Test marshalling
+      
+      def test_marshal
+        value_ = ::Versionomy.create(:major => 1, :minor => 9, :tiny => 2, :release_type => :alpha, :alpha_version => 4)
+        str_ = ::Marshal.dump(value_)
+        value2_ = ::Marshal.load(str_)
+        assert_equal(value_, value2_)
+      end
+      
+      
+      # Test YAML
+      
+      def test_yaml
+        value_ = ::Versionomy.create(:major => 1, :minor => 9, :tiny => 2, :release_type => :alpha, :alpha_version => 4)
+        str_ = ::YAML.dump(value_)
+        value2_ = ::YAML.load(str_)
+        assert_equal(value_, value2_)
+      end
+      
+      
+    end
+    
+  end
+end

data/tests/tc_standard_parse.rb

@@ -36,19 +36,19 @@
 
 
 require 'test/unit'
-require File.expand_path("#{File.dirname(__FILE__)}/../lib/versionomy.rb")
+require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/versionomy.rb")
 
 
 module Versionomy
   module Tests  # :nodoc:
     
-    class TestStandardParse < Test::Unit::TestCase  # :nodoc:
+    class TestStandardParse < ::Test::Unit::TestCase  # :nodoc:
       
       
       # Test parsing full.
       
       def test_parsing_full_release
-        value_ = Versionomy.parse('2.0.1.1-4.6')
+        value_ = ::Versionomy.parse('2.0.1.1-4.6')
         assert_equal(2, value_.major)
         assert_equal(0, value_.minor)
         assert_equal(1, value_.tiny)
@@ -63,7 +63,7 @@ module Versionomy
       # Test parsing abbreviated.
       
       def test_parsing_abbrev_release
-        value_ = Versionomy.parse('2.0.1')
+        value_ = ::Versionomy.parse('2.0.1')
         assert_equal(2, value_.major)
         assert_equal(0, value_.minor)
         assert_equal(1, value_.tiny)
@@ -80,7 +80,7 @@ module Versionomy
       # Test parsing with trailing zeros.
       
       def test_parsing_trailing_zeros
-        value_ = Versionomy.parse('2.0.0')
+        value_ = ::Versionomy.parse('2.0.0')
         assert_equal(2, value_.major)
         assert_equal(0, value_.minor)
         assert_equal(0, value_.tiny)
@@ -95,7 +95,7 @@ module Versionomy
       # Test parsing preview.
       
       def test_parsing_preview
-        value_ = Versionomy.parse('2.0.1pre4')
+        value_ = ::Versionomy.parse('2.0.1pre4')
         assert_equal(2, value_.major)
         assert_equal(0, value_.minor)
         assert_equal(1, value_.tiny)
@@ -111,7 +111,7 @@ module Versionomy
       # Test parsing alpha.
       
       def test_parsing_alpha
-        value_ = Versionomy.parse('2.0.1a4.1')
+        value_ = ::Versionomy.parse('2.0.1a4.1')
         assert_equal(2, value_.major)
         assert_equal(0, value_.minor)
         assert_equal(1, value_.tiny)
@@ -127,7 +127,7 @@ module Versionomy
       # Test parsing beta.
       
       def test_parsing_beta
-        value_ = Versionomy.parse('2.52.1b4.0')
+        value_ = ::Versionomy.parse('2.52.1b4.0')
         assert_equal(2, value_.major)
         assert_equal(52, value_.minor)
         assert_equal(1, value_.tiny)
@@ -143,20 +143,20 @@ module Versionomy
       # Test parsing beta alternates
       
       def test_parsing_beta_alternates
-        assert_equal(Versionomy.parse('2.52.1 beta4'), '2.52.1b4')
-        assert_equal(Versionomy.parse('2.52.1-b4'), '2.52.1b4')
-        assert_equal(Versionomy.parse('2.52.1.b4'), '2.52.1b4')
-        assert_equal(Versionomy.parse('2.52.1B4'), '2.52.1b4')
-        assert_equal(Versionomy.parse('2.52.1BETA4'), '2.52.1b4')
-        assert_equal(Versionomy.parse('2.52.1 Beta4'), '2.52.1b4')
-        assert_equal(Versionomy.parse('2.52.1 eta4'), '2.52.1')
+        assert_equal(::Versionomy.parse('2.52.1 beta4'), '2.52.1b4')
+        assert_equal(::Versionomy.parse('2.52.1-b4'), '2.52.1b4')
+        assert_equal(::Versionomy.parse('2.52.1.b4'), '2.52.1b4')
+        assert_equal(::Versionomy.parse('2.52.1B4'), '2.52.1b4')
+        assert_equal(::Versionomy.parse('2.52.1BETA4'), '2.52.1b4')
+        assert_equal(::Versionomy.parse('2.52.1 Beta4'), '2.52.1b4')
+        assert_equal(::Versionomy.parse('2.52.1 eta4', :extra_characters => :ignore), '2.52.1')
       end
       
       
       # Test parsing release candidate.
       
       def test_parsing_release_candidate
-        value_ = Versionomy.parse('0.2rc0')
+        value_ = ::Versionomy.parse('0.2rc0')
         assert_equal(0, value_.major)
         assert_equal(2, value_.minor)
         assert_equal(0, value_.tiny)
@@ -173,7 +173,7 @@ module Versionomy
       # Test unparsing a value that requires lookback.
       
       def test_unparsing_with_lookback
-        value_ = Versionomy.parse('2.0')
+        value_ = ::Versionomy.parse('2.0')
         value2_ = value_.change(:tiny2 => 1)
         assert_equal(1, value2_.tiny2)
         assert_equal('2.0.0.1', value2_.unparse)
@@ -186,7 +186,7 @@ module Versionomy
       # Test delimiter changes in a multi-form field.
       
       def test_multi_form_delimiter_changes
-        value_ = Versionomy.parse('2.0 preview 1')
+        value_ = ::Versionomy.parse('2.0 preview 1')
         assert_equal('2.0 preview 1', value_.to_s)
         value2_ = value_.change(:release_type => :final)
         assert_equal('2.0', value2_.to_s)
@@ -199,11 +199,31 @@ module Versionomy
       
       def test_patchlevel_separators
         expected_ = [1,9,1,0,:final,243,0]
-        assert_equal(expected_, Versionomy.parse('1.9.1-p243').values_array)
-        assert_equal(expected_, Versionomy.parse('1.9.1p243').values_array)
-        assert_equal(expected_, Versionomy.parse('1.9.1.p243').values_array)
-        assert_equal(expected_, Versionomy.parse('1.9.1 p243').values_array)
-        assert_equal(expected_, Versionomy.parse('1.9.1-243').values_array)
+        assert_equal(expected_, ::Versionomy.parse('1.9.1-p243').values_array)
+        assert_equal(expected_, ::Versionomy.parse('1.9.1p243').values_array)
+        assert_equal(expected_, ::Versionomy.parse('1.9.1.p243').values_array)
+        assert_equal(expected_, ::Versionomy.parse('1.9.1 p243').values_array)
+        assert_equal(expected_, ::Versionomy.parse('1.9.1-243').values_array)
+      end
+      
+      
+      # Test setting delimiters on unparse, including testing for illegal delimiters
+      
+      def test_unparse_with_custom_delimiters
+        value_ = ::Versionomy.parse('1.2b3')
+        assert_equal('1.2.b.3', value_.unparse(:release_type_delim => '.', :release_type_postdelim => '.'))
+        assert_equal('1.2b3', value_.unparse(:release_type_delim => '=', :release_type_postdelim => '*'))
+        value_ = ::Versionomy.parse('1.2-4')
+        assert_equal('1.2-4', value_.unparse(:release_type_delim => '.', :release_type_postdelim => '.'))
+      end
+      
+      
+      # Test parse errors
+      
+      def test_parsing_errors
+        assert_raise(::Versionomy::Errors::ParseError) do
+          ::Versionomy.parse('2.52.1 eta4')
+        end
       end
       
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: versionomy
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -07:00
+date: 2009-11-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.2
+        version: 0.3.0
     version: 
 description: Versionomy is a generalized version number library. It provides tools to represent, manipulate, parse, and compare version numbers in the wide variety of versioning schemes in use.
 email: dazuma@gmail.com
@@ -32,12 +32,16 @@ extra_rdoc_files:
 - README.rdoc
 - History.rdoc
 files: 
+- lib/versionomy/conversion/base.rb
+- lib/versionomy/conversion/parsing.rb
+- lib/versionomy/conversion/rubygems.rb
+- lib/versionomy/conversion.rb
 - lib/versionomy/errors.rb
 - lib/versionomy/format/base.rb
 - lib/versionomy/format/delimiter.rb
+- lib/versionomy/format/rubygems.rb
+- lib/versionomy/format/standard.rb
 - lib/versionomy/format.rb
-- lib/versionomy/formats/standard.rb
-- lib/versionomy/formats.rb
 - lib/versionomy/interface.rb
 - lib/versionomy/schema/field.rb
 - lib/versionomy/schema/wrapper.rb
@@ -47,10 +51,13 @@ files:
 - lib/versionomy.rb
 - tests/tc_custom_format.rb
 - tests/tc_readme_examples.rb
+- tests/tc_rubygems_basic.rb
+- tests/tc_rubygems_conversions.rb
 - tests/tc_standard_basic.rb
 - tests/tc_standard_bump.rb
 - tests/tc_standard_change.rb
 - tests/tc_standard_comparison.rb
+- tests/tc_standard_misc.rb
 - tests/tc_standard_parse.rb
 - History.rdoc
 - README.rdoc
@@ -86,8 +93,11 @@ summary: Versionomy is a generalized version number library.
 test_files: 
 - tests/tc_custom_format.rb
 - tests/tc_readme_examples.rb
+- tests/tc_rubygems_basic.rb
+- tests/tc_rubygems_conversions.rb
 - tests/tc_standard_basic.rb
 - tests/tc_standard_bump.rb
 - tests/tc_standard_change.rb
 - tests/tc_standard_comparison.rb
+- tests/tc_standard_misc.rb
 - tests/tc_standard_parse.rb