versionable 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/versionable/version_number.rb

@@ -8,15 +8,19 @@ module Versionable
     # If the to_s'd argument does not match VERSION_NUMBER_REGEX, an ArgumentError is raised.
     def initialize(v)
       v = v.to_s
-      raise ArgumentError.new "#{v.inspect} is not a dotted sequence of positive integers" unless v =~ VERSION_NUMBER_REGEX
+      unless v =~ VERSION_NUMBER_REGEX
+        raise ArgumentError.new "#{v.inspect} is not a dotted sequence of positive integers"
+      end
       super v
     end
 
     # Compare version numbers as lists of integers.
     #
-    # If one version number has more segments than the other, the shorter one is right-extended with zeros.
+    # If one version number has more segments than the other, the shorter one is right-extended
+    # with zeros.
     #
-    # For example, when comparing 0.2 to 0.10.1, the 0.2 is extended to 0.2.0.  The left two 0s are equal, so comparison shifts to 2 and 10: 0.10.1 is the greater version.
+    # For example, when comparing 0.2 to 0.10.1, the 0.2 is extended to 0.2.0.  The left two 0s
+    # are equal, so comparison shifts to 2 and 10: 0.10.1 is the greater version.
     def <=>(other)
       my_segments, their_segments = to_s.split('.'), other.to_s.split('.')
       size_difference = my_segments.size - their_segments.size
@@ -27,7 +31,10 @@ module Versionable
         my_segments.concat(['0'] * -size_difference)
       end
 
-      partwise = my_segments.zip(their_segments).collect { |mine, theirs| mine.to_i <=> theirs.to_i }
+      partwise = my_segments.zip(their_segments).collect do |mine, theirs|
+        mine.to_i <=> theirs.to_i
+      end
+
       partwise.detect { |cmp| cmp != 0 } || 0
     end
 
@@ -38,13 +45,6 @@ module Versionable
       (self <=> other) == 0
     end
 
-    # Bump to the next most-significant version number.
-    #
-    # VersionNumber.new("2.1").next.to_s # => "3"
-    def next
-      self.class.new(split('.', 2).first.to_i + 1)
-    end
-
     # Hash the version number string after stripping any trailing zeroes.
     #
     # This preserves the hash/equality contract: 2 == 2.0, so they both hash the same as well.

data/lib/versionable/versions.rb

@@ -2,25 +2,32 @@ module Versionable
   # A container for all versions of a given module.
   class Versions
     COMPARISON_REGEX = /^(<|<=|=|>=|>)\s+((?:0|[1-9]\d*)(?:\.(?:0|[1-9]\d*))*)$/
-    
+
     # Construct a Versions recording versions of the passed module.
     def initialize(versioned_module)
       @latest_version = versioned_module
     end
-    
+
     # Build and store a new version with the given number.
-    # 
-    # Versions must be built in increasing order: if version_number is not greater than the previous version, an ArgumentError is raised.
-    # The initial version number is always 0.
-    # 
+    #
+    # Versions must be built in increasing order: if version_number is not greater than the
+    # previous version, an ArgumentError is raised. The initial version number is always 0.
+    #
     # If a block parameter is passed, it is included in the created version.
-    # If this is the first time a block is passed, then record the _previous_ version as the default one.
-    # Once build is called with a block, subsequent versions must also pass a block or a VersioningError will be raised.
+    # If this is the first time a block is passed, then record the _previous_ version as the
+    # default one. Once build is called with a block, subsequent versions must also pass a block
+    # or a VersioningError will be raised.
     def build(version_number, &block)
       version_number = VersionNumber.new(version_number)
 
-      raise ArgumentError.new "Can't bump to #{version_number} from #{latest_version_number}" unless latest_version_number < version_number
-      raise VersioningError.new "Once called with a block, all subsequent versions must pass a block." if default_version and not block
+      unless latest_version_number < version_number
+        raise ArgumentError.new "Can't bump to #{version_number} from #{latest_version_number}"
+      end
+
+      if default_version and not block
+        raise VersioningError.new(
+        "Once version is called with a block, all subsequent calls must pass a block.")
+      end
 
       if block and default_version.nil?
         self.default_version = latest_version
@@ -30,32 +37,36 @@ module Versionable
       else
         versions[latest_version_number] = latest_version.dup
       end
-      
+
       self.latest_version_number = version_number
       latest_version.module_eval &block if block
     end
-    
+
     # Find the maximal version satisifying the given requirement.
-    # 
-    # The requirement may be a version string such as "1.0.7", or a comparator followed by a version such as "< 3.0".
-    # 
+    #
+    # The requirement may be a version string such as "1.0.7", or a comparator followed by a
+    # version such as "< 3.0".
+    #
     # Returns the matching module if found, nil otherwise.
     def find(version_requirement)
       if version_requirement =~ VersionNumber::VERSION_NUMBER_REGEX
-        versions[VersionNumber.new(version_requirement)]
-      elsif version_requirement =~ Versions::COMPARISON_REGEX
-        comparator, version_requirement = $1, VersionNumber.new($2)
-        comparator = '==' if comparator == '=' # stick that in your pipe and smoke it.
-        comparator = comparator.to_sym
-        
-        match = (versions.keys + [latest_version_number]).select { |v| v.send comparator, version_requirement }.max
-
-        versions[match]
-      else
-        nil
+        return versions[VersionNumber.new(version_requirement)]
       end
+
+      return nil unless version_requirement =~ Versions::COMPARISON_REGEX
+
+      # Break the comparator (relational operator) out from the version requrement
+      comparator, version_requirement = $1, VersionNumber.new($2)
+      comparator = '==' if comparator == '=' # stick that in your pipe and smoke it.
+      comparator = comparator.to_sym
+
+      match = (versions.keys + [latest_version_number]).select do |v|
+        v.send comparator, version_requirement
+      end.max
+
+      versions[match]
     end
-    
+
   private
 
     attr_accessor :latest_version       # :nodoc:

data/spec/versionable/version_number_spec.rb

@@ -28,12 +28,6 @@ describe Versionable::VersionNumber do
     end
   end
   
-  describe "#next" do
-    it "bumps most significant segment by 1 and drops remainder" do
-      v("1.0").next.should == v("2")
-    end
-  end
-
   describe "#hash" do
     it "is the string hash after stripping trailing zero segments" do
       v("1").hash.should == v("1.0.0.0.0").hash

data/versionable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{versionable}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Smith"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-04-26}
   s.description = %q{Versionable lets a ruby module or class declare multiple numbered versions of itself, and provides a way to select one based on a gem-like requirement.}
   s.email = %q{phil.h.smith@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Phil Smith
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -07:00
+date: 2010-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency