prima-twig 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ead28bbfa78f0b329e874ab92a5fe95c6523cfd
-  data.tar.gz: 8671d58512706646b028e3a383d625f2f722624f
+  metadata.gz: 5dab35c26ee55ae2e771ac4dd176795c7e69da1f
+  data.tar.gz: 9d0086562a16a7e34d433d976c7156d5a66b13f6
 SHA512:
-  metadata.gz: b6fa1fc6abd993bb648dff6abdfaea747a86fb1389fb58b7b3d55b7948c77d901b45d1411d978d0928ff81868cce7f1caf94dffd08bf3999157dfcdb78561164
-  data.tar.gz: f0d55640376ee9e89fe6dee3b8f63adf24937fb851801dded6dd9d0a3d2fafad345a1d95d5bfa6782d7ee8de0b8232db95c561e4539194c883edc9aa07425abd
+  metadata.gz: f1c50b513fa8737cd7f99d6c7589cd34eda2e01254c3ebcae62c108ed9e2c38b0d87846e58e13978a4100f8c3f7f84db50727a6135f76e4d5515a1ae54d03e9c
+  data.tar.gz: b6cff8e063470531f3df19912f9b59a2fd26e03387dd3656b3cb366df6e2a93f725c6a47d50820d09804e9fd08dd1235e1a9c74e4e1ed462c86452e5895ef277

data/bin/twig-deploy

@@ -8,6 +8,7 @@ require 'aws-sdk'
 require 'redcarpet'
 require 'mail'
 require 'erb'
+require 'base64'
 
 def help_content
   <<-HELP
@@ -53,16 +54,16 @@ class Review
     `git checkout master && git pull`
 
     output "Recupero degli artifacts in corso, attendi qualche secondo...".yellow
-    artifacts = get_artifacts
+    artifacts = get_artifacts[0..49]
 
     artifact_rev = choose do |menu|
       menu.prompt = 'Scegli la release da deployare: '.cyan
       menu.shell  = true
 
       artifacts.each do |v|
-        branch = v[:branch]
-        title = @prima.reduce_size(branch, 100)
-        msg = "#{title} #{v[:created_at].strftime('%d/%m/%Y %H:%M:%S')} #{v[:rev]}".light_blue
+        title = @prima.reduce_size(v[:branch], 100)
+        commit_msg = @prima.reduce_size(v[:commit_msg], 100)
+        msg = "#{title} #{v[:created_at].strftime('%d/%m/%Y %H:%M:%S')} #{v[:rev]} #{commit_msg}".light_blue
         menu.choice(msg) {v[:rev]}
       end
     end
@@ -87,6 +88,7 @@ class Review
     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"
+    body << "Commit: #{artifact[:commit_msg]}\n"
 
     htmlBody = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new).render body
 
@@ -118,7 +120,9 @@ class Review
       rev = l.key.match(/(\w{15}).zip$/).captures.first if l.key.match(/(\w{15}).zip$/)
       if rev
         object = s3.head_object(bucket: 'prima-artifacts', key: l.key)
-        artifacts << {rev: rev, created_at: object.last_modified, branch: object.metadata['branch']} if object.metadata.has_key? 'branch'
+        commit_msg = ''
+        commit_msg = Base64.decode64(object.metadata['commit_msg']).strip if object.metadata.has_key? 'commit_msg'
+        artifacts << {rev: rev, created_at: object.last_modified, branch: object.metadata['branch'], commit_msg: commit_msg } if object.metadata.has_key? 'branch'
       end
     end
     artifacts.sort_by { |v| v[:created_at] }.reverse

data/bin/twig-feature

@@ -145,7 +145,7 @@ class Release
     ]
     create_stack(stack_name_db, stack_body, parameters, tags) unless stack_exists?(stack_name_db)
 
-    create_prima_artifact(prima_branch[:revision]) unless artifact_exists?('prima-artifacts', "prima/#{prima_branch[:revision]}")
+    create_prima_artifact(prima_branch[:revision], prima_branch[:name]) unless artifact_exists?('prima-artifacts', "prima/#{prima_branch[:revision]}")
     create_urania_artifact(urania_branch[:revision]) unless artifact_exists?('prima-artifacts', "microservices/urania/#{urania_branch[:revision]}-qa.tar.gz")
     create_backoffice_artifact(backoffice_branch[:revision], deploy_id) unless artifact_exists?('prima-artifacts', "backoffice/#{backoffice_branch[:revision]}-#{deploy_id}.zip")
 
@@ -434,7 +434,7 @@ class Release
     Dir.chdir '../../'
   end
 
-  def create_prima_artifact(revision)
+  def create_prima_artifact(revision, branch_name)
     @prima_built = true
     output "Preparo l'artifact .zip\n".yellow
 
@@ -453,24 +453,8 @@ class Release
     stack_name_backoffice = "ecs-task-backoffice-qa-notneeded"
     backoffice_qa_host = get_route53_hostname(stack_name_backoffice)
 
-    base_cmd = 'docker run -v $PWD:/code -w /code --link redis:redis prima_'
     [
-      "docker-compose build web php",
-      "docker run -d --name redis redis:2.8",
-      "#{base_cmd}web 'bash' '-c' 'sed -i \"s/replaceme.qa.staging.colaster.com/#{backoffice_qa_host}/g\" app/config/config_qa.yml'",
-      "cd ../../ && docker run -e GIT_DIR=$PWD -v $PWD:/usr/app/src -w /usr/app/src/projects/prima blinkmobile/bower install --allow-root",
-      "#{base_cmd}web composer install -n",
-      "#{base_cmd}web npm install",
-      "#{base_cmd}php ./app/console -e=prod assets:install web",
-      "#{base_cmd}php ./app/console -e=prod fos:js-routing:dump",
-      "#{base_cmd}php ./app/console -e=prod cypress:ng-routing:dump",
-      "#{base_cmd}php ./app/console -e=prod bazinga:js-translation:dump web",
-      "#{base_cmd}web ./node_modules/.bin/brunch build -e staging",
-      "#{base_cmd}web composer dump-autoload --optimize --no-dev",
-      "#{base_cmd}compass compass compile --force -c web/compass/config_prod.rb web/compass/",
-      "docker run -v $PWD:/code -w /code -e NODE_ENV=production prima_web ./node_modules/.bin/webpack --optimize-minimize",
-      "docker kill redis && docker rm redis",
-      "sudo chown -R `whoami` ."
+      "bin/local_build_artifact.sh #{branch_name}"
     ].each do |cmd|
       output "Eseguo #{cmd}".yellow
       res = %x[ #{cmd} ]
@@ -480,15 +464,10 @@ class Release
         color = 'green'
       end
       output res.send color
-      exec_step "docker kill redis && docker rm redis" if color == 'red'
+      exec_step "docker stop redis" if color == 'red'
       stop_if (color == 'red'), "Errore durante la build dell'artifact".red
     end
 
-    exec_step 'rsync -avd --exclude-from app/deploy/aws_docker/qa/.rsync-exclude-qa . /tmp/prima'
-    exec_step "rm -f #{@artifact_path}; cd /tmp/prima && zip -ryq #{@artifact_path} ."
-
-    upload_artifact(@artifact_path, "prima/#{revision}.zip")
-
     Dir.chdir "../../"
   end
 
@@ -660,7 +639,7 @@ class Release
     output "Recupero la lista dei branch del progetto #{project_name}..."
     out = %x[ git fetch ]
     branches = %x[ git for-each-ref --sort=-committerdate refs/remotes/ --format='%(refname) %(objectname)' | sed 's/refs\\/remotes\\/origin\\///g' ]
-      .split("\n").delete_if { |b| b.include?('HEAD') || b.include?('dev') }
+      .split("\n").delete_if { |b| b.include?('HEAD') || b.include?('dev') }[0..49]
 
     branch_name = choose do |menu|
       menu.prompt = "Scegli il branch di #{project_name} da deployare: ".cyan

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Matteo Giachino
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twig
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt