version 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 20965e2590585ffac10a15701214153bc52fba35
+  data.tar.gz: 3729b49f10a0de092ce3b33ca107948abf4dcc66
+SHA512:
+  metadata.gz: 3af3ec96f5c52901e642532d8c996f95aff45ec147b99f872e170d9d3de7e275f0f909ffbe2b56a05224521fac6185f07824c5a890bb73aed8b4f1d6e3e13b3c
+  data.tar.gz: aa7d294c38282ca487dd171e3e33e3519910d08a826b716df11843e4ef2c18c0f98c8f713bd59afa307c645ca108be04285dcf05f591c2bc7b391be994862ef5

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    version (1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec (~> 3)
+  rspec-its (~> 1)
+  version!
+
+BUNDLED WITH
+   1.14.6

data/Rakefile

@@ -3,9 +3,9 @@ $: << 'lib'
 require 'rake/version_task'
 
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rubygems/package_task'
+require 'rdoc/task'
+require 'rspec/core/rake_task'
 
 spec = Gem::Specification.new do |s|
   s.name    = 'version'
@@ -20,10 +20,11 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = Dir['*.rdoc']
   s.rdoc_options = %w{ --main README.rdoc }
   
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 1'
 end
 
-Rake::GemPackageTask.new(spec) do |gem|
+Gem::PackageTask.new(spec) do |gem|
   gem.need_tar = true
 end
 
@@ -35,8 +36,8 @@ Rake::RDocTask.new do |doc|
   doc.rdoc_files.include('lib/**/*.rb')
 end
 
-Spec::Rake::SpecTask.new(:spec) do |task|
-  task.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.pattern = 'spec/**/*_spec.rb'
 end
 
 Rake::VersionTask.new do |v|

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/rake/version_task.rb

@@ -12,18 +12,38 @@ class Rake::VersionTask < Rake::TaskLib
   
   # when true, tags version bumps automatically (default: false)
   attr_accessor :with_git_tag
+
+  # when true, commits version bumps automatically (default: autodetect)
+  attr_accessor :with_hg
+
+  # when true, tags version bumps automatically (default: false)
+  attr_accessor :with_hg_tag
+
+  # when true, commits version bumps automatically (default: autodetect)
+  attr_accessor :with_svn
+
+  # when true, tags version bumps automatically if the current svn URL
+  # either ends in '<base>/trunk' or '<base>/branches/<branch>' by
+  # copying the current svn URL to the '<base>/tags/<version>'
+  # (default: false)
+  attr_accessor :with_svn_tag
   
   # when set with a Gem::Specification, automatically emits an updated
   # gemspec on version bumps
   attr_accessor :with_gemspec
-  
+
+  # when set allows to override commit message
+  attr_accessor :with_commit_message
+
   #
   # Creates a new VersionTask with the given +filename+. Attempts to
-  # autodetect the +filetype+ and whether or not git is present.
+  # autodetect the +filetype+ and whether or not git or hg is present.
   #
   def initialize(filename = 'VERSION')
     self.filename = filename
     self.with_git = File.exist?('.git')
+    self.with_hg = File.exist?('.hg')
+    self.with_svn = File.exist?('.svn')
     
     yield(self) if block_given?
     
@@ -112,31 +132,64 @@ class Rake::VersionTask < Rake::TaskLib
       when 'yml' then YAML::load(contents).to_version
     end
   end
-  
+
+  def commit_message(version)
+    self.with_commit_message || "Version bump to #{version}"
+  end
   #
   # 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"
         when 'yml' then version.to_yaml
       end
     end
-    
+
     if self.with_gemspec
       with_gemspec.version = version
       gemspec.open('w') {|io| io << with_gemspec.to_ruby }
     end
-    
+
     if self.with_git
       `git add #{self.filename}`
       `git add #{self.gemspec}` if self.with_gemspec
-      `git commit -m "Version bump to #{version}"`
+      `git commit -m "#{commit_message(version)}"`
       `git tag #{version}` if self.with_git_tag
     end
+
+    if self.with_hg
+      `hg add #{self.filename}` unless `hg status -u #{self.filename}`.empty?
+      `hg add #{self.gemspec}` if (self.with_gemspec && !`hg status -u #{self.gemspec}`.empty?)
+      `hg commit #{self.filename} #{self.with_gemspec ? self.gemspec : ''} -m "#{commit_message(version)}"`
+      `hg tag #{version}` if self.with_hg_tag
+    end
+
+    if self.with_svn
+      `svn commit #{self.filename} #{self.with_gemspec ? self.gemspec : ''} -m "#{commit_message(version)}"`
+
+      # This only attempts to make 'standard' tags.  That is, if the
+      # current svn URL ends in 'trunk' or 'branches/<branch>', then
+      # it will be copied to 'tags/<version>'
+      if self.with_svn_tag
+        url = nil
+        `svn info`.each_line do |line|
+          if line =~ /^URL:\s+(.*)$/
+            url = $1
+            break
+          end
+        end
+
+        if url && url =~ /^(.*)\/(trunk|branches\/[\w]+)$/
+          base = $1
+          tag_url = "#{base}/tags/#{version}"
+          `svn copy #{url} #{tag_url} -m "Tag #{version}"`
+        end
+      end
+    end
     
     version
   end

data/lib/version.rb

@@ -10,9 +10,9 @@ require 'pathname'
 #
 class Version
   include Comparable
-  
+
   autoload :Component, 'version/component'
-  
+
   #
   # Searches through the parent directories of the calling method and looks
   # for a VERSION or VERSION.yml file to parse out the current version. Pass
@@ -25,15 +25,15 @@ class Version
     # automatically in the directory; if path is a filename, use it directly
     path = path ? Pathname.new(path) : self.version_file(caller.first)
     path = self.version_file(path) unless path.nil? or path.file?
-    
+
     return nil unless path
-    
+
     case path.extname
       when ''      then path.read.strip.to_version
       when '.yml'  then YAML::load(path.read).to_version
     end
   end
-  
+
   #
   # Attempts to detect the version file for the passed +filename+. Looks up
   # the directory hierarchy for a file named VERSION or VERSION.yml. Returns
@@ -45,7 +45,7 @@ class Version
       break d.join('VERSION.yml') if d.join('VERSION.yml').file?
     end
   end
-  
+
   #
   # Creates a new version number, with a +major+ version number, +minor+
   # revision number, +revision+ number, and optionally more (unnamed)
@@ -54,7 +54,7 @@ class Version
   def initialize(major, minor = 0, revision = nil, *rest)
     self.components = [ major, minor, revision, *rest ]
   end
-  
+
   #
   # For +major+, +minor+, and +revision+, make a helper method that gets and
   # sets each based on accessing indexes.
@@ -66,7 +66,7 @@ class Version
     define_method(:"#{component}")  { self.components[i] ? self.components[i].to_s : nil }
     define_method(:"#{component}=") {|v| self[i] = v  }
   end
-  
+
   #
   # Set the component of the Version at +index+ to +value+. Zeroes out any
   # trailing components.
@@ -77,11 +77,11 @@ class Version
   def []=(index, value)
     return self.resize!(index)               if value.nil? || value.to_s.empty?
     return self[self.length + index] = value if index < 0
-    
+
     length = self.length - index
     zeroes = Array.new length.abs, Version::Component.new('0')
     value  = Version::Component.new(value.to_s)
-    
+
     if length >= 0
       self.components[index, length] = zeroes
       self.components[index]         = value
@@ -90,11 +90,11 @@ class Version
       self.components << value
     end
   end
-  
+
   def prerelease?
     self.components.any? {|c| c.prerelease? }
   end
-  
+
   #
   # Resizes the Version to +length+, removing any trailing components. Is a
   # no-op if +length+ is greater than its current length.
@@ -103,12 +103,13 @@ class Version
     self.components = self.components.take(length)
     self
   end
-  
+
   #
-  # 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.
+  # Bumps the version number and replaces the current object. 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.4'
   #    "1.0.4a".bump!(:pre)                 # => '1.0.4b'
@@ -125,10 +126,10 @@ class Version
       else
         # 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
@@ -136,14 +137,21 @@ class Version
         self
     end
   end
-    
+
+  #
+  # Bumps the version number.
+  #
+  def bump(component = -1, pre = false, trim = false)
+    self.dup.bump!(component, pre, trim)
+  end
+
   #
   # Returns the current length of the version number.
   #
   def length
     self.components.length
   end
-  
+
   #
   # Compares a Version against any +other+ object that responds to
   # +to_version+.
@@ -151,14 +159,14 @@ class Version
   def <=>(other)
     self.components <=> other.to_version.components
   end
-  
+
   #
   # Converts the version number into an array of its components.
   #
   def to_a
     self.components.map {|c| c.to_s }
   end
-  
+
   #
   # Converts the version number into a hash of its components.
   #
@@ -169,48 +177,48 @@ class Version
       :rest     => self.length > 3 ? self.to_a.drop(3) : nil }.
       delete_if {|k,v| v.nil? }
   end
-  
+
   #
   # The canonical representation of a version number.
   #
   def to_s
     self.to_a.join('.')
   end
-  
+
   #
   # Returns +self+.
   #
   def to_version
     self
   end
-  
+
   #
   # Returns a YAML representation of the version number.
   #
   def to_yaml
     YAML::dump(self.to_hash)
   end
-  
+
   #
   # Returns a human-friendly version format.
   #
   def inspect
     self.to_s.inspect
   end
-  
+
   protected
-  
+
   #
   # Retrieves the component of the Version at +index+.
   #
   def [](index)
     self.components[index] || Component.new('0')
   end
-  
+
   def components
     @components ||= []
   end
-  
+
   def components=(components)
     components.each_with_index {|c, i| self[i] = c }
   end

data/spec/spec_helper.rb

@@ -1,9 +1,104 @@
-$:.unshift File.dirname(__FILE__)
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'version'
-require 'spec'
-require 'spec/autorun'
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
 
-Spec::Runner.configure do |config|
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
 end

data/spec/version_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rspec/its'
 
 module ImplicitVersion
   def method_missing(name, *args, &block)
@@ -15,41 +15,41 @@ describe Version do
   
   subject { v2_9 }
   
-  its(:major)       { should == '2'   }
-  its(:minor)       { should == '9'   }
-  its(:revision)    { should be_nil   }
-  its(:prerelease?) { should be_false }
+  its(:major)       { is_expected.to eq('2')  }
+  its(:minor)       { is_expected.to eq('9')  }
+  its(:revision)    { is_expected.to be_nil   }
+  its(:prerelease?) { is_expected.to be_falsey }
   
