Skip to content

Commit

Permalink
Gem 2.x doesnt support proper patch tags
Browse files Browse the repository at this point in the history
  • Loading branch information
Darren Hardy committed Jun 29, 2013
1 parent c43e9d5 commit 557a651
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 40 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ source "http://rubygems.org"
# Include everything needed to run rake, tests, features, etc. # Include everything needed to run rake, tests, features, etc.
group :development do group :development do
gem "minitest", ">= 0" gem "minitest", ">= 0"
gem "bundler", "~> 1.0.0" gem "bundler", "~> 1.0"
gem "jeweler", "~> 1.5.2" gem "jeweler", "~> 1.5"
gem "rcov", ">= 0" gem "simplecov-rcov"
gem "rdoc", ">= 2.4.2" gem "rdoc", ">= 2.4.2"
end end
19 changes: 13 additions & 6 deletions Gemfile.lock
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,23 +2,30 @@ GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
git (1.2.5) git (1.2.5)
jeweler (1.5.2) jeweler (1.8.4)
bundler (~> 1.0.0) bundler (~> 1.0)
git (>= 1.2.5) git (>= 1.2.5)
rake rake
rdoc
json (1.8.0) json (1.8.0)
minitest (5.0.6) minitest (5.0.6)
multi_json (1.7.7)
rake (10.1.0) rake (10.1.0)
rcov (1.0.0)
rdoc (4.0.1) rdoc (4.0.1)
json (~> 1.4) json (~> 1.4)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)


PLATFORMS PLATFORMS
ruby ruby


DEPENDENCIES DEPENDENCIES
bundler (~> 1.0.0) bundler (~> 1.0)
jeweler (~> 1.5.2) jeweler (~> 1.5)
minitest minitest
rcov
rdoc (>= 2.4.2) rdoc (>= 2.4.2)
simplecov-rcov
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ Rake::TestTask.new(:test) do |test|
test.verbose = true test.verbose = true
end end


require 'rcov/rcovtask' Rake::TestTask.new(:rcov) do |test|
Rcov::RcovTask.new do |test| ENV['COVERAGE'] = 'true'
test.libs << 'test' test.libs << 'lib' << 'test'
test.pattern = 'test/**/test_*.rb' test.pattern = 'test/**/test_*.rb'
test.verbose = true test.verbose = true
end end
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Original file line Diff line number Diff line change
@@ -1 +1 @@
0.4.0.1 0.4.1.pre1
3 changes: 1 addition & 2 deletions lib/bumper/version.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ class Version
end end


define_method "#{part}=" do |arg| define_method "#{part}=" do |arg|
puts "method #{part}= set #{part} to #{arg}"
@v[part] = arg @v[part] = arg
end end


Expand Down Expand Up @@ -52,7 +51,7 @@ def patch_tag
end end


def patch_tag= tag def patch_tag= tag
@v[:patch_tag] = (tag.nil? or tag.empty? ? nil : tag.to_s) @v[:patch_tag] = (tag.nil? or tag.empty?) ? nil : tag.to_s
end end


# patch tags go from alpha, alpha2, alpha3, etc. # patch tags go from alpha, alpha2, alpha3, etc.
Expand Down
5 changes: 5 additions & 0 deletions test/helper.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
exit e.status_code exit e.status_code
end end


if ENV["COVERAGE"]
require 'simplecov'
SimpleCov.start
end

$LOAD_PATH.unshift(File.dirname(__FILE__)) $LOAD_PATH.unshift(File.dirname(__FILE__))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
require 'version_bumper' require 'version_bumper'
Expand Down
12 changes: 12 additions & 0 deletions test/test_version_bumper.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -143,6 +143,18 @@ def test_that_bumping_with_prereleases
assert_equal '0.2.1-alpha.0', v.to_s assert_equal '0.2.1-alpha.0', v.to_s
end end


def test_patch_tag_messy
v = Bumper::Version.new('0.0.0-alpha.0')
assert_equal 'alpha', v.patch_tag
v.patch_tag = nil
puts v.patch_tag
assert_equal nil, v.patch_tag
end

def test_invalid_versions
assert_raises(ArgumentError) {Bumper::Version.new('0.0.alpha.0')}
end

def test_backward_compat def test_backward_compat
v = Bumper::Version.new('0.0.0.0') v = Bumper::Version.new('0.0.0.0')
assert_equal '0.0.0.0', v.to_s assert_equal '0.0.0.0', v.to_s
Expand Down
45 changes: 20 additions & 25 deletions version_bumper.gemspec
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-


Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = %q{version_bumper} s.name = "version_bumper"
s.version = "0.4.0.1" s.version = "0.4.1.pre1"


s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
s.authors = ["Dotan Nahum"] s.authors = ["Dotan Nahum"]
s.date = %q{2013-06-29} s.date = "2013-06-29"
s.description = %q{Simply bump your versions} s.description = "Simply bump your versions"
s.email = %q{jondotan@gmail.com} s.email = "jondotan@gmail.com"
s.extra_rdoc_files = [ s.extra_rdoc_files = [
"LICENSE.txt", "LICENSE.txt",
"README.md" "README.md"
Expand All @@ -20,38 +20,33 @@ Gem::Specification.new do |s|
"lib/bumper/version.rb", "lib/bumper/version.rb",
"lib/version_bumper.rb" "lib/version_bumper.rb"
] ]
s.homepage = %q{http://github.com/jondot/version_bumper} s.homepage = "http://github.com/jondot/version_bumper"
s.licenses = ["MIT"] s.licenses = ["MIT"]
s.require_paths = ["lib"] s.require_paths = ["lib"]
s.rubygems_version = %q{1.3.6} s.rubygems_version = "2.0.3"
s.summary = %q{Rake task to bump your versions} s.summary = "Rake task to bump your versions"
s.test_files = [
"test/helper.rb",
"test/test_version_bumper.rb"
]


if s.respond_to? :specification_version then if s.respond_to? :specification_version then
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 4
s.specification_version = 3


if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<minitest>, [">= 0"]) s.add_development_dependency(%q<minitest>, [">= 0"])
s.add_development_dependency(%q<bundler>, ["~> 1.0.0"]) s.add_development_dependency(%q<bundler>, ["~> 1.0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"]) s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
s.add_development_dependency(%q<rcov>, [">= 0"]) s.add_development_dependency(%q<simplecov-rcov>, [">= 0"])
s.add_development_dependency(%q<rdoc>, [">= 2.4.2"]) s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
else else
s.add_dependency(%q<minitest>, [">= 0"]) s.add_dependency(%q<minitest>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.0.0"]) s.add_dependency(%q<bundler>, ["~> 1.0"])
s.add_dependency(%q<jeweler>, ["~> 1.5.2"]) s.add_dependency(%q<jeweler>, ["~> 1.5"])
s.add_dependency(%q<rcov>, [">= 0"]) s.add_dependency(%q<simplecov-rcov>, [">= 0"])
s.add_dependency(%q<rdoc>, [">= 2.4.2"]) s.add_dependency(%q<rdoc>, [">= 2.4.2"])
end end
else else
s.add_dependency(%q<minitest>, [">= 0"]) s.add_dependency(%q<minitest>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.0.0"]) s.add_dependency(%q<bundler>, ["~> 1.0"])
s.add_dependency(%q<jeweler>, ["~> 1.5.2"]) s.add_dependency(%q<jeweler>, ["~> 1.5"])
s.add_dependency(%q<rcov>, [">= 0"]) s.add_dependency(%q<simplecov-rcov>, [">= 0"])
s.add_dependency(%q<rdoc>, [">= 2.4.2"]) s.add_dependency(%q<rdoc>, [">= 2.4.2"])
end end
end end
Expand Down

0 comments on commit 557a651

Please sign in to comment.