lib/ronn.rb in ronn-ng-0.10.1.pre1 vs lib/ronn.rb in ronn-ng-0.10.1.pre2
- old
+ new
@@ -20,28 +20,26 @@
revision != '' && !revision.include?('-')
end
# A semantic version number based on the git revision. The third element
# of the version is incremented by the commit offset, such that version
- # 0.6.6-5-gdacd74b => 0.6.11
+ # v0.6.6-5-gdacd74b => 0.6.11
def self.version
- ver = revision[/^[0-9.-]+/].split(/[.-]/).map(&:to_i)
+ ver = revision.sub(/\Av/, '')[/^[0-9.-]+/].split(/[.-]/).map(&:to_i)
ver[2] += ver.pop while ver.size > 3
ver.join('.')
end
# The string revision as reported by: git-describe --tags. This is just the
- # tag name when a tag references the HEAD commit (e.g. 0.6.25). When the HEAD
+ # tag name when a tag references the HEAD commit (e.g. v0.6.25). When the HEAD
# commit is not tagged, this is a "<tag>-<offset>-<sha1>" string:
# <tag> - closest tag name
# <offset> - number of commits ahead of <tag>
# <sha1> - 7c short SHA1 for HEAD
def self.revision
REV
end
# value generated by: rake rev
- # or edit manually; I'm not sure of how rake rev interacts with git
- # tags -apjanke
- REV = '0.10.1.pre1'.freeze
+ REV = '0.10.1.pre2'.freeze
VERSION = version
end