prima-twig 0.36.1 → 0.36.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd2c12aab55ddd596b0fc14a3403744f4738aed
-  data.tar.gz: d552b904af5bf514173cd8eb02193cc1ebc30fc2
+  metadata.gz: aefc3ff684b324ea6df1da81cb38d7f00eecc5c7
+  data.tar.gz: 4c60d9c9f273990d1af3661efe25bae6c3f2600c
 SHA512:
-  metadata.gz: f1755c874290c00d44c20bc1e8ab85b2f6ee81054113de10f4e2b791b9930baf3a4a1ddf03443e0c6ed7dd400d796d9e572647e6698829ebecc11ec5d7da9e34
-  data.tar.gz: 126d6f3334407e11a72fe90b52a6dbf14617fbd3fec84cbb1da59458f9d996a398c2484c413e0fdc8d00b9053a3205d9a742cf62e066e157789a08a53cb88793
+  metadata.gz: d9664e5098073e2205cc5fe1fca860bf7042e093cc4db54b3377efe6f0217ee757b343beb1c015e741d77bfeaa2f1082c092eae40f1a010932778042a460ba25
+  data.tar.gz: d22e4e55c745b455bde8f75fced7d2cf827fc17b479fe36e38e73defa59a841588e659905c5021fd6ebcdf3ee96f3a7b1b4760350a3c570701bf01d10801870a

data/bin/twig-feature

@@ -59,9 +59,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! 'update'
-      elsif 'update' == args[1]
         qainit_deploy_update! 'shutdown'
+      elsif 'update' == args[1]
+        qainit_deploy_update! 'update'
       elsif 'read' == args[1]
         qainit_read_config!
       else
@@ -415,7 +415,13 @@ class Release
     output 'Inserisci la feature a cui si riferisce il QA: '
     feature_number = String(STDIN.gets)
 
-    `git checkout master && git checkout -b #{feature_number}`
+    `git checkout master`
+
+    if `git branch -l | grep #{feature_number}$`.size > 0
+      `git checkout #{feature_number} && git pull`
+    else
+      `git checkout -b #{feature_number}`
+    end
 
     branches = ''
 
@@ -434,7 +440,7 @@ class Release
 
   def qainit_deploy_update!(action)
     # leggiamo i nomi dei branch
-    `git branch -a | grep remotes/ | grep -v HEAD | sed 's/  remotes\\/origin\\///g'`
+    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
@@ -444,13 +450,37 @@ class Release
         menu.prompt = "Scegli il QA che vuoi spegnere: ".cyan
       end
       menu.shell = true
-      branches.each do |branch|
+      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 -m '#{action}' --allow-empty`
+    `git checkout master && git checkout #{chosen_branch} && git pull`
+
+    # aggiornare il commit (revision a cui fa riferimento)
+
+    # leggo il file branch_names / recupero i nomi dei branch / riscrivo tutto
+    File.open('branch_names', 'r') do |file|
+      file.each_line do |line|
+        project = line.split(':')
+        @projects[project[0]] = select_branch_to_deploy(project[0], project[1])
+        @projects[project[0]][:default_branch] = project[3]
+        # @projects[project[0]] = {:name=> project[1], :revision=> project[2], :default_branch=> project[3]}
+      end
+    end
+
+    branches = ''
+
+    @projects.each_key do |project_key|
+      if @projects[project_key][:revision]
+        branches += "#{project_key}:#{@projects[project_key][:name]}:#{@projects[project_key][:revision]}:#{@projects[project_key][:default_branch]}\n"
+      end
+    end
+
+    File.open('branch_names', 'w') { |file| file.write(branches) }
+
+    `git commit -am '#{action}'`
   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.1
+  version: 0.36.2
 platform: ruby
 authors:
 - Matteo Giachino