gitarro 0.1.78 → 0.1.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 906eff5164c6cedec317447e229f6ee5aa9b6551
-  data.tar.gz: 1b6cd4267d70bef5446140318feef9964c01fca0
+SHA256:
+  metadata.gz: 14bb2f5adfdd8fdc345c010ab3282f7c5cf19e5bd7fd81155fac8fcb3b298b70
+  data.tar.gz: 05ff77cd63c57b95541c5db21b9684c06981a202e5f49ac657f8ff5b4b43e01b
 SHA512:
-  metadata.gz: 117792f7ed4b02f925171f893ad5c19e2f0f84c04b522b6614681f9a75963541fed0136e57376d3665db22b374a9636724e92f5411dd5021d2f1f552f3360601
-  data.tar.gz: 8209860252af7f75074beba53e6023356508ef7034804cba9197cd5d4201252a7a6e0b4a6a7f0d0f85e3e01d93541e5c5c4e49f522ee2d3fae2006848f788c6b
+  metadata.gz: 5eb6fb49628ce67ad61f7b60e1e0da8cc5c560e3e0a8845be5556a3265e5bddc4b4d4774fb7204700f855442d3f6b536e5a2d2467e6970553976a34bb1f5862a
+  data.tar.gz: 69c6dc98ba868abad274eb1587662735f258368b0a97ebd22f69d187c871e105b2c1d8565047b272dd053a761d20f2b31f495c06daf0a967aba20cce2cb62286

data/bin/gitarro

@@ -15,10 +15,12 @@ prs.each do |pr|
   puts '=' * 30 + "\n" + "TITLE_PR: #{pr.title}, NR: #{pr.number}\n" + '=' * 30
   # check if prs contains the branch given otherwise just break
   next unless b.pr_equal_spefic_branch?(pr)
+
   # this check the last commit state, catch for review or not reviewd status.
   comm_st = b.client.status(b.repo, pr.head.sha)
   # pr number trigger.
   break if b.triggered_by_pr_number?
+
   # retrigger if magic word found
   b.retrigger_check(pr)
   # 0) do test for unreviewed pr

data/lib/gitarro/backend.rb

@@ -1,5 +1,6 @@
 #! /usr/bin/ruby
 
+require 'json'
 require 'octokit'
 require 'optparse'
 require 'time'
@@ -80,14 +81,13 @@ class TestExecutor
       instance_variable_set("@#{key}", value)
       self.class.send(:attr_accessor, key)
     end
+    Octokit.auto_paginate = true
+    @client = Octokit::Client.new(netrc: true)
   end
 
   # this will clone the repo and execute the tests
   def pr_test(pr)
-    export_pr_data_to_hidden_file(pr)
     clone_repo(@noshallow, pr)
-    # export variables
-    export_pr_variables(pr)
     # do valid tests and store the result
     test_status = run_script
     test_status
@@ -99,8 +99,42 @@ class TestExecutor
     $CHILD_STATUS.exitstatus.nonzero? ? 'failure' : 'success'
   end
 
+  def export_pr_data(pr)
+      export_pr_data_to_simple_file(pr)
+      export_pr_data_to_file(pr)
+  end
+
   private
 
+  def export_pr_data_to_simple_file(pr)
+    # save this file in local dir where gitarro is executed.
+    # This part is kept for compatibility purposes
+    File.open('.gitarro_vars', 'w') do |file|
+       file.write("GITARRO_PR_AUTHOR: #{pr.head.user.login}\n" \
+       "GITARRO_PR_TITLE:  #{pr.title}\n" \
+       "GITARRO_PR_NUMBER: #{pr.number}\n" \
+       "GITARRO_PR_TARGET_REPO: #{@repo}\n")
+    end
+  end
+
+  def export_pr_data_to_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
+    File.open('.gitarro_pr.json', 'w') do |file|
+       file.write(JSON.generate(pr))
+    end
+  end
+
+  def export_pr_variables(pr)
+    ENV['GITARRO_PR_AUTHOR'] = pr.head.user.login.to_s
+    ENV['GITARRO_PR_TITLE'] = pr.title.to_s
+    ENV['GITARRO_PR_NUMBER'] = pr.number.to_s
+    ENV['GITARRO_PR_TARGET_REPO'] = @repo
+  end
+
   def clone_repo(noshallow, pr)
     shallow = GitShallowClone.new(@git_dir, pr, @options)
     # by default we use always shallow clone
@@ -117,24 +151,6 @@ class TestExecutor
     git.merge_pr_totarget(pr.base.ref, pr.head.ref)
     git.del_pr_branch(pr.base.ref, pr.head.ref)
   end
