Skip to content

Commit 1fca61c

Browse files
Merge pull request #238 from cnescatlab/develop
Remove shell (#237)
2 parents 5ce536e + d5a1a85 commit 1fca61c

File tree

196 files changed

+14
-34665
lines changed

Some content is hidden

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

196 files changed

+14
-34665
lines changed

.github/workflows/java-continuous-integration.yml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,43 +41,3 @@ jobs:
4141
restore-keys: ${{ runner.os }}-yarn-
4242
- name: Build with Maven
4343
run: mvn -B clean install
44-
code-analysis:
45-
runs-on: ubuntu-latest
46-
name: SonarCloud Code Analysis
47-
# It's not possible to launch an analysis on external pull requests
48-
if: ${{ github.repository_owner == 'cnescatlab' }}
49-
steps:
50-
- name: Check out repository code
51-
uses: actions/checkout@v2
52-
with:
53-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
54-
- name: Setup java
55-
uses: actions/setup-java@v2
56-
with:
57-
distribution: 'adopt'
58-
java-version: '11'
59-
- name: Cache Maven packages
60-
uses: actions/cache@v2
61-
with:
62-
path: ~/.m2
63-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
64-
restore-keys: ${{ runner.os }}-m2
65-
- name: Cache node_modules
66-
uses: actions/cache@v2
67-
with:
68-
path: node_modules
69-
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
70-
restore-keys: ${{ runner.os }}-yarn-
71-
- name: Cache SonarCloud packages
72-
uses: actions/cache@v2
73-
with:
74-
path: ~/.sonar/cache
75-
key: ${{ runner.os }}-sonar
76-
restore-keys: ${{ runner.os }}-sonar
77-
- name: Build and analyze
78-
env:
79-
# Needed to get some information about the pull request, if any
80-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81-
# SonarCloud access token should be generated from https://sonarcloud.io/account/security/
82-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
83-
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.organization=lequal -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![SonarQube Coverage](https://sonarcloud.io/api/project_badges/measure?project=lequal_i-CodeCNES&metric=coverage)](https://sonarcloud.io/component_measures?id=lequal_i-CodeCNES&metric=Coverage)
77
[![SonarQube Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=lequal_i-CodeCNES&metric=sqale_index)](https://sonarcloud.io/component_measures?id=lequal_i-CodeCNES&metric=Maintainability)
88

9-
i-Code CNES is a static code analysis tool to help developers write code compliant with CNES coding rules for Fortran 77, Fortran 90 and Shell.
9+
i-Code CNES is a static code analysis tool to help developers write code compliant with CNES coding rules for Fortran 77 and Fortran 90 .
1010

1111
All the information on CNES standards coverage, and rules availabilities and limitations can be read in the [documentation](https://github.com/cnescatlab/i-CodeCNES/wiki).
1212

@@ -49,7 +49,7 @@ Refer to SonarQube documentation to know how to install a standard SonarQube plu
4949
Use `icode -h` to get the following help about *i-Code*:
5050
```
5151
usage: icode [<FILE> [...]] [-c <arg>] [-e] [-f <arg>] [-h] [-l] [-o <arg>] [-p <arg>] [-q <arg>] [-r] [-v] [-x <arg>]
52-
Analyze Shell, F77 & F90 code to find defects & bugs.
52+
Analyze F77 & F90 code to find defects & bugs.
5353
5454
-c,--checked-languages <arg> Comma separated list of languages checked during analysis. All by default.
5555
-e,--exporters Display all available exporters.

icode-app/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@
5050
<version>${icode.version}</version>
5151
<scope>test</scope>
5252
</dependency>
53-
<dependency>
54-
<groupId>fr.cnes.icode</groupId>
55-
<artifactId>shell-language</artifactId>
56-
<version>${icode.version}</version>
57-
<scope>test</scope>
58-
</dependency>
5953
</dependencies>
6054

6155
<build>

icode-app/src/main/java/fr/cnes/icode/application/CommandLineManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public boolean parse(final String[] pArgs) {
147147
// If help option is present we print it.
148148
if(!areOptionsCorrect || commandLine.hasOption(HELP)) {
149149
helpFormatter.printHelp(128, "icode [<FILE> [...]]",
150-
"Analyze Shell, F77 & F90 code to find defects & bugs.\n\n", options,
150+
"Analyze F77 & F90 code to find defects & bugs.\n\n", options,
151151
"\n\nPlease report issues at https://github.com/cnescatlab/i-CodeCNES/issues", true);
152152
// If version option is present, version information are displayed.
153153
} else if (commandLine.hasOption(VERSION)) {

icode-app/src/test/java/fr/cnes/icode/application/ICodeApplicationTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public void testSupportedLanguages() {
4242
assertFalse(icodeLog.contains("+ C++"));
4343
assertFalse(icodeLog.contains("+ C"));
4444
assertFalse(icodeLog.contains("+ Python"));
45-
assertTrue(icodeLog.contains("+ Shell"));
4645
assertTrue(icodeLog.contains("+ Fortran 77"));
4746
assertTrue(icodeLog.contains("+ Fortran 90"));
4847

icode-ide/fr.cnes.analysis.tools.ui/plugin.xml

Lines changed: 0 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,6 @@
249249
id="fr.cnes.analysis.tools.ui.editors.EditorFortran"
250250
name="Fortran Editor">
251251
</editor>
252-
<editor
253-
class="fr.cnes.analysis.tools.ui.editors.EditorShell"
254-
contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
255-
default="false"
256-
extensions="sh,ksh"
257-
icon="icons/shell.png"
258-
id="fr.cnes.analysis.tools.ui.editors.EditorShell"
259-
name="Shell editor">
260-
</editor>
261252
</extension>
262253
<extension point="org.eclipse.core.resources.markers" id="fr.cnes.analysis.tools.ui.markers.ViolationWarningMarker"
263254
name="i-Code CNES Violation Warning">
@@ -327,34 +318,6 @@
327318
minValue="20"
328319
name="F90.MET.RatioComment.D">
329320
</checkConfiguration>
330-
<checkConfiguration
331-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETComplexitySimplified"
332-
description="McCabe simplfied number should not exceed 20."
333-
enabled="true"
334-
maxValue="20"
335-
name="SH.MET.ComplexitySimplified.D">
336-
</checkConfiguration>
337-
<checkConfiguration
338-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETLineOfCode"
339-
description="Number of line of a function (without blank and comment lines) should not exceed 100."
340-
enabled="true"
341-
maxValue="100"
342-
name="SH.MET.LineOfCode.D">
343-
</checkConfiguration>
344-
<checkConfiguration
345-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETNesting"
346-
description="Nesting of a control structure should not exceed 7."
347-
enabled="true"
348-
maxValue="7"
349-
name="SH.MET.Nesting.D">
350-
</checkConfiguration>
351-
<checkConfiguration
352-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETRatioComment"
353-
description="Comment Ratio (commentlines/(totalLines+commentLines)) must not be below 20%."
354-
enabled="true"
355-
minValue="20"
356-
name="SH.MET.RatioComment.D">
357-
</checkConfiguration>
358321
</configuration>
359322
<configuration
360323
description="Configuration defined by RNC-CNES-Q-HB-80-501 class C"
@@ -415,34 +378,6 @@
415378
minValue="20"
416379
name="F90.MET.RatioComment.C">
417380
</checkConfiguration>
418-
<checkConfiguration
419-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETComplexitySimplified"
420-
description="McCabe simplfied number should not exceed 12."
421-
enabled="true"
422-
maxValue="12"
423-
name="SH.MET.ComplexitySimplified.C">
424-
</checkConfiguration>
425-
<checkConfiguration
426-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETLineOfCode"
427-
description="Number of line of a function (without blank and comment lines) should not exceed 80."
428-
enabled="true"
429-
maxValue="80"
430-
name="SH.MET.LineOfCode.C">
431-
</checkConfiguration>
432-
<checkConfiguration
433-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETNesting"
434-
description="Nesting of a control structure should not exceed 6."
435-
enabled="true"
436-
maxValue="6"
437-
name="SH.MET.Nesting.C">
438-
</checkConfiguration>
439-
<checkConfiguration
440-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETRatioComment"
441-
description="Comment Ratio (commentlines/(totalLines+commentLines)) must not be below 20%."
442-
enabled="true"
443-
minValue="20"
444-
name="SH.MET.RatioComment.C">
445-
</checkConfiguration>
446381
</configuration>
447382
<configuration
448383
description="Configuration defined by RNC-CNES-Q-HB-80-501 class B"
@@ -503,34 +438,6 @@
503438
minValue="30"
504439
name="F90.MET.RatioComment.B">
505440
</checkConfiguration>
506-
<checkConfiguration
507-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETComplexitySimplified"
508-
description="McCabe simplfied number should not exceed 10."
509-
enabled="true"
510-
maxValue="10"
511-
name="SH.MET.ComplexitySimplified.B">
512-
</checkConfiguration>
513-
<checkConfiguration
514-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETLineOfCode"
515-
description="Number of line of a function (without blank and comment lines) should not exceed 60."
516-
enabled="true"
517-
maxValue="60"
518-
name="SH.MET.LineOfCode.B">
519-
</checkConfiguration>
520-
<checkConfiguration
521-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETNesting"
522-
description="Nesting of a control structure should not exceed 5."
523-
enabled="true"
524-
maxValue="5"
525-
name="SH.MET.Nesting.B">
526-
</checkConfiguration>
527-
<checkConfiguration
528-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETRatioComment"
529-
description="Comment Ratio (commentlines/(totalLines+commentLines)) must not be below 30%"
530-
enabled="true"
531-
minValue="30"
532-
name="SH.MET.RatioComment.B">
533-
</checkConfiguration>
534441
</configuration>
535442
<configuration
536443
description="Configuration defined by RNC-CNES-Q-HB-80-501 class A"
@@ -591,34 +498,6 @@
591498
minValue="30"
592499
name="F90.MET.RatioComment.A">
593500
</checkConfiguration>
594-
<checkConfiguration
595-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETComplexitySimplified"
596-
description="McCabe simplfied number should not exceed 10."
597-
enabled="true"
598-
maxValue="10"
599-
name="SH.MET.ComplexitySimplified.A">
600-
</checkConfiguration>
601-
<checkConfiguration
602-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETLineOfCode"
603-
description="Number of line of a function (without blank and comment lines) should not exceed 60."
604-
enabled="true"
605-
maxValue="60"
606-
name="SH.MET.LineOfCode.A">
607-
</checkConfiguration>
608-
<checkConfiguration
609-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETNesting"
610-
description="Nesting of a control structure should not exceed 5."
611-
enabled="true"
612-
maxValue="5"
613-
name="SH.MET.Nesting.A">
614-
</checkConfiguration>
615-
<checkConfiguration
616-
checkId="fr.cnes.analysis.tools.shell.metrics.SHMETRatioComment"
617-
description="Comment Ratio (commentlines/(totalLines+commentLines)) must not be below 30%"
618-
enabled="true"
619-
minValue="30"
620-
name="SH.MET.RatioComment.A">
621-
</checkConfiguration>
622501
</configuration>
623502
</extension>
624503
<extension point="org.eclipse.ui.editors.markerAnnotationSpecification"

icode-ide/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/editors/EditorShell.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

icode-ide/fr.cnes.icode.repository/icode-ide.product

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@
4141
<plugin id="fr.cnes.analysis.tools.fortran90.metrics"/>
4242
<plugin id="fr.cnes.analysis.tools.fortran90.rules"/>
4343
<plugin id="fr.cnes.analysis.tools.fortran90.ui"/>
44-
<plugin id="fr.cnes.analysis.tools.shell.analyzer"/>
45-
<plugin id="fr.cnes.analysis.tools.shell.metrics"/>
46-
<plugin id="fr.cnes.analysis.tools.shell.rules"/>
47-
<plugin id="fr.cnes.analysis.tools.shell.ui"/>
4844
<plugin id="fr.cnes.analysis.tools.ui"/>
4945
</plugins>
5046

icode-ide/icode-library-plugin/META-INF/MANIFEST.MF

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ Export-Package: com.google.common.annotations,
3838
fr.cnes.icode.services.export,
3939
fr.cnes.icode.services.export.exception,
4040
fr.cnes.icode.services.languages,
41-
fr.cnes.icode.shell,
42-
fr.cnes.icode.shell.metrics,
43-
fr.cnes.icode.shell.rules,
4441
javassist,
4542
javassist.bytecode,
4643
javassist.bytecode.analysis,

icode-library/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,6 @@
5252
<artifactId>fortran90-rules</artifactId>
5353
<version>${icode.version}</version>
5454
</dependency>
55-
<dependency>
56-
<groupId>fr.cnes.icode</groupId>
57-
<artifactId>shell-language</artifactId>
58-
<version>${icode.version}</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>fr.cnes.icode</groupId>
62-
<artifactId>shell-metrics</artifactId>
63-
<version>${icode.version}</version>
64-
</dependency>
65-
<dependency>
66-
<groupId>fr.cnes.icode</groupId>
67-
<artifactId>shell-rules</artifactId>
68-
<version>${icode.version}</version>
69-
</dependency>
7055
</dependencies>
7156

7257
<build>

0 commit comments

Comments
 (0)