fix: remote url is ssh

DXHeroes · Aug 19, 2019 · f9d57bc · f9d57bc
1 parent 107b194
commit f9d57bc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/src/contexts/projectComponent/ProjectComponentContext.ts b/src/contexts/projectComponent/ProjectComponentContext.ts
@@ -2,10 +2,9 @@ import { injectable, inject } from 'inversify';
 import { Types, PracticeContextFactory } from '../../types';
 import { ProgrammingLanguage, ProjectComponent } from '../../model';
 import { PracticeContext } from '../practice/PracticeContext';
-import { ContextBase } from '../ContextBase';
 
 @injectable()
-export class ProjectComponentContext extends ContextBase {
+export class ProjectComponentContext {
   readonly projectComponent: ProjectComponent;
   get path(): string {
     return this.projectComponent.path;
@@ -19,15 +18,10 @@ export class ProjectComponentContext extends ContextBase {
     @inject(Types.ProjectComponent) projectComponent: ProjectComponent,
     @inject(Types.PracticeContextFactory) practiceContextFactory: PracticeContextFactory,
   ) {
-    super();
     this.projectComponent = projectComponent;
     this.practiceContextFactory = practiceContextFactory;
   }
 
-  async init(): Promise<void> {
-    throw new Error('Method not implemented.');
-  }
-
   getPracticeContext(): PracticeContext {
     return this.practiceContextFactory(this.projectComponent);
   }

diff --git a/src/scanner/Scanner.ts b/src/scanner/Scanner.ts
@@ -141,7 +141,6 @@ export class Scanner {
     const practicesWithContext: PracticeWithContext[] = [];
     for (const componentWithCtx of componentsWithContext) {
       const componentContext = componentWithCtx.languageContext.getProjectComponentContext(componentWithCtx.component);
-      await componentContext.init();
       const practiceContext = componentContext.getPracticeContext();
 
       const applicablePractices = await filterAsync(this.practices, async (p) => {

diff --git a/src/services/git/Git.ts b/src/services/git/Git.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/explicit-member-accessibility */
 import { Repository } from '../../model';
 import { GitHubClient } from './GitHubClient';
 import { GitHubUrlParser } from './GitHubUrlParser';
@@ -20,7 +19,6 @@ export class Git {
     this.cache = cache;
   }
 
-  //should be explicit-member-accessibility disabled? There is just a warning
   async listDirectory(path: string): Promise<(GitHubFile | GitHubDir)[]> {
     return this.cache.getOrSet(this.contentCacheKey(path), async () => {
       const params = GitHubUrlParser.getOwnerAndRepoName(this.repository.url);

diff --git a/src/services/git/GitHubUrlParser.ts b/src/services/git/GitHubUrlParser.ts
@@ -1,19 +1,12 @@
-import { ErrorFactory } from '../../lib/errors/ErrorFactory';
-
-/* eslint-disable @typescript-eslint/explicit-member-accessibility */
+import gitUrlParse from 'git-url-parse';
 
 export class GitHubUrlParser {
-  public static getOwnerAndRepoName(url: string): { owner: string; repoName: string } {
-    url = url.replace('http://', '');
-    url = url.replace('https://', '');
-    const urlTokens = url.split('/');
-    if (urlTokens.length !== 3) {
-      throw ErrorFactory.newInternalError(`Malformed github url: ${url}`);
-    }
-    const repoName = urlTokens[2].endsWith('.git') ? urlTokens[2].replace('.git', '') : urlTokens[2];
+  static getOwnerAndRepoName(url: string): { owner: string; repoName: string } {
+    const parsedUrl = gitUrlParse(url);
+
     return {
-      owner: urlTokens[1],
-      repoName,
+      owner: parsedUrl.owner,
+      repoName: parsedUrl.name,
     };
   }
 }