versus 0.1.0 → 0.2.0

data/.index

@@ -2,13 +2,15 @@
 type: ruby
 revision: 2013
 sources:
-- Index.yml
+- var
 authors:
 - name: trans
   email: transfire@gmail.com
 - name: postmodern
   website: http://trans.github.com
-organizations: []
+organizations:
+- name: Rubyworks
+  website: http://rubyworks.github.com/
 requirements:
 - groups:
   - test
@@ -18,14 +20,18 @@ requirements:
   - test
   development: true
   name: ae
+- groups:
+  - test
+  development: true
+  name: spectroscope
 conflicts: []
 alternatives: []
 resources:
-- type: homepage
-  uri: http://dotruby.github.com
+- type: home
+  uri: http://rubyworks.github.com/versus
   label: Homepage
-- type: source
-  uri: http://github.com/dotruby/version
+- type: code
+  uri: http://github.com/rubyworks/versus
   label: Source Code
 repositories: []
 categories: []
@@ -36,10 +42,14 @@ copyrights:
 - holder: Rubyworks
   year: 2011
   license: BSD-2-Clause
-name: versus
-title: Versus
-version: 0.1.0
+created: '2006-12-10'
 summary: Best-of-breed Version Class Library
-description: The Versus gem provides a solid Version class along with supporting functionality,
-  such as version constratints and version dependency resolution.
-date: '2013-01-05'
+title: Versus
+version: 0.2.0
+name: versus
+description: ! 'The Versus gem provides a solid Version class along with supporting
+
+  functionality, such as version constratints and version dependency
+
+  resolution.'
+date: '2013-01-07'

data/HISTORY.md

@@ -1,5 +1,18 @@
 # RELEASE HISTORY
 
+## 0.2.0 / 2013-01-07
+
+This release fixes a bug in the Resolver that can lead to inifinite recursion
+if one entry requires another that in turn requires the former. Also, resolution
+failures are now tracked so that a nice list of the culprits can be had, helpful
+for trouble-shooting unsuccessful resolutions.
+
+Changes:
+
+* Prevent possible infinite recustion in Resolver#resolve.
+* Keep record of resolution failures.
+
+
 ## 0.1.0 / 2013-01-05
 
 While the code is beening sitting around on my hard drive for nearly

data/README.md

