version 0.10.0 → 1.0.0a

data/README.rdoc

@@ -1,8 +1,7 @@
 = Version
 
 * http://github.com/stouset/version
-* http://rdoc.info/projects/stouset/version
-* http://getcaliper.com/caliper/project?repo=git%3A%2F%2Fgithub.com%2Fstouset%2Fversion.git
+* http://rdoc.info/gems/version/
 * http://atlruby.org/stouset/posts/138-version-task
 
 == Description
@@ -38,11 +37,11 @@ You're all set up.
   $ rake version:bump                 # => 0.1.1
   $ rake version:bump:minor           # => 0.2.0
   $ rake version:bump:revision        # => 0.2.1
-  $ rake version:bump:pre             # => 0.2.1a
+  $ rake version:bump:pre             # => 0.2.2a
   $ rake version:bump                 # => 0.2.2
   $ rake version:bump:major           # => 1.0.0
-  $ rake version:bump:minor           # => 1.0.1
-  $ cat VERSION                       # => 1.0.1
+  $ rake version:bump:minor           # => 1.1.0
+  $ cat VERSION                       # => 1.1.0
 
 The VersionTask can automatically manage git tagging for
 you, too.
@@ -93,12 +92,12 @@ library. It's simple to use, but I'll be surprised if there's much point
 beyond doing the legwork for the Rake task and class versioning.
 
   v = "1.2.0".to_version
-  v.to_s                # => 1.2.0
-  v.bump!               # => 1.2.1
-  v.bump!(:major)       # => 1.3.0
-  v.bump!(:minor, true) # => 1.3
-  v.major = 2           # => 2.0
-  v.to_a                # => ['2', '0']
+  v.to_s                       # => 1.2.0
+  v.bump!                      # => 1.2.1
+  v.bump!(:major)              # => 2.0.0
+  v.bump!(:minor, false, true) # => 2.1
+  v.major = 3                  # => 3.0
+  v.to_a                       # => ['3', '0']
   
 == Install
 

data/Rakefile

@@ -9,7 +9,7 @@ require 'spec/rake/spectask'
 
 spec = Gem::Specification.new do |s|
   s.name    = 'version'
-  s.version = Version.current
+  s.version = Version.current or '0.0.0'
   s.summary = 'simple version-number encapsulation'
   
   s.author  = 'Stephen Touset'

data/VERSION

@@ -1 +1 @@
-0.10.0
+1.0.0a

data/lib/rake/version_task.rb

@@ -59,7 +59,7 @@ class Rake::VersionTask < Rake::TaskLib
     
     file filename
     
-    desc 'Print the current version number'
+    desc "Print the current version number (#{read})"
     task(:version => filename) { puts read }
     
     namespace :version do
@@ -69,21 +69,32 @@ class Rake::VersionTask < Rake::TaskLib
         puts write(version)
       end
       
-      desc 'Bump the least-significant version number'
+      desc "Bump to #{read.bump!}"
       task(:bump => filename) { puts write(read.bump!) }
       
       namespace :bump do
-        desc 'Bump the major version number'
+        desc "Bump to #{read.bump!(:major)}"
         task(:major => filename) { puts write(read.bump!(:major)) }
         
-        desc 'Bump the minor version number'
+        desc "Bump to #{read.bump!(:minor)}"
         task(:minor => filename) { puts write(read.bump!(:minor)) }
         
-        desc 'Bump the revision number'
+        desc "Bump to #{read.bump!(:revision)}"
         task(:revision => filename) { puts write(read.bump!(:revision)) }
         
-        desc 'Bump to a prerelease version'
+        desc "Bump to #{read.bump!(:pre)}"
         task(:pre => filename) { puts write(read.bump!(:pre)) }
+        
+        namespace :pre do
+          desc "Bump to #{read.bump!(:major, true)}"
+          task(:major => filename) { puts write(read.bump!(:major, true)) }
+          
+          desc "Bump to #{read.bump!(:minor, true)}"
+          task(:minor => filename) { puts write(read.bump!(:minor, true)) }
+          
+          desc "Bump to #{read.bump!(:revision, true)}"
+          task(:revision => filename) { puts write(read.bump!(:revision, true)) }
+        end
       end
     end
   end
@@ -94,7 +105,7 @@ class Rake::VersionTask < Rake::TaskLib
   # Returns the Version contained in the file at +filename+.
   #
   def read
-    contents = path.read
+    contents = path.read rescue '0.0.0'
     
     case filetype.to_s
       when ''    then contents.chomp.to_version
@@ -106,6 +117,8 @@ class Rake::VersionTask < Rake::TaskLib
   # Writes out +version+ to the file at +filename+ with the correct format.
   #
   def write(version)
+    return if version == read
+    
     path.open('w') do |io|
       io << case filetype.to_s
         when ''    then version.to_s + "\n"

data/lib/version.rb

@@ -63,15 +63,8 @@ class Version
   #++
   #
   [ :major, :minor, :revision ].to_enum.each.with_index do |component, i|
-    define_method(:"#{component}")  {    self[i]     }
-    define_method(:"#{component}=") {|v| self[i] = v }
-  end
-  
-  #
-  # Retrieves the component of the Version at +index+.
-  #
-  def [](index)
-    self.components[index] ? self.components[index].to_s : nil
+    define_method(:"#{component}")  { self.components[i] ? self.components[i].to_s : nil }
+    define_method(:"#{component}=") {|v| self[i] = v  }
   end
   
   #
@@ -112,28 +105,38 @@ class Version
   end
   
   #
-  # Bumps the version number. Pass +index+ to bump a component other than the
-  # least-significant part. Set +trim+ to true if you want the version to be
-  # resized to only large enough to contain the index.
+  # Bumps the version number. Pass +component+ to bump a component other than
+  # the least-significant part. Set +pre+ to true if you want to bump the
+  # component to a prerelease version. Set +trim+ to true if you want the
+  # version to be resized to only large enough to contain the component set.
   #
-  #    "1.0.4a".bump!               # => '1.0.5'
-  #    "1.0.4a".bump!(:pre)         # => '1.0.5b'
-  #    "1.0.4a".bump!(:minor, true) # => '1.2'
+  #    "1.0.4a".bump!                       # => '1.0.4'
+  #    "1.0.4a".bump!(:pre)                 # => '1.0.4b'
+  #    "1.0.4a".bump!(:minor, false, true)  # => '1.1'
+  #    "1.0.4a".bump!(:minor, true, true)   # => '1.1a
+  #    "1.0.4a".bump!(:minor, true, false)  # => '1.1.0a'
   #
-  def bump!(index = self.length - 1, trim = false)
-    case index
-      when :major    then self.bump!(0, trim)
-      when :minor    then self.bump!(1, trim)
-      when :revision then self.bump!(2, trim)
-      when :pre      then self[-1] = self.components[-1].next(true)
+  def bump!(component = -1, pre = false, trim = false)
+    case component
+      when :major    then self.bump!(0,  pre,  trim)
+      when :minor    then self.bump!(1,  pre,  trim)
+      when :revision then self.bump!(2,  pre,  trim)
+      when :pre      then self.bump!(-1, true, trim)
       else
-        self.resize!(index + 1) if (trim or index >= self.length)
-        self[index] = (self.components[index] || Component.new('0')).next
+        # resize to match the new length, if applicable
+        self.resize!(component + 1) if (trim or component >= self.length)
+        
+        # mark all but the changed bit as non-prerelease
+        self[0...component].each(&:unprerelease!)
+        
+        # I don't even understand this part any more; god help you
+        self[component] = self[component].next if     pre and self.prerelease? and component == self.length -  1
+        self[component] = self[component].next unless pre and self.prerelease? and component == -1
+        self[-1]        = self[-1].next(true)  if pre
+        self
     end
-    
-    self
   end
-  
+    
   #
   # Returns the current length of the version number.
   #
@@ -197,6 +200,13 @@ class Version
   
   protected
   
+  #
+  # Retrieves the component of the Version at +index+.
+  #
+  def [](index)
+    self.components[index] || Component.new('0')
+  end
+  
   def components
     @components ||= []
   end

data/lib/version/component.rb

@@ -24,6 +24,10 @@ class Version::Component
     not self.letter.empty?
   end
   
+  def unprerelease!
+    self.next! if self.prerelease?
+  end
+  
   def next(pre = false)
     self.dup.next!(pre)
   end
@@ -31,7 +35,7 @@ class Version::Component
   def next!(pre = false)
     case
       when (    pre and     self.prerelease?) then self.letter.next!
-      when (    pre and not self.prerelease?) then self.letter = 'a'; self.digits = self.digits.next
+      when (    pre and not self.prerelease?) then self.letter = 'a'
       when (not pre and     self.prerelease?) then self.letter = ''
       when (not pre and not self.prerelease?) then self.digits = self.digits.next
     end

data/spec/version_spec.rb

@@ -20,6 +20,10 @@ describe Version do
   its(:revision)    { should be_nil   }
   its(:prerelease?) { should be_false }
   
+  it 'should bump to 2.10' do
+    subject.bump!.should == v2_10
+  end
+  
   it 'should major-bump to 3.0' do
     subject.bump!(:major).should == v3_0
   end
@@ -35,9 +39,65 @@ describe Version do
   it 'should prerelease-bump to 2.10a' do
     subject.bump!(:pre).should == v2_10a
   end
+  
+  it 'should prerelease-bump major to 3_0a' do
+    subject.bump!(:major, true).should == v3_0a
+  end
+  
+  it 'should prerelease-bump minor to 2.10a' do
+    subject.bump!(:minor, true).should == v2_10a
+  end
+  
+  it 'should prerelease-bump revision to 2.9.1a' do
+    subject.bump!(:revision, true).should == v2_9_1a
+  end
+end
+
+describe Version do
+  include ImplicitVersion
+  
+  subject { v0_10_0 }
+  
+  its(:major)       { should == '0'   }
+  its(:minor)       { should == '10'   }
+  its(:revision)    { should == '0'   }
+  its(:prerelease?) { should be_false }
+  
+  it 'should bump to 0.10.1' do
+    subject.bump!.should == v0_10_1
+  end
+  
+  it 'should major-bump to 1.0.0' do
+    subject.bump!(:major).should == v1_0_0
+  end
+  
+  it 'should minor-bump to 0.11.0' do
+    subject.bump!(:minor).should == v0_11_0
+  end
+  
+  it 'should revision-bump to 0.10.1' do
+    subject.bump!(:revision).should == v0_10_1
+  end
+  
+  it 'should prerelease-bump to 0.10.1a' do
+    subject.bump!(:pre).should == v0_10_1a
+  end
+  
+  it 'should prerelease-bump major to 1.0.0a' do
+    subject.bump!(:major, true).should == v1_0_0a
+  end
+  
+  it 'should prerelease-bump minor to 0.11.0a' do
+    subject.bump!(:minor, true).should == v0_11_0a
+  end
+  
+  it 'should prerelease-bump revision to 0.10.1a' do
+    subject.bump!(:revision, true).should == v0_10_1a
+  end
 end
 
-describe Version, 'with a prerelease version' do
+
+describe Version, 'with a prerelease revision' do
   include ImplicitVersion
   
   subject { v1_6_3a }
@@ -47,15 +107,8 @@ describe Version, 'with a prerelease version' do
   its(:revision)    { should == '3a' }
   its(:prerelease?) { should be_true }
   
-  it 'should allow indexed access to components' do
-    subject[0].should == '1'
-    subject[1].should == '6'
-    subject[2].should == '3a'
-  end
-  
-  it 'should return nil for unset components' do
-    subject[3].should == nil
-    subject[4].should == nil
+  it 'should bump to 1.6.3' do
+    subject.bump!.should == v1_6_3
   end
   
   it 'should major-bump to 2.0.0' do
@@ -73,6 +126,61 @@ describe Version, 'with a prerelease version' do
   it 'should prerelease-bump to 1.6.3b' do
     subject.bump!(:pre).should == v1_6_3b
   end
+  
+  it 'should prerelease-bump major to 2.0.0a' do
+    subject.bump!(:major, true).should == v2_0_0a
+  end
+  
+  it 'should prerelease-bump minor to 1.7.0a' do
+    subject.bump!(:minor, true).should == v1_7_0a
+  end
+  
+  it 'should prerelease-bump revision to 1.6.4a' do
+    subject.bump!(:revision, true).should == v1_6_4a
+  end
+end
+
+describe Version, 'with a prerelease minor version' do
+  include ImplicitVersion
+  
+  subject { v1_6a }
+  
+  its(:major)       { should == '1'  }
+  its(:minor)       { should == '6a'  }
+  its(:revision)    { should == nil }
+  its(:prerelease?) { should be_true }
+  
+  it 'should bump to 1.6' do
+    subject.bump!.should == v1_6
+  end
+  
+  it 'should major-bump to 2.0' do
+    subject.bump!(:major).should == v2_0
+  end
+  
+  it 'should minor-bump to 1.6' do
+    subject.bump!(:minor).should == v1_6
+  end
+  
+  it 'should revision-bump to 1.6.1' do
+    subject.bump!(:revision).should == v1_6_1
+  end
+  
+  it 'should bump to 1.6b' do
+    subject.bump!(:pre).should == v1_6b
+  end
+  
+  it 'should prerelease-bump major to 2.0a' do
+    subject.bump!(:major, true).should == v2_0a
+  end
+  
+  it 'should prerelease-bump minor to 1.7a' do
+    subject.bump!(:minor, true).should == v1_7a
+  end
+  
+  it 'should prerelease-bump revision to 1.6.1a' do
+    subject.bump!(:revision, true).should == v1_6_1a
+  end
 end
 
 describe Version do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: version
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.10.0
+  prerelease: 5
+  version: 1.0.0a
 platform: ruby
 authors: 
 - Stephen Touset
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,9 +70,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: