prima-twig 0.48.7 → 0.48.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a0376767046776c846bc3a380f680071836c73f37a7fadb3ab22a4592b32f7b
-  data.tar.gz: 056b2cb53c9ef8e507ede52ea7b9159fddb6a327561c69ac7f4fb37ddb622cfd
+  metadata.gz: 48e1757f955bcc07440b82685c1244109f6ef7384f805e5e59bda39188e6f1ca
+  data.tar.gz: c44d495d6249c72283304fcf92dd71011d74613c66b68df4f138afef83fdee46
 SHA512:
-  metadata.gz: f6265865a7e63728fabe699d3c7ea7a7a9488624f84158a5041e25c373645d43d28d334796949754bf57de35fffd619a37f1461e36a9fe5a65ac8768228345f7
-  data.tar.gz: 0e10538d177c930c5cc773480f4c1a19914687af01bb0cdf775da76cea33411fb285a54bb4b21dbb77ca617d2cf381d2d4d6e314b7a773e8d1c7ed7b2bf77ce1
+  metadata.gz: 2c37c9afb1de5a8909b18873af2b1562298a2164991edae996c72018974a6e57f6f9470e1818d835861b6a6803dea45a69775c4f910ef7450ff324bd283c12e5
+  data.tar.gz: f849e254b2fa767b1380d3c1a80f38fe4c585642ec10043a49607e284cb6aadb469dbf24b290c2d84413a03fd324695040c942ff43bfcb8ae1e97a25260b0dca

data/bin/twig-feature

@@ -457,10 +457,13 @@ class Release
     end
   end
 
+  def get_git_user()
+    `git config user.name`.gsub(/[^A-Za-z]/, '').gsub("\n", '')
+  end
+
   def qainit_deploy!(quiet = false)
     `git checkout master && git pull && git remote prune origin`
 
-    git_user = `git config user.name`.gsub(/[^A-Za-z]/, '').gsub("\n", '')
     default_name = get_default_branch_name @projects
     feature_number = ''
     unless quiet
@@ -468,7 +471,7 @@ class Release
       feature_number = String(STDIN.gets.chomp)
     end
     feature_number = default_name if feature_number.empty?
-    branch_name = git_user + '_' + feature_number
+    branch_name = get_git_user + '_' + feature_number
 
     if `git branch -l | grep #{branch_name}`.size > 0
       `git checkout #{branch_name} && git pull`
@@ -529,13 +532,15 @@ class Release
     `git fetch -p && for branch in \`git branch -vv | grep ': gone]' | awk '{print $1}'\`; do git branch -D $branch; done`
     # leggiamo i nomi dei branch superstiti
     former_branches = `git branch -a | grep remotes/ | grep -v HEAD | sed 's/  remotes\\/origin\\///g'`.split "\n"
+    git_user = get_git_user
     # stampiamo la lista
     chosen_branch = choose do |menu|
       menu.prompt = "Scegli il QA che vuoi aggiornare: ".cyan
       menu.shell = true
       former_branches.delete('master')
       former_branches.each_with_index do |branch, index|
-        msg = index.odd? ? branch.white.on_black : branch.light_yellow.on_black
+        msg = index.odd? ? branch.white : branch.light_yellow # uno bianco e uno giallo alternati
+        msg = branch.start_with?(git_user) ? msg.on_blue : msg.on_black # i branch creati da chi lancia l'update sono su sfondo più chiaro
         menu.choice(msg) { branch }
       end
     end
@@ -580,9 +585,11 @@ class Release
       chosen_branch = choose do |menu|
         menu.prompt = "Scegli il QA che vuoi spegnere: ".cyan
         menu.shell = true
+        git_user = get_git_user
         former_branches.delete('master')
         former_branches.each_with_index do |branch, index|
-          msg = index.odd? ? branch.white.on_black : branch.light_yellow.on_black
+          msg = index.odd? ? branch.white : branch.light_yellow # uno bianco e uno giallo alternati
+          msg = branch.start_with?(git_user) ? msg.on_blue : msg.on_black # i branch creati da chi lancia l'update sono su sfondo blu
           menu.choice(msg) { branch }
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.48.7
+  version: 0.48.8
 platform: ruby
 authors:
 - Matteo Giachino