-  it 'should bump to 2.10' do
-    subject.bump!.should == v2_10
+  it 'is_expected.to bump to 2.10' do
+    expect(subject.bump!).to eq(v2_10)
   end
   
-  it 'should major-bump to 3.0' do
-    subject.bump!(:major).should == v3_0
+  it 'is_expected.to major-bump to 3.0' do
+    expect(subject.bump!(:major)).to eq(v3_0)
   end
   
-  it 'should minor-bump to 2.10' do
-    subject.bump!(:minor).should == v2_10
+  it 'is_expected.to minor-bump to 2.10' do
+    expect(subject.bump!(:minor)).to eq(v2_10)
   end
   
-  it 'should revision-bump to 2.9.1' do
-    subject.bump!(:revision).should == v2_9_1
+  it 'is_expected.to revision-bump to 2.9.1' do
+    expect(subject.bump!(:revision)).to eq(v2_9_1)
   end
   
-  it 'should prerelease-bump to 2.10a' do
-    subject.bump!(:pre).should == v2_10a
+  it 'is_expected.to prerelease-bump to 2.10a' do
+    expect(subject.bump!(:pre)).to eq(v2_10a)
   end
   
-  it 'should prerelease-bump major to 3_0a' do
-    subject.bump!(:major, true).should == v3_0a
+  it 'is_expected.to prerelease-bump major to 3_0a' do
+    expect(subject.bump!(:major, true)).to eq(v3_0a)
   end
   
-  it 'should prerelease-bump minor to 2.10a' do
-    subject.bump!(:minor, true).should == v2_10a
+  it 'is_expected.to prerelease-bump minor to 2.10a' do
+    expect(subject.bump!(:minor, true)).to eq(v2_10a)
   end
   
-  it 'should prerelease-bump revision to 2.9.1a' do
-    subject.bump!(:revision, true).should == v2_9_1a
+  it 'is_expected.to prerelease-bump revision to 2.9.1a' do
+    expect(subject.bump!(:revision, true)).to eq(v2_9_1a)
   end
 end
 
@@ -58,41 +58,41 @@ describe Version do
   
   subject { v0_10_0 }
   
-  its(:major)       { should == '0'   }
-  its(:minor)       { should == '10'   }
-  its(:revision)    { should == '0'   }
-  its(:prerelease?) { should be_false }
+  its(:major)       { is_expected.to eq('0')   }
+  its(:minor)       { is_expected.to eq('10')   }
+  its(:revision)    { is_expected.to eq('0')   }
+  its(:prerelease?) { is_expected.to be_falsey }
   
-  it 'should bump to 0.10.1' do
-    subject.bump!.should == v0_10_1
+  it 'is_expected.to bump to 0.10.1' do
+    expect(subject.bump!).to eq(v0_10_1)
   end
   
-  it 'should major-bump to 1.0.0' do
-    subject.bump!(:major).should == v1_0_0
+  it 'is_expected.to major-bump to 1.0.0' do
+    expect(subject.bump!(:major)).to eq(v1_0_0)
   end
   
-  it 'should minor-bump to 0.11.0' do
-    subject.bump!(:minor).should == v0_11_0
+  it 'is_expected.to minor-bump to 0.11.0' do
+    expect(subject.bump!(:minor)).to eq(v0_11_0)
   end
   
-  it 'should revision-bump to 0.10.1' do
-    subject.bump!(:revision).should == v0_10_1
+  it 'is_expected.to revision-bump to 0.10.1' do
+    expect(subject.bump!(:revision)).to eq(v0_10_1)
   end
   
-  it 'should prerelease-bump to 0.10.1a' do
-    subject.bump!(:pre).should == v0_10_1a
+  it 'is_expected.to prerelease-bump to 0.10.1a' do
+    expect(subject.bump!(:pre)).to eq(v0_10_1a)
   end
   
-  it 'should prerelease-bump major to 1.0.0a' do
-    subject.bump!(:major, true).should == v1_0_0a
+  it 'is_expected.to prerelease-bump major to 1.0.0a' do
+    expect(subject.bump!(:major, true)).to eq(v1_0_0a)
   end
   
-  it 'should prerelease-bump minor to 0.11.0a' do
-    subject.bump!(:minor, true).should == v0_11_0a
+  it 'is_expected.to prerelease-bump minor to 0.11.0a' do
+    expect(subject.bump!(:minor, true)).to eq(v0_11_0a)
   end
   
-  it 'should prerelease-bump revision to 0.10.1a' do
-    subject.bump!(:revision, true).should == v0_10_1a
+  it 'is_expected.to prerelease-bump revision to 0.10.1a' do
+    expect(subject.bump!(:revision, true)).to eq(v0_10_1a)
   end
 end
 
