gitarro 0.1.81 → 0.1.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a024ef58673cf6412c7fb1b474bccc5a5555cd0d8d0c9690c63f3a469742b540
-  data.tar.gz: 41b718de88bb09a3d9fe98681db4e38acbfed512b9058708bf004f408d75ee0c
+  metadata.gz: bb333ee96f4cfecebfe8a2cc7738cb460fbc6d1961fc01a4f37db171e2baf03a
+  data.tar.gz: 4b010669bd1a5bb0c426a324fd3251d4956cd56033f48814002ae26f5b6d59ea
 SHA512:
-  metadata.gz: 167da6114d2d545b4145e18ae737bd7d7e1254a2ab09c5ecbcf1d966873815cba84b45c27394d37f0923e22106b00bb5f11225c23a1084ca3bedd99c12f6f53d
-  data.tar.gz: 31a15bcce8985b8227a8cc752be768f738bf57245252cdd115c3c7bd69939f83a0dc0694b90769dbf6789a85b67918e6b09e874594c168d5d8121579217f45b7
+  metadata.gz: fdbe35a2bc89886846ba84e39d650e2424c275014c9a73a63feeb6fbc2e83c85748f60417ce03650c10e2e1de6fcbad7e5d87dee10d6023c674c126c2b58ef26
+  data.tar.gz: 243b2462f6376a2fa94eb9d010c7e871061141937c9d638ae5cb3cace734431d5395967c039f8c49fcc45c4e7e2518b8fe6f52cce0999f91984d3053dc9502e0

data/lib/gitarro/backend.rb

@@ -88,9 +88,8 @@ class TestExecutor
   # this will clone the repo and execute the tests
   def pr_test(pr)
     clone_repo(@noshallow, pr)
-    # do valid tests and store the result
-    test_status = run_script
-    test_status
+    # do valid tests and return the result
+    run_script
   end
 
   # run validation script for validating the PR.
@@ -120,10 +119,7 @@ class TestExecutor
 
   def export_pr_data_to_json_file(pr)
     pr = pr.to_hash
-    pr[:files] = []
-    @client.pull_request_files(@repo, pr[:number]).each do |github_file|
-        pr[:files].push(github_file.to_hash)
-    end
+    pr[:files] = @client.pull_request_files(@repo, pr[:number]).map(&:to_h)
     File.open('.gitarro_pr.json', 'w') do |file|
        file.write(JSON.generate(pr))
     end
@@ -182,7 +178,7 @@ class Backend
      return true if @branch == pr.base.ref 
 
      puts "branch \"#{pr.base.ref}\" should match github-branch \"#{@branch}\" (given) !!!"
-     puts "skipping tests !!!"
+     puts 'skipping tests !!!'
      false
   end
 
@@ -204,7 +200,7 @@ class Backend
     print_test_required
     gbexec.export_pr_data(pr)
     exit 0 if @check
-    launch_test_and_setup_status(pr) == 'success' ? exit(0) : exit(1)
+    launch_test_and_setup_status(pr)
   end
 
   # public always rerun tests against the pr number if this exists
@@ -215,7 +211,7 @@ class Backend
     puts "Got triggered by PR_NUMBER OPTION, rerunning on #{@pr_number}"
     print_test_required
     gbexec.export_pr_data(pr_on_number)
-    launch_test_and_setup_status(pr_on_number) == 'success' ? exit(0) : exit(1)
+    launch_test_and_setup_status(pr_on_number)
   end
 
   def unreviewed_new_pr?(pr, comm_st)
@@ -230,7 +226,7 @@ class Backend
     gbexec.export_pr_data(pr)
     return false if @check
 
-    launch_test_and_setup_status(pr) == 'success' ? exit(0) : exit(1)
+    launch_test_and_setup_status(pr)
   end
 
   def reviewed_pr?(comm_st, pr)
@@ -243,7 +239,7 @@ class Backend
     print_test_required
     gbexec.export_pr_data(pr)
     exit(0) if @check
-    launch_test_and_setup_status(pr) == 'success' ? exit(0) : exit(1)
+    launch_test_and_setup_status(pr)
   end
 
   # this function will check if the PR contains in comment the magic word
@@ -253,14 +249,27 @@ class Backend
     # a pr contain always a comments, cannot be nil
     @client.issue_comments(@repo, pr_number).each do |com|
       # delete comment otherwise it will be retrigger infinetely
-      if com.body.include? magic_word_trigger
-        @client.delete_comment(@repo, com.id)
-        return true
-      end
+      next unless com.body.include? magic_word_trigger
+
+      puts "Re-run test \"#{context}\""
+      @client.delete_comment(@repo, com.id)
+      return true
     end
     false
   end
 
+  # this function will check if the PR contains a checkbox
+  # for retrigger all the tests.
+  def retriggered_by_checkbox?(pr, context)
+    return false unless pr.body.include? "[x] Re-run test \"#{context}\""
+
+    puts "Re-run test \"#{context}\""
+    new_pr_body = pr.body.gsub("[x] Re-run test \"#{context}\"",
+                               "[ ] Re-run test \"#{context}\"")
+    @client.update_pull_request(@repo, pr.number, body: new_pr_body)
+    true
+  end
+
   private
 
   # Show a message stating if there are opened PRs or not
@@ -294,7 +303,7 @@ class Backend
     # set status
     create_status(pr, test_status)
     # return status for other functions
-    test_status
+    test_status == 'success' ? exit(0) : exit(1)
   end
 
   # check all files of a Prs Number if they are a specific type
@@ -325,7 +334,8 @@ class Backend
 
   def retrigger_needed?(pr)
     # we want redo sometimes tests
-    return false unless retriggered_by_comment?(pr.number, @context)
+    return false unless retriggered_by_checkbox?(pr, @context) ||
+                        retriggered_by_comment?(pr, @context)
 
     # if check is set, the comment in the trigger job will be del.
     # so setting it to pending, it will be remembered

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitarro
 version: !ruby/object:Gem::Version
-  version: 0.1.81
+  version: 0.1.82
 platform: ruby
 authors:
 - Dario Maiocchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -151,7 +151,8 @@ files:
 homepage: https://github.com/openSUSE/gitarro
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/openSUSE/gitarro/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: gitarro gem