-
-  def export_pr_data_to_hidden_file(pr)
-    # save this file in local dir where gitarro is executed.
-    File.open('.gitarro_vars', 'w') do |file|
-       file.write("GITARRO_PR_AUTHOR: #{pr.head.user.login}\n" \
-       "GITARRO_PR_TITLE:  #{pr.title}\n" \
-       "GITARRO_PR_NUMBER: #{pr.number}\n" \
-       "GITARRO_PR_BRANCH: #{pr.head.ref}\n" \
-       "GITARRO_PR_TARGET_REPO: #{@repo}\n")
-    end
-  end 
-
-  def export_pr_variables(pr)
-    ENV['GITARRO_PR_AUTHOR'] = pr.head.user.login.to_s
-    ENV['GITARRO_PR_TITLE'] = pr.title.to_s
-    ENV['GITARRO_PR_NUMBER'] = pr.number.to_s
-    ENV['GITARRO_PR_TARGET_REPO'] = @repo
-  end
 end
 
 # this the main public class is the backend of gitarro,
@@ -163,6 +179,7 @@ class Backend
   def pr_equal_spefic_branch?(pr)
      return true if @branch.nil?
      return true if @branch == pr.base.ref 
+
      puts "branch \"#{pr.base.ref}\" should match github-branch \"#{@branch}\" (given) !!!"
      puts "skipping tests !!!"
      false
@@ -181,30 +198,38 @@ class Backend
   # public for retrigger the test
   def retrigger_check(pr)
     return unless retrigger_needed?(pr)
+
     create_status(pr, 'pending')
     print_test_required
+    gbexec.export_pr_data(pr)
     exit 0 if @check
     launch_test_and_setup_status(pr) == 'success' ? exit(0) : exit(1)
   end
 
   # public always rerun tests against the pr number if this exists
   def triggered_by_pr_number?
-    return false if @pr_number.nil? 
+    return false if @pr_number.nil?
+
     pr_on_number = @client.pull_request(@repo, @pr_number) 
     puts "Got triggered by PR_NUMBER OPTION, rerunning on #{@pr_number}"
     print_test_required
-    launch_test_and_setup_status(pr_on_number)
+    gbexec.export_pr_data(pr)
+    launch_test_and_setup_status(pr_on_number) == 'success' ? exit(0) : exit(1)
   end
 
   def unreviewed_new_pr?(pr, comm_st)
     return unless commit_is_unreviewed?(comm_st)
+
     pr_all_files_type(pr.number, @file_type)
     return if empty_files_changed_by_pr?(pr)
+
     # gb.check is true when there is a job running as scheduler
     # which doesn't execute the test but trigger another job
     print_test_required
+    gbexec.export_pr_data(pr)
     return false if @check
-    launch_test_and_setup_status(pr)
+
+    launch_test_and_setup_status(pr) == 'success' ? exit(0) : exit(1)
   end
 
   def reviewed_pr?(comm_st, pr)
@@ -213,9 +238,11 @@ class Backend
     return false unless context_present?(comm_st) == false ||
                         pending_pr?(comm_st)
     return false unless pr_all_files_type(pr.number, @file_type).any?
+
     print_test_required
+    gbexec.export_pr_data(pr)
     exit(0) if @check
-    launch_test_and_setup_status(pr)
+    launch_test_and_setup_status(pr) == 'success' ? exit(0) : exit(1)
   end
 
   # this function will check if the PR contains in comment the magic word
@@ -298,6 +325,7 @@ class Backend
   def retrigger_needed?(pr)
     # we want redo sometimes tests
     return false unless retriggered_by_comment?(pr.number, @context)
+
     # if check is set, the comment in the trigger job will be del.
     # so setting it to pending, it will be remembered
     pr_all_files_type(pr.number, @file_type).any?

data/lib/gitarro/git_op.rb

@@ -67,6 +67,7 @@ class GitOp
     `git pull origin #{upstream}`
     `git checkout -b #{pr_fix}#{pr_branch} origin/#{pr_branch}`
     return if $CHILD_STATUS.exitstatus.zero?
+
     # if it fails the PR contain a forked external repo
     repo_external.checkout_into
   end
@@ -82,6 +83,7 @@ class GitOp
   def ck_or_clone_git
     git_repo_dir = git_dir + '/' + @options[:repo].split('/')[1]
     return if File.directory?(git_repo_dir)
+
     FileUtils.mkdir_p(git_dir) unless File.directory?(git_dir)
     Dir.chdir git_dir
     clone_repo

data/lib/gitarro/opt_parser.rb

@@ -136,6 +136,7 @@ class OptParserInternal
 
   def ck_mandatory_option(option)
     return unless @options[option.to_sym].nil?
+
     raise_incorrect_syntax("option --#{option} not found")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitarro
 version: !ruby/object:Gem::Version
-  version: 0.1.78
+  version: 0.1.79
 platform: ruby
 authors:
 - Dario Maiocchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: gitarro gem