prima-twig 0.59.0 → 0.59.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4448114bff03d2c305f17e84214de309861f50f53b73fb19fbbe434c514e315c
-  data.tar.gz: '0587c2196fed9292bd60989b8fbf331203cc9ba608608946854279e21f406de0'
+  metadata.gz: 0a3dc2b098b17d12b91dca92673f3962684f955ce6cee0556a7d3c81c6cdbcfe
+  data.tar.gz: cadbacfdc59e4c3acc7bf644ff5eade9171fdaa116bab9f6f55b4bb71e078698
 SHA512:
-  metadata.gz: 2fdd34b834da97bb1d6107f67e27349c69ebc63fc79859e94415009b48b78b35388a8e2b23451f91698c2746eb2b88bc36df8d33264f4ed5b63c2d39e2a9e93c
-  data.tar.gz: 0b8d730ad5f305b64a5edb3f3cccc32b50eed6d1946bdc20730b498f3d78ec4ad88e8d2cd964982f472ec56aa5bb60aa97204034adc6d45264b18db0e6c75aa0
+  metadata.gz: abd3a6eef8500043b1fd74e3b3b7f7a023ab250800a3714183c87151d3a3a8dda9ee57c3311a8c8782b84af850ffd5324b3ed3228130f3ec7053061ce6ffbfca
+  data.tar.gz: 490f25809ab58aa0c63548055e9177a840392f79f298c2b986e8679427378fe38a7b71c79bec928046d4365ebf13f144bb353ce4ab42893ca4ba95a00b6acff6

data/bin/twig-feature

@@ -435,26 +435,20 @@ class Release
   end
 
   def get_default_branch_name(projects)
-    if !projects['prima']['default_branch']
-      return projects['prima']['name']
-    elsif ![nil, 'master'].include? projects['crash']['name']
-      return projects['crash']['name']
-    else
-      projects.each_key do |project_key|
-        return projects[project_key]['name'] if projects[project_key]['name'] != 'master'
-      end
+    projects.each_key do |project|
+      return projects[project]['name'] if not projects[project]['default_branch']
     end
   end
 
   def suite_py_branches(args_json)
-    args = JSON.parse(args_json)
+    arg_projects = JSON.parse(args_json)
 
-    args['projects'].each_key do |project|
-      @projects[project] = { name: args['projects'][project]['branch'], revision: args['projects'][project]['revision'], committer: '', default_branch: false }
-    end
+    @projects.merge!(arg_projects)
 
     @projects.each_key do |project|
-      @projects[project] = choose_branch_to_deploy(project, true) unless args['projects'].key? project
+      if @projects[project].empty?
+        @projects[project] = choose_branch_to_deploy(project, true)
+      end
     end
   end
 
@@ -2986,7 +2980,7 @@ class Release
   end
 
   def choose_branch_to_deploy(project_name, select_master = false)
-    return {name: 'master', revision: '399653d555b8864', committer: 'crash@prima.it', default_branch: true} if project_name == 'crash' && select_master
+    return {'name' => 'master', 'revision' => '399653d555b8864', 'committer' => 'crash@prima.it', 'default_branch' => true} if project_name == 'crash' && select_master
     Dir.chdir "projects/#{project_name}"
     output "Recupero la lista dei branch del progetto #{project_name}..."
     `git remote prune origin`
@@ -3026,8 +3020,8 @@ class Release
     name = branch_name.split(' ')[0]
     revision = branch_name.split(' ')[1]
     committer_email = branch_name.split(' ')[2].tr('<>', '')
-    return { name: 'crash', default_branch: true } if project_name == 'crash' && branch_name == 'master' #rimuovere questa riga se mai nei qa servirà crash con un branch diverso da master
-    { name: name, revision: revision[0..14], committer: committer_email, default_branch: select_master }
+    return { 'name' => 'crash', 'default_branch' => true } if project_name == 'crash' && branch_name == 'master' #rimuovere questa riga se mai nei qa servirà crash con un branch diverso da master
+    { 'name' => name, 'revision' => revision[0..14], 'committer' => committer_email, 'default_branch' => select_master }
   end
 
   def select_branch_to_deploy(project_name, branch_name)
@@ -3043,7 +3037,7 @@ class Release
     name = branch_name.split(' ')[0]
     revision = branch_name.split(' ')[1]
     committer_email = branch_name.split(' ')[2].tr('<>', '')
-    { name: name, revision: revision[0..14], committer: committer_email }
+    { 'name' => name, 'revision' => revision[0..14], 'committer' => committer_email }
   end
 
   def get_stacks()

metadata

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