prima-twig 0.36.71 → 0.36.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb596d68ce96531baa1721e0866ad4f57639ae9
-  data.tar.gz: 0fae67f256bc4a81763296043e2159712b485ea5
+  metadata.gz: 60305cedb3eb7958383dccb61996284caead3135
+  data.tar.gz: 3eebc2d6ed79963840dc1afd1ff4017d422b3f7d
 SHA512:
-  metadata.gz: 72ad55b61a19fbff9cc81d28a544c07a6433bd61f38164b5d6ccc42ef6f562e716076ed0592ba4505d7dace4bff1aa3d7e2a07819c978e9e048533a389d9b63b
-  data.tar.gz: ae951fd7b725f4db1d444e64ed619d2749518934fcd90e85f0c6e0c2df1a8c4964187056881d2188486712742d6029cd28cde5e57700c5f4e76e8bcdd1f7c805
+  metadata.gz: 4185696e82faf363b49914ba296a06e462585983df93fbcf15ccd0b96d95acd1d92aab29191d00768d5bc7b71b3b124dd633ebc36e10f3ad227a4a9d596472c0
+  data.tar.gz: 0435b6d8cfcb9b2b9b88958562a47c1288802c39207f7c16ade0885b966a45fc1608f71d19c2e3708d881d5e596a9b84ac8a366c153e1f4f82baf158c28f13ae

data/bin/twig-feature

@@ -62,9 +62,9 @@ class Release
     when 'qainit'
       abort('Non sei nella cartella di qainit') unless Dir.pwd.match 'qainit$'
       if ['terminate', 'stop', 'shutdown', 'halt', 'destroy'].include? args[1]
-        qainit_deploy_update! 'shutdown'
+        qainit_deploy_shutdown!
       elsif 'update' == args[1]
-        qainit_deploy_update! 'update'
+        qainit_deploy_update!
       elsif 'read' == args[1]
         qainit_read_config!
       else
@@ -415,11 +415,10 @@ class Release
   end
 
   def qainit_deploy!
-    output 'Inserisci la feature a cui si riferisce il QA: '
+    `git checkout master && git pull && git remote prune origin`
+    output 'Inserisci la feature a cui si riferisce il QA: '.cyan
     feature_number = String(STDIN.gets.chomp)
 
-    `git checkout master`
-
     if `git branch -l | grep #{feature_number}`.size > 0
       `git checkout #{feature_number} && git pull`
     else
@@ -443,24 +442,20 @@ class Release
      git checkout master`
   end
 
-  def qainit_deploy_update!(action)
+  def qainit_deploy_update!
+    `git checkout master && git pull && git remote prune origin`
     # leggiamo i nomi dei branch
     former_branches = `git branch -a | grep remotes/ | grep -v HEAD | sed 's/  remotes\\/origin\\///g'`.split "\n"
     # stampiamo la lista
     chosen_branch = choose do |menu|
-      case action
-      when "update"
-        menu.prompt = "Scegli il QA che vuoi aggiornare: ".cyan
-      when "shutdown"
-        menu.prompt = "Scegli il QA che vuoi spegnere: ".cyan
-      end
+      menu.prompt = "Scegli il QA che vuoi aggiornare: ".cyan
       menu.shell = true
       former_branches.each do |branch|
         msg = branch.light_blue
         menu.choice(msg) { branch }
       end
     end
-    # checkout master, checkout branch, pull branch, push sul branch con commit vuoto
+    # checkout master, checkout branch, pull branch
     `git checkout master && git checkout #{chosen_branch} && git pull`
 
     # aggiornare il commit (revision a cui fa riferimento)
@@ -484,7 +479,26 @@ class Release
 
     File.open('branch_names', 'w') { |file| file.write(branches) }
 
-    `git commit -am '#{action}' && git push && git checkout master`
+    `git commit -am 'update' && git push && git checkout master`
+  end
+
+  def qainit_deploy_shutdown!
+    `git checkout master && git pull && git remote prune origin`
+    # leggiamo i nomi dei branch
+    former_branches = `git branch -a | grep remotes/ | grep -v HEAD | sed 's/  remotes\\/origin\\///g'`.split "\n"
+    # stampiamo la lista
+    chosen_branch = choose do |menu|
+      case action
+      menu.prompt = "Scegli il QA che vuoi spegnere: ".cyan
+      menu.shell = true
+      former_branches.each do |branch|
+        msg = branch.light_blue
+        menu.choice(msg) { branch }
+      end
+    end
+    # checkout master, checkout branch, pull branch, push sul branch con commit vuoto
+    `git checkout master && git checkout #{chosen_branch} && git pull`
+    `git commit --allow-empty 'shutdown' && git push && git checkout master`
   end
 
   def qainit_read_config!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.36.71
+  version: 0.36.72
 platform: ruby
 authors:
 - Matteo Giachino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk