another_brick 0.2.1 → 0.3.0

data/another_brick.gemspec

@@ -5,8 +5,8 @@ require "another_brick/version"
 Gem::Specification.new do |s|
   s.name        = "another_brick"
   s.version     = AnotherBrick::VERSION
-  s.authors     = ["Victor Cavalcanti", "Vinicius Higa"]
-  s.email       = ["victorc.rodrigues@gmail.com", "viniciushiga@gmail.com"]
+  s.authors     = ["Victor Cavalcanti", "Vinicius Higa", "Ricardo Ruiz"]
+  s.email       = ["victorc.rodrigues@gmail.com", "viniciushiga@gmail.com", "rhruiz@gmail.com"]
   s.homepage    = "https://github.com/viniciushiga/another_brick"
   s.summary     = "Deploy debian packages using bricklayer"
   s.description = "Creates a testing tag, waits for bricklayer to build the debian package and then updates your server"

data/lib/another_brick/tag.rb

@@ -2,27 +2,34 @@ module AnotherBrick
   module Tag
     extend self
 
-    def create(prefix)
-      version_tag = get_last_tag('v')
-
-      major, minor = strip_version('v', version_tag)
+    PREFIXES = %w(unstable stable testing)
 
-      last_tag = get_last_tag("#{prefix}_#{major}.#{minor}")
-
-      build = last_tag ? strip_version("#{prefix}_", last_tag).last + 1 : 0
+    def create(prefix)
+      major, minor, build = last_tag ? strip_version(last_tag) : [0, 0, 0]
 
-      "#{prefix}_#{major}.#{minor}.#{build}".tap do |next_tag|
+      "#{prefix}_#{major}.#{minor}.#{build.to_i + 1}".tap do |next_tag|
         `git tag #{next_tag}`
         `git push --tags`
       end
     end
 
-    def get_last_tag(pattern)
-      `git tag | grep ^#{pattern} | sort -V`.lines.map(&:chomp).last
+    def version_sorter
+      proc do |v1, v2|
+        Gem::Version.new(v1) <=> Gem::Version.new(v2)
+      end
+    end
+
+    def last_tag
+      prefix_re = /(?:v|#{PREFIXES.map { |e| "#{e}_" }.join("|") })(\d+\.\d+(?:\.\d+)?)/
+      `git tag `.lines.map(&:chomp).select { |e| e =~ prefix_re }.map do |line|
+        line.gsub(prefix_re, "\\1")
+      end.sort(&version_sorter).last
     end
 
-    def strip_version(prefix, version)
-      version.delete(prefix).split('.').map(&:to_i)
+    def strip_version(version)
+      version.split('.').map(&:to_i).tap do |v|
+        v[2] ||= -1
+      end
     end
   end
 end

data/lib/another_brick/version.rb

@@ -1,3 +1,3 @@
 module AnotherBrick
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: another_brick
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
 - Victor Cavalcanti
 - Vinicius Higa
+- Ricardo Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -97,6 +98,7 @@ description: Creates a testing tag, waits for bricklayer to build the debian pac
 email:
 - victorc.rodrigues@gmail.com
 - viniciushiga@gmail.com
+- rhruiz@gmail.com
 executables:
 - brick
 extensions: []
@@ -128,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4056119797303108836
+      hash: -2471127953251273313
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4056119797303108836
+      hash: -2471127953251273313
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23