prima-twig 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a10a63db774a0ba868946173fda9b6e65ba93402
-  data.tar.gz: 4bb6c872e5b9342367cc05c745b79ece43bbc024
+  metadata.gz: 7e461bd2975f9c5c3ebe5ac22894efcf993aef12
+  data.tar.gz: ea2a3b971ef09a6d4f73c90121360f1f03fa4200
 SHA512:
-  metadata.gz: c7429b2ffd7656c4908255b1fa5e06dbf81ce8e01b7ad89e6b019d9e3603e2f363dff326cb0a064c85a828b8f8b1cd40575cd44ffd7ae2d6a437bfdc5f6e4cca
-  data.tar.gz: 49fb9e5381ad2485a8cbe5134d4510f6f5de821931d3820e63bd06d561804d4feeb68673bafb1e1dd0625c8ced5c19fed76374517a67eac14a0076bddcd94ec2
+  metadata.gz: 370d6fb95c1723b2cd2a30c16b564f35a28cccecf5ff3ffa825179e18ab20731830d274d66dfde78466f2a0fc72bff46243634efa87b98a24fbd31ec3ff29d63
+  data.tar.gz: e56af2ff3aebb0314955ddb63c5cb58146dd4aeebf9027ece63792dc7331cfe6446a45c599969664a4d16cc7d4ab0a445e35b87c3a00a2ec4cb386e73238a66e

data/bin/twig-deploy

@@ -78,11 +78,11 @@ class Review
       subject  "#{user} ha effettuato il deploy della revision #{artifact[:rev]}"
     end
 
-    body = "# Deploy in produzione avvenuto con successo!\n\n"
-    body << "### Data: #{Time.now.strftime('%d/%m/%Y %H:%M:%S')}\n"
-    body << "### Utente: #{user}\n"
-    body << "### Revision: [#{artifact[:rev]}](https://github.com/primait/prima/commit/#{artifact[:rev]}) del #{artifact[:created_at].strftime('%d/%m/%Y %H:%M:%S')}\n"
-    body << "### Branch: [#{artifact[:branch]}](https://github.com/primait/prima/tree/#{artifact[:branch]})\n"
+    body = "## Deploy in produzione iniziato\n\n"
+    body << "Data: #{Time.now.strftime('%d/%m/%Y %H:%M:%S')}\n\n"
+    body << "Utente: #{user}\n\n"
+    body << "Revision: [#{artifact[:rev]}](https://github.com/primait/prima/commit/#{artifact[:rev]}) del #{artifact[:created_at].strftime('%d/%m/%Y %H:%M:%S')}\n\n"
+    body << "Branch: [#{artifact[:branch]}](https://github.com/primait/prima/tree/#{artifact[:branch]})\n"
 
     htmlBody = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new).render body
 

data/bin/twig-feature

@@ -90,10 +90,21 @@ class Release
     if environment_exists?(@application_name, @environment_name)
       is_eb_ready = is_eb_ready?(@application_name, @environment_name)
       wait_for_eb_ready(@application_name, @environment_name) unless is_eb_ready
-      @eb.update_application_version({
-        application_name: @application_name,
+      @eb.update_environment({
+        environment_name: @environment_name,
         version_label: @version_label
       })
+      wait_for_eb_ready(@application_name, @environment_name)
+      output "Attendo che i container vengano riavviati...\n".yellow
+      # Non e' veramente ready, deve restartare i container
+      sleep_seconds = 180
+      seconds_elapsed = 0
+      while true
+        break if seconds_elapsed >= sleep_seconds
+        print '.'.yellow; STDOUT.flush
+        sleep 1
+        seconds_elapsed += 1
+      end
       run_commands(@environment_name, ssh_key_path)
     else
       output "Environment #{@environment_name} non presente, inizio la creazione...\n".yellow
@@ -184,6 +195,26 @@ class Release
       version_label: version_label,
       solution_stack_name: "64bit Amazon Linux 2015.09 v2.0.4 running Multi-container Docker 1.7.1 (Generic)",
       option_settings: [
+        {
+          namespace: "aws:ec2:vpc",
+          option_name: "VPCId",
+          value: "vpc-72e52b17",
+        },
+        {
+          namespace: "aws:ec2:vpc",
+          option_name: "Subnets",
+          value: "subnet-90dc64f5,subnet-df13e986,subnet-78db7a0f",
+        },
+        {
+          namespace: "aws:ec2:vpc",
+          option_name: "ELBSubnets",
+          value: "subnet-90dc64f5,subnet-df13e986,subnet-78db7a0f",
+        },
+        {
+          namespace: "aws:ec2:vpc",
+          option_name: "AssociatePublicIpAddress",
+          value: "true",
+        },
         {
           namespace: "aws:autoscaling:launchconfiguration",
           option_name: "IamInstanceProfile",
@@ -272,10 +303,9 @@ class Release
   def wait_for_eb_ready(application_name, environment_name)
     ready = false
     start_time = Time.now - 60
+    sleep_seconds = 30
     output "Attendo che l'environment finisca di essere inizializzato...\n".yellow
     while !ready
-      print '...'.yellow; STDOUT.flush
-
       events = get_eb_events(application_name, environment_name, start_time)
       start_time = Time.now
 
@@ -292,7 +322,14 @@ class Release
       end
 
       ready = true if is_eb_ready?(application_name, environment_name)
-      sleep 10 unless ready
+
+      seconds_elapsed = 0
+      while true
+        break if seconds_elapsed >= sleep_seconds
+        print '.'.yellow; STDOUT.flush
+        sleep 1
+        seconds_elapsed += 1
+      end
     end
 
     output "Environment inizializzato!\n".green
@@ -310,8 +347,8 @@ class Release
     output "L'IP pubblico della macchina e': #{public_ip_address}\n".cyan
 
     base_cmd = "ssh -q -tt -o StrictHostKeyChecking=no -i #{ssh_key_path} ec2-user@#{public_ip_address}"
-    cmd = "#{base_cmd} sudo -i docker ps -a --filter='name=php' | awk '{print $1 }' | grep -v CONTAINER"
-    container_id = %x[ #{cmd} | grep -v 'Warning:' ].chomp
+    cmd = "#{base_cmd} sudo -i docker ps --filter='name=-php-' | awk '{print $1 }' | grep -v CONTAINER"
+    container_id = %x[ #{cmd} | grep -v 'Warning:' ].strip
 
     base_docker_cmd = "sudo -i docker exec #{container_id}"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.16
 platform: ruby
 authors:
 - Matteo Giachino
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twig