@@ -102,41 +102,41 @@ describe Version, 'with a prerelease revision' do
   
   subject { v1_6_3a }
   
-  its(:major)       { should == '1'  }
-  its(:minor)       { should == '6'  }
-  its(:revision)    { should == '3a' }
-  its(:prerelease?) { should be_true }
+  its(:major)       { is_expected.to eq('1')  }
+  its(:minor)       { is_expected.to eq('6')  }
+  its(:revision)    { is_expected.to eq('3a') }
+  its(:prerelease?) { is_expected.to be_truthy }
   
-  it 'should bump to 1.6.3' do
-    subject.bump!.should == v1_6_3
+  it 'is_expected.to bump to 1.6.3' do
+    expect(subject.bump!).to eq(v1_6_3)
   end
   
-  it 'should major-bump to 2.0.0' do
-    subject.bump!(:major).should == v2_0_0
+  it 'is_expected.to major-bump to 2.0.0' do
+    expect(subject.bump!(:major)).to eq(v2_0_0)
   end
   
-  it 'should minor-bump to 1.7.0' do
-    subject.bump!(:minor).should == v1_7_0
+  it 'is_expected.to minor-bump to 1.7.0' do
+    expect(subject.bump!(:minor)).to eq(v1_7_0)
   end
   
-  it 'should revision-bump to 1.6.3' do
-    subject.bump!(:revision).should == v1_6_3
+  it 'is_expected.to revision-bump to 1.6.3' do
+    expect(subject.bump!(:revision)).to eq(v1_6_3)
   end
   
-  it 'should prerelease-bump to 1.6.3b' do
-    subject.bump!(:pre).should == v1_6_3b
+  it 'is_expected.to prerelease-bump to 1.6.3b' do
+    expect(subject.bump!(:pre)).to eq(v1_6_3b)
   end
   
-  it 'should prerelease-bump major to 2.0.0a' do
-    subject.bump!(:major, true).should == v2_0_0a
+  it 'is_expected.to prerelease-bump major to 2.0.0a' do
+    expect(subject.bump!(:major, true)).to eq(v2_0_0a)
   end
   
-  it 'should prerelease-bump minor to 1.7.0a' do
-    subject.bump!(:minor, true).should == v1_7_0a
+  it 'is_expected.to prerelease-bump minor to 1.7.0a' do
+    expect(subject.bump!(:minor, true)).to eq(v1_7_0a)
   end
   
-  it 'should prerelease-bump revision to 1.6.4a' do
-    subject.bump!(:revision, true).should == v1_6_4a
+  it 'is_expected.to prerelease-bump revision to 1.6.4a' do
+    expect(subject.bump!(:revision, true)).to eq(v1_6_4a)
   end
 end
 
@@ -145,64 +145,64 @@ describe Version, 'with a prerelease minor version' do
   
   subject { v1_6a }
   
-  its(:major)       { should == '1'  }
-  its(:minor)       { should == '6a'  }
-  its(:revision)    { should == nil }
-  its(:prerelease?) { should be_true }
+  its(:major)       { is_expected.to eq('1')  }
+  its(:minor)       { is_expected.to eq('6a')  }
+  its(:revision)    { is_expected.to eq(nil) }
+  its(:prerelease?) { is_expected.to be_truthy }
   
-  it 'should bump to 1.6' do
-    subject.bump!.should == v1_6
+  it 'is_expected.to bump to 1.6' do
+    expect(subject.bump!).to eq(v1_6)
   end
   
-  it 'should major-bump to 2.0' do
-    subject.bump!(:major).should == v2_0
+  it 'is_expected.to major-bump to 2.0' do
+    expect(subject.bump!(:major)).to eq(v2_0)
   end
   
-  it 'should minor-bump to 1.6' do
-    subject.bump!(:minor).should == v1_6
+  it 'is_expected.to minor-bump to 1.6' do
+    expect(subject.bump!(:minor)).to eq(v1_6)
   end
   
