1.0.15

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -4,7 +4,7 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
   - security
@@ -19,45 +19,71 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
+    - npmci command npm install --production --ignore-scripts
-    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command snyk test
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
-  - notpriv
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - notpriv
+
+testBuild:
+  stage: test
+  script:
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+    - docker
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm publish
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -67,11 +93,15 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -82,18 +112,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,76 +0,0 @@
-# @pushrocks/smartgit
-smart wrapper for nodegit
-
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartgit)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartgit)
-* [github.com (source mirror)](https://github.com/pushrocks/smartgit)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartgit/)
-
-## Status for master
-[![build status](https://gitlab.com/pushrocks/smartgit/badges/master/build.svg)](https://gitlab.com/pushrocks/smartgit/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smartgit/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartgit/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartgit.svg)](https://www.npmjs.com/package/@pushrocks/smartgit)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartgit/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartgit)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-
-## Usage
-
-We recommend the use of TypeScript for best in class intellisense
-
-```javascript
-// import smartgit:
-import { GitRepo } from 'smartgit';
-
-// Initialize smartgit:
-// -- note: there are 3 ways to initialize smartgit
-// -- -- 1. with a existing Git repo
-// -- -- 2. with a cloned Git repo
-// -- -- 3. with a new Git repo
-
-// -- 1. existing Git Repo:
-let myExistingGitRepo = new GitRepo('/path/to/existing/git/repo/');
-
-// -- 2. cloned Git Repo:
-let myClonedGitRepo: GitRepo;
-smartgit.createRepoFromClone('git@github.com:username/reponame.git').then(gitRepo => {
-  // non blocking
-  myClonedGitRepo = gitRepo;
-});
-
-// -- 3. new Git Repo
-let myNewGitRepo: GitRepo;
-smartgit
-  .createRepoFromInit('/path/to/new/folder') // smartgit will create any new folder, be careful
-  .then(gitRepo => {
-    // non blocking
-    myNewGitRepo = gitRepo;
-  });
-
-// Using smartgit instance
-// -- most used actions
-// -- all actions return promises, so make sure to use promise chaining for any dependent tasks
-myExistingGitRepo.addAll(); // returns promise, stages all changed files
-myExistingGitRepo.add(['relative/path/to/file.txt', 'another/file2.txt']); // returns promise, stages specific files
-myExistingGitRepo.commit('my commit message'); // returns promise, commits staged files
-myExistingGitRepo
-  .status() // returns promise
-  .then(status => {
-    // Use TypeScript for status type information
-  });
-myExistingGitRepo.check(); // returns promise, checks repo health
-myExistingGitRepo.remoteAdd('git@github.com:username/reponame.git');
-```
-
-Tip: use [smartssh](https://npmjs.com/smartssh) to setup your SSH environment
-
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
-
-For further information read the linked docs at the top of this readme.
-
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
-
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)

npmextra.json

@@ -5,11 +5,11 @@
     "coverageTreshold": 71
   },
   "npmci": {
-    "globalNpmTools": [
+    "npmGlobalTools": [],
-      "npmts"
+    "npmAccessLevel": "public"
-    ]
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,9 +1,9 @@
 {
   "name": "@pushrocks/smartgit",
-  "version": "1.0.8",
+  "version": "1.0.15",
   "description": "smart wrapper for nodegit",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
     "build": "(tsbuild)"
@@ -24,31 +24,36 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartgit",
   "dependencies": {
-    "@pushrocks/smartfile": "^7.0.2",
+    "@pushrocks/smartfile": "^8.0.0",
-    "@pushrocks/smartpath": "^4.0.1",
+    "@pushrocks/smartpath": "^4.0.3",
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartshell": "^2.0.23",
+    "@pushrocks/smartshell": "^2.0.26",
-    "@pushrocks/smartstring": "^3.0.10",
+    "@pushrocks/smartstring": "^3.0.18",
     "@types/minimatch": "^3.0.3",
-    "@types/nodegit": "^0.24.8",
+    "@types/nodegit": "^0.26.7",
-    "nodegit": "^0.24.3"
+    "nodegit": "^0.27.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.24",
+    "@gitzone/tstest": "^1.0.44",
-    "@pushrocks/tapbundle": "^3.0.9",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "tslint": "^5.17.0",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "private": false,
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "assets/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

test/test.ts

@@ -1,4 +1,12 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 import * as smartgit from '../ts/index';
 
+import * as path from 'path';
+
+const testRepoDir = path.join(__dirname, '../.nogit/testrepo');
+
+tap.test('should create a new repo at .nogit', async () => {
+  const gitRepo = await smartgit.GitRepo.fromCreatingRepoInDir(testRepoDir);
+});
+
 tap.start();

ts/smartgit.classes.gitrepo.ts

@@ -8,22 +8,22 @@ export class GitRepo {
   /**
    * creates a new GitRepo Instance after cloning a project
    */
-  public static async createRepoFromClone(fromArg: string, toArg: string): Promise<GitRepo> {
+  public static async fromCloningIntoDir(fromArg: string, toArg: string): Promise<GitRepo> {
     const dirArg = plugins.path.resolve(toArg);
     const ngRespository = await plugins.nodegit.Clone.clone(fromArg, toArg, {
       bare: 0,
-      checkoutBranch: 'master'
+      checkoutBranch: 'master',
     });
     return new GitRepo(ngRespository);
   }
 
-  public static async createNewRepoInDir(dirArg: string): Promise<GitRepo> {
+  public static async fromCreatingRepoInDir(dirArg: string): Promise<GitRepo> {
     dirArg = plugins.path.resolve(dirArg);
     const ngRepository = await plugins.nodegit.Repository.init(dirArg, 0);
     return new GitRepo(ngRepository);
   }
 
-  public static async openRepoAt(dirArg: string) {
+  public static async fromOpeningRepoDir(dirArg: string) {
     dirArg = plugins.path.resolve(dirArg);
     const ngRepository = await plugins.nodegit.Repository.open(dirArg);
     return new GitRepo(ngRepository);
@@ -39,16 +39,36 @@ export class GitRepo {
   /**
    * lists remotes
    */
-  public async listRemotes(): Promise<string[]> {
+  public async listRemotes(): Promise<plugins.nodegit.Remote[]> {
     return this.nodegitRepo.getRemotes();
   }
 
+  /**
+   * ensures the existance of a remote within a repository
+   * @param remoteNameArg
+   * @param remoteUrlArg
+   */
+  public async ensureRemote(remoteNameArg: string, remoteUrlArg: string): Promise<void> {
+    const existingUrl = await this.getUrlForRemote(remoteNameArg);
+    if (existingUrl === remoteUrlArg) {
+      return;
+    }
+    if (existingUrl) {
+      await plugins.nodegit.Remote.delete(this.nodegitRepo, remoteNameArg);
+    }
+    await plugins.nodegit.Remote.create(this.nodegitRepo, remoteNameArg, remoteUrlArg);
+  }
+
   /**
    * gets the url for a specific remote
    */
-  public async getUrlForRemote(remoteName: string) {
+  public async getUrlForRemote(remoteName: string): Promise<string> {
     const ngRemote = await this.nodegitRepo.getRemote(remoteName);
-    return ngRemote.url;
+    if (ngRemote) {
+      return ngRemote.url();
+    } else {
+      return null;
+    }
   }
 
   public async pushBranchToRemote(branchName: string, remoteName: string) {

ts/smartgit.plugins.ts

@@ -11,6 +11,6 @@ import * as smartstring from '@pushrocks/smartstring';
 export { smartfile, smartpath, smartpromise, smartstring };
 
 // third party
-import * as nodegit from 'nodegit';
+import nodegit from 'nodegit';
 
 export { nodegit };