Skip to content

Commit 9cf4619

Browse files
committed
Merge branch 'matt/improve_version_collision_error' into 'master'
Improve version collision error See merge request mx/binks!10
2 parents 87110d7 + 1e0c47c commit 9cf4619

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
binks (0.0.7)
4+
binks (0.0.8)
55
thor (>= 0.20.3)
66

77
GEM

lib/binks/jar.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def validate!
2121
raise ::Binks::BinksError, "Invalid version \"#{version}\"" unless version.valid?
2222
raise ::Binks::BinksError, "Dirty tree. Commit your changes" if !force && git.dirty?
2323
raise ::Binks::BinksError, "Pre release versions must be released from a topic branch (not master)" if branch == "master" && version.pre?
24-
raise ::Binks::BinksError, "Version already used" if !force && versions.any? { |v| v.to_s == version.to_s }
24+
raise ::Binks::BinksError, "Version (#{version}) already used" if !force && versions.any? { |v| v.to_s == version.to_s }
2525
end
2626

2727
def version

spec/binks/jar_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
it "is invalid" do
6969
expect do
7070
subject.validate!
71-
end.to raise_error(::Binks::BinksError, "Version already used")
71+
end.to raise_error(::Binks::BinksError, "Version (0.0.1) already used")
7272
end
7373
end
7474
end

0 commit comments

Comments
 (0)