Fix wrong PR number env var

Author: oowekyala

lib/pmdtester.rb

@@ -34,6 +34,7 @@ module PmdTester
   VERSION = '1.1.0-SNAPSHOT'
   BASE = 'base'
   PATCH = 'patch'
+  PR_NUM_ENV_VAR = 'PMD_CI_PULL_REQUEST_NUMBER' # see PmdBranchDetail
 
   def logger
     PmdTester.logger

lib/pmdtester/builders/summary_report_builder.rb

@@ -47,12 +47,10 @@ def write_index(target_root, base_details, patch_details, projects)
         }
       end
 
-      prnum = ENV['TRAVIS_PULL_REQUEST']
       env = {
-        'comparison_url' => nil,
+        'comparison_url' => nil, # todo
         'base' => to_liquid(base_details),
         'patch' => to_liquid(patch_details),
-        'pr_number' => prnum == 'false' ? nil : prnum,
         'projects' => projects
       }
       logger.info 'Writing /index.html...'
@@ -70,7 +68,8 @@ def to_liquid(details)
         'execution_time' => details.execution_time,
         'jdk_info' => details.jdk_version,
         'locale' => details.language,
-        'config_url' => 'todo'
+        'config_url' => 'todo',  # todo
+        'pr_number' => details.pull_request
       }
     end
   end

lib/pmdtester/pmd_branch_detail.rb

@@ -29,8 +29,10 @@ def initialize(branch_name)
       @execution_time = 0
       # the result of command 'java -version' is going to stderr
       @jdk_version = Cmd.stderr_of('java -version')
-      @language = ENV['LANG']
-      @pull_request = ENV['TRAVIS_PULL_REQUEST']
+      @language = ENV['LANG'] # the locale
+
+      prnum = ENV[PR_NUM_ENV_VAR]
+      @pull_request = prnum == 'false' ? nil : prnum
     end
 
     def self.load(branch_name, logger)

resources/project_index.html

@@ -29,8 +29,8 @@ <h2>Branch details</h2>
                     <td><a href="{{base.tree_url}}">{{base.name}} {{ base.tip.sha | truncate: 8, "" }}</a>: {{ base.tip.message }}</td>
                     <td>
                         <a href="{{patch.tree_url}}">{{patch.name}} {{ patch.tip.sha | truncate: 8, "" }}</a>: {{ patch.tip.message }}
-                        {% if pr_number %}
-                        <span class="external-link-secondary"><a href="https://github.com/pmd/pmd/pull/{{pr_number}}">PR #{{pr_number}}</a></span>
+                        {% if patch.pr_number %}
+                        <span class="external-link-secondary"><a href="https://github.com/pmd/pmd/pull/{{patch.pr_number}}">PR #{{patch.pr_number}}</a></span>
                         {% endif %}
                         <span class="external-link-secondary"><a href="{{ comparison_url }}">[Compare]</a></span>
                     </td>

test/resources/summary_report_builder/expected_index.html

@@ -29,7 +29,7 @@ <h2>Branch details</h2>
                     <td><a href="https://github.com/pmd/pmd/tree/test sha">test_branch test sha</a>: test message</td>
                     <td>
                         <a href="https://github.com/pmd/pmd/tree/test sha">test_branch test sha</a>: test message
-
+                        <span class="external-link-secondary"><a href="https://github.com/pmd/pmd/pull/42">PR #42</a></span>
                         <span class="external-link-secondary"><a href="">[Compare]</a></span>
                     </td>
                 </tr>

test/test_pmd_branch_detail.rb

@@ -5,15 +5,15 @@
 # Unit test class for PmdTester::PmdBranchDetail
 class TestPmdBranchDetail < Test::Unit::TestCase
   def setup
-    @old_pr = ENV['TRAVIS_PULL_REQUEST']
+    @old_pr = ENV[PmdTester::PR_NUM_ENV_VAR]
   end
 
   def cleanup
-    ENV['TRAVIS_PULL_REQUEST'] = @old_pr
+    ENV[PmdTester::PR_NUM_ENV_VAR] = @old_pr
   end
 
   def test_save_and_load
-    ENV['TRAVIS_PULL_REQUEST'] = '1234'
+    ENV[PmdTester::PR_NUM_ENV_VAR] = '1234'
     details = PmdTester::PmdBranchDetail.new('test_branch')
     details.branch_last_message = 'test message'
     details.branch_last_sha = 'test sha'