Skip to content

Commit 846b559

Browse files
lyuanwwlyuanww
committed
Resolve conflicts
2 parents 53df74e + ab87c6e commit 846b559

File tree

66 files changed

+525
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+525
-229
lines changed

‎.github/workflows/surge.yml

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
pr: ${{ steps.pr-number.outputs.ACTIONS_PR_NUMBER }}
4747
workflow_conclusion: success
4848
name: reposense-deployment-id
49+
allow_forks: true
4950
path: ./pr
5051

5152
- name: Update PR checklist for surge.sh as in progress

‎build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id 'idea'
77
id 'jacoco'
88
id 'java'
9-
id 'com.github.johnrengelman.shadow' version '7.1.2'
9+
id 'com.github.johnrengelman.shadow' version '8.1.1'
1010
id 'com.liferay.node' version '7.2.18'
1111
id 'com.github.psxpaul.execfork' version '0.2.0'
1212
id 'com.palantir.git-version' version '0.13.0'
@@ -27,7 +27,7 @@ repositories {
2727

2828
configurations {
2929
systemtestImplementation.extendsFrom testImplementation
30-
systemtestRuntime.extendsFrom testRuntime
30+
systemtestRuntime.extendsFrom testRuntimeOnly
3131
}
3232

3333
dependencies {
@@ -255,7 +255,7 @@ tasks.withType(Copy) {
255255
}
256256

257257
jacoco {
258-
toolVersion = "0.8.7"
258+
toolVersion = "0.8.11"
259259
}
260260

261261
jacocoTestReport {
@@ -271,6 +271,7 @@ jacocoTestReport {
271271

272272
tasks.register('coverage', JacocoReport) {
273273
description 'Consolidates coverage data from unit, system, and frontend tests into a comprehensive report.'
274+
dependsOn test, systemtest
274275
}
275276

276277
coverage.configure {

‎config/repo-config.csv

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
Repository's Location,Branch,File formats,Ignore Glob List,Ignore standalone config,Ignore Commits List,Ignore Authors List,Shallow Cloning,Find Previous Authors
2-
https://github.com/reposense/testrepo-Alpha.git,master,,,,2fb6b9b2dd9fa40bf0f9815da2cb0ae8731436c7;c5a6dc774e22099cd9ddeb0faff1e75f9cf4f151;cd7f610e0becbdf331d5231887d8010a689f87c7;768015345e70f06add2a8b7d1f901dc07bf70582,,,
3-
https://github.com/reposense/testrepo-Beta.git,master,fxml,docs**,yes,,,,
4-
https://github.com/reposense/testrepo-Beta.git,add-config-json,fxml,docs**,yes,,,,
5-
https://github.com/reposense/testrepo-Delta.git,master,override:java;md,,,,,,
6-
https://github.com/reposense/testrepo-Delta.git,nonExistentBranch,,,,,,,
7-
https://github.com/reposense/testrepo-Delta.git,add-binary-file,,,,,,,
8-
https://github.com/reposense/RepoSense.git,master,,,,,,,
9-
https://github.com/reposense/testrepo-Empty.git,master,,,,,,,
10-
ftp://github.com/reposense/RepoSense.git,master,,,,,,,
11-
https://bitbucket.org/skyblaise/testrepo-bitbucket.git,master,,,,,,,
12-
https://gitlab.com/reposense/testrepo-gitlab.git,main,,,,,,,
13-
https://[email protected]/p/repo-sense-test-repo/code,master,,,,,,,
1+
Repository's Location,Branch,File formats,Ignore Glob List,Ignore standalone config,Ignore Commits List,Ignore Authors List,Shallow Cloning,Find Previous Authors,Since Date,Until Date
2+
https://github.com/reposense/testrepo-Alpha.git,master,,,,2fb6b9b2dd9fa40bf0f9815da2cb0ae8731436c7;c5a6dc774e22099cd9ddeb0faff1e75f9cf4f151;cd7f610e0becbdf331d5231887d8010a689f87c7;768015345e70f06add2a8b7d1f901dc07bf70582,,,,,
3+
https://github.com/reposense/testrepo-Beta.git,master,fxml,docs**,yes,,,,,,
4+
https://github.com/reposense/testrepo-Beta.git,add-config-json,fxml,docs**,yes,,,,,,
5+
https://github.com/reposense/testrepo-Delta.git,master,override:java;md,,,,,,,,
6+
https://github.com/reposense/testrepo-Delta.git,nonExistentBranch,,,,,,,,,
7+
https://github.com/reposense/testrepo-Delta.git,add-binary-file,,,,,,,,,
8+
https://github.com/reposense/RepoSense.git,master,,,,,,,,,
9+
https://github.com/reposense/testrepo-Empty.git,master,,,,,,,,,
10+
ftp://github.com/reposense/RepoSense.git,master,,,,,,,,,
11+
https://bitbucket.org/skyblaise/testrepo-bitbucket.git,master,,,,,,,,,
12+
https://gitlab.com/reposense/testrepo-gitlab.git,main,,,,,,,,,
13+
https://[email protected]/p/repo-sense-test-repo/code,master,,,,,,,,,

‎docs/_markbind/layouts/ug-sitenav.md

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
{level: 2, name: "Using `@@author` tags", link: "ug/usingAuthorTags.html"},
1212
{level: 2, name: "RepoSense with Netlify", link: "ug/withNetlify.html"},
1313
{level: 2, name: "RepoSense with GitHub Actions", link: "ug/withGithubActions.html"},
14-
{level: 2, name: "RepoSense with Travis", link: "ug/withTravis.html"},
1514
{level: 2, name: "`run.sh` format", link: "ug/runSh.html"},
1615
{level: 2, name: "FAQ", link: "ug/faq.html"},
1716
{level: 2, name: "Troubleshooting", link: "ug/troubleshooting.html"}

‎docs/dg/learningBasics.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Here are some small tasks for you to gain some basic knowledge of the code relat
111111
```
112112

113113
2. In the `Builder` class within `CliArguments`, add the following method to set `isPrettyPrintingUsed`.
114-
114+
115115
```java
116116
public Builder isPrettyPrintingUsed(boolean isPrettyPrintingUsed) {
117117
this.cliArguments.isPrettyPrintingUsed = isPrettyPrintingUsed;

‎docs/dg/projectManagement.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ We have two versions of the website:
6060
* deployed manually after each new release
6161
1. **Dev website** at https://reposense.org/RepoSense
6262
* matches the latest `master` branch
63-
* deployed automatically by Travis whenever the `master` branch is updated
63+
* deployed automatically by Github Actions whenever the `master` branch is updated
6464

6565
The production website differs from the dev website in some ways, e.g.,
6666

‎docs/ug/cli.md

+10
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,16 @@ credit is given.
210210
* May analyze the incorrect date range if used with `--since d1`. The program will throw a warning.
211211
* Cannot be used with both `--since` and `--until`. The program will throw an exception.
212212
</box>
213+
214+
<!-- ------------------------------------------------------------------------------------------------------ -->
215+
216+
### `--portfolio`, `-P`
217+
218+
**`--portfolio`**: Generates an optimised report for code portfolio pages.
219+
* Default: generates the regular report
220+
* Alias: `-P` (uppercase P)
221+
* Example: `--portfolio` or `-P`
222+
213223
<!-- ------------------------------------------------------------------------------------------------------ -->
214224

215225
### `--repo`, `--repos`, `-r`

‎docs/ug/configFiles.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Given below are the details of the various config files used by RepoSense.
3333

3434
| Column Name | Explanation |
3535
|---------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
36-
| Repository's Location {{ mandatory }} | The `Remote Repo URL` or `Disk Path` to the git repository e.g., `https://github.com/foo/bar.git` or `C:\Users\user\Desktop\GitHub\foo\bar` |
36+
| Repository's Location {{ mandatory }} | The `Remote Repo URL` or `Disk Path` to the Git repository e.g., `https://github.com/foo/bar.git` or `C:\Users\user\Desktop\GitHub\foo\bar` |
3737
| Branch | The branch to analyze in the target repository e.g., `master`. Default: the default branch of the repo |
3838
| File formats<sup>*+</sup> | The file extensions to analyze. Binary file formats, such as `png` and `jpg`, will be automatically labelled as the file type `binary` in the generated report. Default: all file formats |
3939
| Find Previous Authors | Enter **`yes`** to utilize Git blame's ignore revisions functionality, RepoSense will attempt to blame the line changes caused by commits in the ignore commit list to the previous authors who altered those lines (if available). |
@@ -45,6 +45,8 @@ Given below are the details of the various config files used by RepoSense.
4545
| File Size Limit<sup>+</sup> | Enter a file size limit for the repository in bytes as a single number without units (for a size limit of 1MB for example, enter 1000000). This file size limit will override the default file size limit (500KB). Files exceeding the file size limit will be marked as ignored and only the file name and line count will be reflected in the report. |
4646
| Ignore File Size Limit | Enter **`yes`** to ignore both the default file size limit and the file size limit possibly set by the user in `repo-config.csv`. |
4747
| Skip Ignored File Analysis | Enter **`yes`** to ignore analysis of files exceeding the file size limit entirely. If file analysis is skipped, all information about the file will be omitted from the generated report. This option can significantly improve report generation time. |
48+
| Since Date | Enter since date in the format of `yyyy/mm/dd` to signify the start date of analysis. If the field is ignored, the date will be set to the default one or the date indicated in CLI flags |
49+
| Until Date | Enter since date in the format of `yyyy/mm/dd` to signify the end date of analysis. If the field is ignored, the date will be set to the default one or the date indicated in CLI flags |
4850

4951
<box type="info" seamless>
5052
The Shallow Cloning option is incompatible with the "--last-modified-date" CLI flag.

‎docs/ug/generatingReports.md

-4
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,5 @@ For other types of repositories, external links are disabled.
5454

5555
{{ embed("Appendix: **Using RepoSense with GitHub Actions → Setting up**", "withGithubActions.md#section-setting-up") }}
5656

57-
**You can also use travis for deployment.** While there are more work to set up, it is more suitable as a permanent solution due to the generous free tier.
58-
59-
{{ embed("Appendix: **Using RepoSense with Travis → Setting up**", "withTravis.md#section-setting-up") }}
60-
6157
You may also consider using Netlify to deploy your report. **However, we may not support this method going forward.**
6258
{{ embed("Appendix: **Using RepoSense with Netlify → Setting up**", "withNetlify.md#section-setting-up") }}

‎docs/ug/sharingReports.md

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ As RepoSense reports are in a web page format, you can publish a report by simpl
3232

3333
{{ embed("Appendix: **Using RepoSense with GitHub Actions**", "withGithubActions.md") }}
3434

35-
{{ embed("Appendix: **Using RepoSense with Travis**", "withTravis.md") }}
36-
3735
{{ embed("Appendix: **Using RepoSense with Netlify**", "withNetlify.md") }}
3836

3937
<!-- ------------------------------------------------------------------------------------------------------ -->

‎docs/ug/withGithubActions.md

+10-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ You can use [_GitHub Actions_](https://github.com/features/actions) (together wi
1919

2020
## Setting up
2121

22-
<include src="withTravis.md#section-fork-token" />
22+
<box type="info" seamless>
23+
24+
The instructions below assume you are using GitHub pages to host your report.
25+
</box>
26+
27+
{{ step(1)}} **Fork the _publish-RepoSense_ repository** using this [link](https://github.com/RepoSense/publish-RepoSense/fork). Optionally, you can rename the fork to match your RepoSense report e.g., `project-code-dashboard`.
2328

2429
{{ step(2)}} **Activate GitHub Actions on the forked repository:**
2530

@@ -28,7 +33,10 @@ You can use [_GitHub Actions_](https://github.com/features/actions) (together wi
2833

2934
{{ step(3)}} **Update report configuration:**
3035

31-
<include src="withTravis.md#section-edit-configs" />
36+
In your fork, edit `run.sh` (and if applicable, `repo-config.csv`, `author-config.csv`, `group-config.csv`) to customize the command line parameters or repositories to be analyzed.
37+
38+
{{ embed("Appendix: **`run.sh` format**", 'runSh.md') }}
39+
{{ embed("Appendix: **Config files format**", 'configFiles.md') }}
3240

3341
{{ step(4)}} **View the generated report:**
3442

‎docs/ug/withTravis.md

-97
This file was deleted.

‎frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "reposense",
33
"version": "1.0.0",
4-
"description": "[![Build Status](https://travis-ci.org/reposense/RepoSense.svg?branch=master)](https://travis-ci.org/reposense/RepoSense) [![Build status](https://ci.appveyor.com/api/projects/status/gsbkj5qby3pjd6nw/branch/master?svg=true)](https://ci.appveyor.com/project/eugenepeh/reposense/branch/master)",
4+
"description": "[![Build status](https://ci.appveyor.com/api/projects/status/gsbkj5qby3pjd6nw/branch/master?svg=true)](https://ci.appveyor.com/project/eugenepeh/reposense/branch/master)",
55
"author": "",
66
"scripts": {
77
"serve": "vite",

‎frontend/vite.config.mts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import path from 'path';
88
// It needs to be configured for GitHub Pages deployment.
99
const base = process.env.VITE_BASE_DIR
1010
? process.env.VITE_BASE_DIR
11-
: '/';
11+
: '';
1212

1313
// https://vitejs.dev/config/
1414
export default defineConfig({

‎gradle/wrapper/gradle-wrapper.jar

1.71 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎src/main/java/reposense/RepoSense.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static void main(String[] args) {
8585
cliArguments.getNumCloningThreads(), cliArguments.getNumAnalysisThreads(),
8686
TimeUtil::getElapsedTime, cliArguments.getZoneId(), cliArguments.isFreshClonePerformed(),
8787
cliArguments.isAuthorshipAnalyzed(), cliArguments.getOriginalityThreshold(),
88-
blurbMap
88+
blurbMap, cliArguments.isPortfolio()
8989
);
9090

9191
FileUtil.zipFoldersAndFiles(reportFoldersAndFiles, cliArguments.getOutputFilePath().toAbsolutePath(),

0 commit comments

Comments
 (0)