-  it 'should revision-bump to 1.6.1' do
-    subject.bump!(:revision).should == v1_6_1
+  it 'is_expected.to revision-bump to 1.6.1' do
+    expect(subject.bump!(:revision)).to eq(v1_6_1)
   end
   
-  it 'should bump to 1.6b' do
-    subject.bump!(:pre).should == v1_6b
+  it 'is_expected.to bump to 1.6b' do
+    expect(subject.bump!(:pre)).to eq(v1_6b)
   end
   
-  it 'should prerelease-bump major to 2.0a' do
-    subject.bump!(:major, true).should == v2_0a
+  it 'is_expected.to prerelease-bump major to 2.0a' do
+    expect(subject.bump!(:major, true)).to eq(v2_0a)
   end
   
-  it 'should prerelease-bump minor to 1.7a' do
-    subject.bump!(:minor, true).should == v1_7a
+  it 'is_expected.to prerelease-bump minor to 1.7a' do
+    expect(subject.bump!(:minor, true)).to eq(v1_7a)
   end
   
-  it 'should prerelease-bump revision to 1.6.1a' do
-    subject.bump!(:revision, true).should == v1_6_1a
+  it 'is_expected.to prerelease-bump revision to 1.6.1a' do
+    expect(subject.bump!(:revision, true)).to eq(v1_6_1a)
   end
 end
 
 describe Version do
   include ImplicitVersion
   
-  it 'should preserve equality' do
-    v0_0.should       == v0_0
-    v0_1_1.should     == v0_1_1
-    v0_4_alpha.should == v0_4_alpha
-    v1_0_2.should     == v1_0_2
-    v1_0_2b.should    == v1_0_2b
-    v1_01.should      == v1_01
-    v1_10.should      == v1_10
-    v2_0.should       == v2_0
-    va.should         == vb
-  end
-  
-  it 'should order correctly' do
-    v0_0.should     < v0_0_0_0_0_1
-    v0_0_0_1.should < v1
-    v0_1a.should    < v0_1
-    v0_01.should    < v0_10
-    v0_9.should     < v0_10
+  it 'is_expected.to preserve equality' do
+    expect(v0_0).to       eq(v0_0)
+    expect(v0_1_1).to     eq(v0_1_1)
+    expect(v0_4_alpha).to eq(v0_4_alpha)
+    expect(v1_0_2).to     eq(v1_0_2)
+    expect(v1_0_2b).to    eq(v1_0_2b)
+    expect(v1_01).to      eq(v1_01)
+    expect(v1_10).to      eq(v1_10)
+    expect(v2_0).to       eq(v2_0)
+    expect(va).to         eq(vb)
+  end
+  
+  it 'is_expected.to order correctly' do
+    expect(v0_0).to be      < v0_0_0_0_0_1
+    expect(v0_0_0_1).to be  < v1
+    expect(v0_1a).to be     < v0_1
+    expect(v0_01).to be     < v0_10
+    expect(v0_9).to be      < v0_10
   end
 end

metadata

@@ -1,84 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: version
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Stephen Touset
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-10 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2017-04-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: 
 email: stephen@touset.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.rdoc
 - README.rdoc
 - TODO.rdoc
-files: 
+files:
+- Gemfile
+- Gemfile.lock
 - History.rdoc
 - License.txt
-- Rakefile
 - README.rdoc
+- Rakefile
 - TODO.rdoc
 - VERSION
 - lib/rake/version_task.rb
+- lib/version.rb
 - lib/version/component.rb
 - lib/version/ext/array.rb
 - lib/version/ext/hash.rb
 - lib/version/ext/module.rb
 - lib/version/ext/string.rb
-- lib/version.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/version_spec.rb
-has_rdoc: true
 homepage: 
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.6.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: simple version-number encapsulation
 test_files: []
-