@@ -1,7 +1,7 @@
 [Homepage](http://rubyworks.github.com/versus) /
 [Report Issue](http://github.com/rubyworks/versus) /
 [Source Code](http://github.com/rubyworks/versus)
-( )
+( [![Build Status](https://travis-ci.org/rubyworks/versus.png)](https://travis-ci.org/rubyworks/versus) )
 
 
 # [Versus](http://rubyworks.github.com/versus)

data/lib/versus/number.rb

@@ -287,7 +287,11 @@ module Version
     # FIXME: Ensure it can handle trailing state.
     def =~(other)
       upver = other.bump(:last)
-      #@segments >= other and @segments < upver
+      if other.size > 1
+        upver = other.bump(-2)
+      else
+
+      end
       self >= other and self < upver
     end
 
@@ -333,7 +337,11 @@ module Version
     #   #=> "1.3.0.rc.1"
     #
     def bump(which=:patch)
-      case which.to_sym
+      which = which.to_sym unless Integer === which
+
+      case which
+      when Integer
+        bump_at(which)
       when :major, :first
         bump_major
       when :minor
@@ -349,6 +357,7 @@ module Version
       when :last
         bump_last
       else
+        # TODO: why is this not an error?
         self.class.new(@tuple.dup.compact)
       end
     end
@@ -368,6 +377,16 @@ module Version
       self.class[major, minor, inc(patch)]
     end
 
+    #
+    def bump_at(index)
+      i = index
+      if n = inc(@tuple[i])
+        v = @tuple[0...i] + [n] + (@tuple[i+1] ? [1] : [])
+      else
+        v = @tuple[0...i]
+      end
+    end
+
     #
     def bump_state
       if i = state_index

data/lib/versus/resolver.rb

@@ -6,7 +6,10 @@ module Version
   class Resolver
 
     #
+    # Initialize new Resolver.
     #
+    # @param [Array] available
+    #   List of name, version and requirements for each possible library.
     #
     def initialize(*available)
       @libraries = Hash.new{ |h,k| h[k] = {} }
@@ -21,9 +24,24 @@ module Version
     #
     attr :libraries
 
+    #
+    # List of library names and versions of failed resolutions
+    # subsequent to calling `#resolve`.
+    #
+    #attr :failures
+
     #
     # Add available library.
     #
+    # @param [String] name
+    #   The name of the library.
+    #
+    # @param [String,Version::Number] version
+    #   Version number of library.
+    #
+    # @param [Hash] requirements
+    #   Requirements for the library in the form of `{name=>version_constraint}`.
+    #
     def add(name, version, requirements={})
       name     = name.to_s
       number   = Number.parse(version)
@@ -68,6 +86,9 @@ module Version
       name   = name.to_s
       number = Number.parse(number)
 
+      @cache    = {}
+      @failures = []
+
       sheet = {}
 
       result = resolve_(name, number, sheet)
@@ -81,18 +102,47 @@ module Version
       result ? sheet : nil
     end
 
+    #
+    # Returns a mapping of unresolvable requirements. The key of the Hash is the 
+    # library that has the requirements and the value of the Hash is an Array
+    # of the requirements that could be not be found in the library list.
+    #
+    # @return [Hash] Unresolved requirements
+    #
+    def unresolved
+      list = Hash.new{ |h,k| h[k] = [] }
+      @failures.each do |name, number|
+        requirements(name, number).each do |rname, rnumber|
+          list[[name,number]] << [rname, rnumber] if possibilities(rname, rnumber.to_s).empty?
+        end
+      end
+      list
+    end
+
   private
 
     #
     #
     #
     def resolve_(name, number, sheet={})
+      # prevent infinite recursion
+      return sheet if @cache[[name,number]]
+      @cache[[name,number]] = true
+
       return false unless settle(name, number, sheet)
 
-      potents = requirements(name, number).map do |(n, c)|
+      requirements = requirements(name, number)
+
+      # there are no requirements to resolve
+      return sheet if requirements.empty?
+
+      # what possibilites exist for resolving all the requirements
+      potents = requirements.map do |(n, c)|
                   possibilities(n,c)
                 end
 
+      # TODO: I think this might be a mistake, if there are no possibilities then is it not
+      #       a failed resolution? Consider adding to failures and returning false instead.
       return sheet if potents.empty?
 
       vectors = product(*potents)
@@ -101,9 +151,21 @@ module Version
                   resolve_vector(vector, sheet)
                 end
 
+      unless success
+        @failures << [name, number] unless @failures.include?([name, number])
+      end
+
       return success
     end
 
+    #
+    #
+    #
+    def cached(name, number, sheet)
+      @cache[[name, number]] = true
+      sheet
+    end
+
     #
     #
     #
@@ -285,7 +347,7 @@ module Version
           else
             most = c
           end
-        when '=~'
+        when '=~', '~>'
           # TODO
         end
       end

data/spec/helper.rb

@@ -0,0 +1,5 @@
+require 'spectroscope'
+require 'ae'
+
+require 'versus'
+

data/spec/resolver/spec_contraints.rb

@@ -0,0 +1,63 @@
+require_relative '../helper'
+
+describe Version::Resolver do
+
+  it "resolves greater than constraints" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'> 0.8')
+    resolver.add('bar', '0.1.0')
+    resolver.add('bar', '0.8.0')
+    resolver.add('bar', '1.0.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == {'foo'=>Version['1.0.0'], 'bar'=>Version['1.0.0']}
+  end
+
+  it "resolves greater than or equal constraints" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'>= 0.8')
+    resolver.add('bar', '0.1.0')
+    resolver.add('bar', '0.8.0')
+    resolver.add('bar', '1.0.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == {'foo'=>Version['1.0.0'], 'bar'=>Version['1.0.0']}
+
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'>= 0.8')
+    resolver.add('bar', '0.1.0')
+    resolver.add('bar', '0.8.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == {'foo'=>Version['1.0.0'], 'bar'=>Version['0.8.0']}
+  end
+
+  it "resolves lesser than constraints" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'< 1.0.0')
+    resolver.add('bar', '0.1.0')
+    resolver.add('bar', '0.8.0')
+    resolver.add('bar', '1.0.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == {'foo'=>Version['1.0.0'], 'bar'=>Version['0.8.0']}
+  end
+
+  it "resolves lesser than or equal constraints" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'<= 1.0.0')
+    resolver.add('bar', '0.1.0')
+    resolver.add('bar', '0.8.0')
+    resolver.add('bar', '1.0.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == {'foo'=>Version['1.0.0'], 'bar'=>Version['1.0.0']}
+  end
+
+  it "resolves semantically equal constraints" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'~> 1.0.0')
+    resolver.add('bar', '1.0.1')
+    resolver.add('bar', '1.1.0')
+    resolver.add('bar', '2.0.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == {'foo'=>Version['1.0.0'], 'bar'=>Version['1.1.0']}
+  end
+
+end
+

data/spec/resolver/spec_scenarios.rb

@@ -0,0 +1,49 @@
+require_relative '../helper'
+
+describe Version::Resolver do
+
+  it "resolves complex requirements - example 1" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'> 1.0.0', 'baz'=>'> 2.0.0')
+    resolver.add('bar', '1.0.0', 'baz'=>'= 3.1.0')
+    resolver.add('bar', '2.0.0', 'baz'=>'= 3.1.0')
+    resolver.add('baz', '2.9.0')
+    resolver.add('baz', '3.1.0')
+    resolver.add('baz', '3.2.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == { 'foo'=>Version['1.0.0'], 'bar'=>Version['2.0.0'], 'baz'=>Version['3.1.0'] }
+  end
+
+  it "resolves complex requirements - example 2" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'> 1.0', 'baz'=>'> 2.0')
+    resolver.add('bar', '1.0.0', 'baz'=>'= 3.1')
+    resolver.add('bar', '2.0.0', 'baz'=>'= 3.1')
+    resolver.add('baz', '2.9.0')
+    resolver.add('baz', '3.1.0')
+    resolver.add('baz', '3.2.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == { 'foo'=>Version['1.0.0'], 'bar'=>Version['2.0.0'], 'baz'=>Version['3.1.0'] }
+  end
+
+  it "resolves complex requirements - example 3" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'> 1.0.0', 'baz'=>'> 2.0.0')
+    resolver.add('bar', '1.0.0', 'baz'=>'= 3.1.0')
+    resolver.add('bar', '2.0.0', 'baz'=>'> 3.1.0')
+    resolver.add('baz', '3.1.0')
+    resolver.add('baz', '3.2.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == { 'foo'=>Version['1.0.0'], 'bar'=>Version['2.0.0'], 'baz'=>Version['3.2.0'] }
+  end
+
+  it "does not infinitely recurse" do
+    resolver = Version::Resolver.new
+    resolver.add('foo', '1.0.0', 'bar'=>'>= 1.0.0')
+    resolver.add('bar', '1.0.0', 'foo'=>'>= 1.0.0')
+    result = resolver.resolve('foo', '1.0.0')
+    result.assert == {'foo'=>Version['1.0.0'], 'bar'=>Version['1.0.0']}
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qed
@@ -44,8 +44,27 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: The Versus gem provides a solid Version class along with supporting functionality,
-  such as version constratints and version dependency resolution.
+- !ruby/object:Gem::Dependency
+  name: spectroscope
+  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'
+description: ! 'The Versus gem provides a solid Version class along with supporting
+
+  functionality, such as version constratints and version dependency
+
+  resolution.'
 email:
 - transfire@gmail.com
 executables: []
@@ -92,11 +111,13 @@ files:
 - lib/versus/resolver.rb
 - lib/versus/core_ext.rb
 - lib/versus/number.rb
+- spec/helper.rb
+- spec/resolver/spec_scenarios.rb
+- spec/resolver/spec_contraints.rb
 - LICENSE.txt
-- Index.yml
 - HISTORY.md
 - README.md
-homepage: http://dotruby.github.com
+homepage: http://rubyworks.github.com/versus
 licenses:
 - BSD-2-Clause
 post_install_message: 
@@ -121,4 +142,7 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Best-of-breed Version Class Library
-test_files: []
+test_files:
+- spec/helper.rb
+- spec/resolver/spec_scenarios.rb
+- spec/resolver/spec_contraints.rb

data/Index.yml

@@ -1,37 +0,0 @@
----
-name:
-  versus
-
-version:
-  0.1.0
-
-title:
-  Versus
-
-summary: 
-  Best-of-breed Version Class Library
-
-description:
-  The Versus gem provides a solid Version class along with supporting
-  functionality, such as version constratints and version dependency
-  resolution.
-
-requirements:
-  - qed (test)
-  - ae  (test)
-
-authors:
-  - name: trans
-    email: transfire@gmail.com
-  - name: postmodern
-    website: 'http://trans.github.com'
-
-resources:
-  homepage: http://dotruby.github.com
-  source: http://github.com/dotruby/version
-
-copyrights: 
-  - year: 2011
-    holder: Rubyworks
-    license: BSD-2-Clause
-