another_brick 0.3.0 → 0.4.0

data/bin/brick

@@ -6,13 +6,13 @@ options = Slop.parse help: true do
   banner 'Another Brick'
 
   on :v,   :verbose,          "Verbose mode"
-  on :b,   :bricklayer,       "Bricklayer host",                 required: true, argument: true
-  on :n,   :name,             "Project name",                    required: true, argument: true
-  on :s,   :server,           "Deploy server",                   required: true, argument: true
-  on :u,   :user,             "Deploy user",                     required: true, argument: true
-  on :m,   :max_tries,        "Max tries to waiting ssh",        optional: true, argument: true, default: 480, as: Fixnum
-  on :t,   :bricklayer_tries, "Max tries to waiting bricklayer", optional: true, argument: true, default: 480, as: Fixnum
-  on :tag, :tag,              "Tag (unstable|testing|stable)",   optional: true, argument: true, default: "testing", match: /(unstable|testing|stable)/
+  on :b,   :bricklayer,       "Bricklayer host",                          optional: true, argument: true
+  on :n,   :name,             "Project name",                             optional: true, argument: true
+  on :s,   :server,           "Deploy server",                            optional: true, argument: true
+  on :u,   :user,             "Deploy user",                              optional: true, argument: true
+  on :m,   :max_tries,        "Max tries to waiting ssh",                 optional: true, argument: true, default: 480, as: Fixnum
+  on :t,   :bricklayer_tries, "Max tries to waiting bricklayer",          optional: true, argument: true, default: 480, as: Fixnum
+  on :tag, :tag,              "Tag (unstable|testing|stable)[_$version]", optional: true, argument: true, default: "testing", match: AnotherBrick::Tag::TAG_RE
 end
 
 AnotherBrick.run!(options.to_hash)

data/lib/another_brick/tag.rb

@@ -3,16 +3,27 @@ module AnotherBrick
     extend self
 
     PREFIXES = %w(unstable stable testing)
+    TAG_RE   = /^(#{PREFIXES.map {|p| "#{p}"}.join("|") })(?:_(\d+.\d+.\d+))?$/
 
-    def create(prefix)
-      major, minor, build = last_tag ? strip_version(last_tag) : [0, 0, 0]
-
-      "#{prefix}_#{major}.#{minor}.#{build.to_i + 1}".tap do |next_tag|
+    def create(tag)
+      build_tag(tag).tap do |next_tag|
         `git tag #{next_tag}`
         `git push --tags`
       end
     end
 
+    def build_tag(tag)
+      captures = TAG_RE.match(tag).captures
+
+      if captures[1]
+        tag
+      else
+        major, minor, build = last_tag ? strip_version(last_tag) : [0, 0, 0]
+
+        "#{captures[0]}_#{major}.#{minor}.#{build.to_i + 1}"
+      end
+    end
+
     def version_sorter
       proc do |v1, v2|
         Gem::Version.new(v1) <=> Gem::Version.new(v2)

data/lib/another_brick/version.rb

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

data/lib/another_brick.rb

@@ -17,8 +17,8 @@ module AnotherBrick
     load_configuration(options)
 
     Tag.create(tag).tap do |new_tag|
-      Bricklayer.wait_build(new_tag)
-      Server.deploy(new_tag)
+      Bricklayer.wait_build(new_tag) if bricklayer_server && package_name
+      Server.deploy(new_tag) if deploy_server && deploy_user
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: another_brick
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2471127953251273313
+      hash: -3156948374797029341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2471127953251273313
+      hash: -3156948374797029341
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23