another_brick 0.1.0 → 0.2.0

data/another_brick.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
 
-  s.add_runtime_dependency "slop",          "~> 2.1"
+  s.add_runtime_dependency "slop",          "~> 3.4"
   s.add_runtime_dependency "json",          "~> 1.5"
   s.add_runtime_dependency "rest-client",   "~> 1.6"
   s.add_runtime_dependency "net-ssh",       "~> 2.6.1"

data/bin/brick

@@ -5,13 +5,14 @@ require "another_brick"
 options = Slop.parse help: true do
   banner 'Another Brick'
 
-  on :v, :verbose,          "Verbose mode"
-  on :b, :bricklayer,       "Bricklayer host", true
-  on :n, :name,             "Project name",    true
-  on :s, :server,           "Deploy server",   true
-  on :u, :user,             "Deploy user",     true
-  on :m, :max_tries,        "Max tries to waiting ssh", optional: true
-  on :t, :bricklayer_tries, "Max tries to waiting bricklayer", optional: true
+  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)/
 end
 
 AnotherBrick.run!(options.to_hash)

data/lib/another_brick/bricklayer.rb

@@ -12,12 +12,17 @@ module AnotherBrick
       result = ""
 
       AnotherBrick.bricklayer_tries.times do
-        result = RestClient.get(log_uri(build))
-        break if result =~ SUCCESS or result =~ ERROR
-        sleep 2
+        RestClient.get(log_uri(build)) do |response|
+          result = response
+
+          break if response =~ SUCCESS or response =~ ERROR
+
+          sleep 3
+        end
       end
 
       puts result if AnotherBrick.verbose?
+
       result =~ SUCCESS
     end
 
@@ -25,37 +30,49 @@ module AnotherBrick
       project = nil
 
       AnotherBrick.bricklayer_tries.times do
-        project = JSON.parse RestClient.get(project_uri)
-        puts "project_: #{project}" if AnotherBrick.verbose?
-        break if project["last_tag_testing"] == tag
-        project = nil
-        sleep 5
+        RestClient.get(project_uri) do |response|
+          project = JSON.parse(response)
+
+          puts "project : #{project}" if AnotherBrick.verbose?
+
+          break if project && project["last_tag_#{AnotherBrick.tag}"] == tag
+
+          project = nil
+
+          sleep 3
+        end
       end
 
       abort "tag not built" unless project
+
       puts "project: #{project}" if AnotherBrick.verbose?
+
       project
     end
 
     def build(tag, project)
-      build = nil
-      done = false
+      new_version = tag.split('_')[1]
+      build       = nil
+      done        = false
 
       AnotherBrick.bricklayer_tries.times do
-        builds = JSON.parse RestClient.get(build_uri)
+        RestClient.get(build_uri) do |response|
+          builds = JSON.parse(response)
 
-        builds.reverse.each do |item|
-          done = item["version"] == tag.split('_')[1]
-          build = item if done
-          break if done
-        end
+          build = builds.find do |item|
+            item["release"] == AnotherBrick.tag && item["version"] == new_version
+          end
 
-        break if done
-        sleep 2
+          break if build
+
+          sleep 3
+        end
       end
 
-      abort "build not found for tag #{tag}" unless done
+      abort "build not found for tag #{tag}" unless build
+
       puts "build: #{build}" if AnotherBrick.verbose?
+
       build["build"]
     end
 

data/lib/another_brick/configuration.rb

@@ -1,16 +1,18 @@
 module AnotherBrick
   module Configuration
-    attr_accessor :bricklayer_server, :package_name,
-                  :deploy_server, :deploy_user, :max_tries, :bricklayer_tries
+    attr_accessor :bricklayer_server, :package_name, :deploy_server,
+                  :deploy_user, :max_tries, :bricklayer_tries, :tag
 
     def load_configuration(options = {})
       self.bricklayer_server = options[:bricklayer]
       self.package_name      = options[:name]
       self.deploy_server     = options[:server]
       self.deploy_user       = options[:user]
-      self.max_tries         = (options[:max_tries] || 50).to_i
-      self.bricklayer_tries  = (options[:bricklayer_tries] || 80).to_i
+      self.max_tries         = options[:max_tries]
+      self.bricklayer_tries  = options[:bricklayer_tries]
+      self.tag               = options[:tag]
       @verbose               = options[:verbose]
+      RestClient.proxy       = ENV['http_proxy']
     end
 
     def verbose?

data/lib/another_brick/tag.rb

@@ -0,0 +1,28 @@
+module AnotherBrick
+  module Tag
+    extend self
+
+    def create(prefix)
+      version_tag = get_last_tag('v')
+
+      major, minor = strip_version('v', version_tag)
+
+      last_tag = get_last_tag("#{prefix}_#{major}.#{minor}")
+
+      build = last_tag ? strip_version("#{prefix}_", last_tag).last + 1 : 0
+
+      "#{prefix}_#{major}.#{minor}.#{build}".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
+    end
+
+    def strip_version(prefix, version)
+      version.delete(prefix).split('.').map(&:to_i)
+    end
+  end
+end

data/lib/another_brick/version.rb

@@ -1,3 +1,3 @@
 module AnotherBrick
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/another_brick.rb

@@ -5,7 +5,7 @@ require "net/ssh"
 
 require "another_brick/configuration"
 require "another_brick/bricklayer"
-require "another_brick/testing_tag"
+require "another_brick/tag"
 require "another_brick/server"
 require "another_brick/version"
 
@@ -15,9 +15,10 @@ module AnotherBrick
 
   def run!(options = {})
     load_configuration(options)
-    TestingTag.create.tap do |testing_tag|
-      Bricklayer.wait_build(testing_tag)
-      Server.deploy(testing_tag)
+
+    Tag.create(tag).tap do |new_tag|
+      Bricklayer.wait_build(new_tag)
+      Server.deploy(new_tag)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: another_brick
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ files:
 - lib/another_brick/bricklayer.rb
 - lib/another_brick/configuration.rb
 - lib/another_brick/server.rb
-- lib/another_brick/testing_tag.rb
+- lib/another_brick/tag.rb
 - lib/another_brick/version.rb
 homepage: https://github.com/viniciushiga/another_brick
 licenses: []
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1648754517863908441
+      hash: 3730404254122566144
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1648754517863908441
+      hash: 3730404254122566144
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/another_brick/testing_tag.rb

@@ -1,39 +0,0 @@
-module AnotherBrick
-  module TestingTag
-    extend self
-
-    def create
-      version_tags = `git tag | grep ^v`.lines
-      max_major = 0
-      max_minor = 0
-
-      version_tags.each do |version|
-        major, minor = strip_version('v', version)
-
-        if major > max_major
-          max_major = major
-          max_minor = minor
-        elsif major == max_major and minor > max_minor
-          max_minor = minor
-        end
-      end
-
-      testing_tags = `git tag| grep ^testing_#{max_major}.#{max_minor}`.lines
-      build = 0
-
-      testing_tags.each do |testing|
-        major, minor, version = strip_version('testing_', testing)
-        build = version + 1 if version >= build
-      end
-
-      tag = "testing_#{max_major}.#{max_minor}.#{build}"
-      `git tag #{tag}`
-      `git push --tags`
-      tag
-    end
-
-    def strip_version(prefix, version)
-      version.delete(prefix).split('.').map(&:to_i)
-    end
-  end
-end