1.0.15

.gitignore

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

.gitlab-ci.yml

@@ -1,10 +1,10 @@
 # gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
   - security
@@ -19,38 +19,41 @@ 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 --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - 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:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+testStable:
   stage: test
   script:
     - npmci npm prepare
@@ -60,7 +63,17 @@ testSTABLE:
   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
@@ -70,6 +83,7 @@ release:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -79,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
 
@@ -94,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:

.travis.yml

@@ -1,19 +0,0 @@
-language: node_js
-node_js:
-- 4
-- stable
-before_install:
-- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-- sudo apt-get update
-- sudo apt-get install libstdc++-4.9-dev -y
-deploy:
-  provider: npm
-  email: npm@lossless.digital
-  api_key:
-    secure: o/3H4keWRAvHZaJnUN9UX+hqu+prKGtBsOEWVIaRXUpf6nIHIDm9zlJrS5cv2VUseOZqLAOkzeGYPqlOJlxccy5frKEYMhtCY97BjKvUOf01roL82OGiahw5Bv04NcaBoSepCliyyXihlgZO/5tSoR1seY4ycul2qWLktaEmh8HcTPjem8gB49Svpfk8yPKLpq6cv/sSakt2X24Cq+vfdxYiz7GcgBfv3EVAndUmQ9KMQfkSbq8XgYEZKrLi5kdpXX0y1LRdsbn2rwuMwLOmefCenmQSuBCbYmbOxPgVHHHjVm9To/rhx8YHBCcZSH9go2pdDLwrd7VPOCK+vMHCz/rlASwVM/BGr+aJHCFLAyovrIU7cvbbjLPOUjto6xY2XckMmDBD1YDxYnAJAON1QrdXE9hVVRfMNfaC2leFAwhla1WMok5DcEv+/Q9cUXQCBGQHtBhkhmCCt54ERLFnjXCDZr1icR/0lhtQY54hin5jSHqnU2hTZtTpQX7sF0yZM2sbhTBpV5FTDAGH/ohNWSEnTwAXmL9iwZCTvtWUbBeOUSDRj8BLS54uiaIcIVytNY0p2PdnhwJAWO+4FGjSOT+RuK8RiKzyVXjPiX8TCzaOqBFs947m8SSNMSt6zyqOI27gOSzU7szgsKY769Fl+X9sdzFXaSa72rj4EdvgiBA=
-  on:
-    tags: true
-    repo: pushrocks/smartgit
-notifications:
-  slack:
-    secure: f5Uss0z9RPl/QcA/DroB8loyE93aOYI6bqCkrsiUscmZtlv/TVQtT4dxqGA6uvcG6iTQDBi3Ul88dQxWkRm4IqbhY35/iMaV2dHW4FVYMAh8GQMbsfL2sALCcufxD9blw47awv3iFcwhV1EeyesscjgL0JIjduk96v/7G/6QIO2838M1lzlgtj+kRUkim8qkaEs1je3gRrhMUIjLuAdscMXyUKYFMjWo9ACSjVUl30R/ZNemb18itIja6i92GotreBgcfEMczvy58ovDC7xdJUsY8LjMI01DwY+WPRnI0tAhsuI8moBwwcdM4e3bAjKjucQRjO33O5bMWRZ6QCiYd0DnCEFyCPQLJ4GSy/tkD00n8ijLHAOSV3AH1zNbdK1EAdSPQXDvlI36KJn/2hyQLoitGHVUPr76ujJWP82ypO2tgIp3XQU0dJVCxDuHnwJO2+hjdI+gCPqxNTpjeujHx3UdkTGNRjuuf9dlZ/D08fApjYxy2fxItTqo3QjP/nrqvBXUOPP8yPHpjIT4H2t5Pr4SJjBGI6X4qhKyFj6s9rA/Xu1rL+45zu1C3uC3z+u3T9UwrbzJ/cZM6r6UQvQmUvIfBNaMlg4I/diQCDIPL+Rhop2nylY3IcHmJnk2itn7kOqj1tohCpFEml5pRuSZy4udWywkdtyBAsHWFLF7oiQ=

.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"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Push.Rocks
+Copyright (c) 2015 Lossless GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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)

index.js

@@ -1,90 +0,0 @@
-/// <reference path="./index.ts" />
-var SmartgitPlugins;
-(function (SmartgitPlugins) {
-    SmartgitPlugins.init = function () {
-        var plugins = {
-            path: require("path"),
-            beautylog: require("beautylog"),
-            nodegit: require("nodegit"),
-            Q: require("q")
-        };
-        return plugins;
-    };
-})(SmartgitPlugins || (SmartgitPlugins = {}));
-/// <reference path="./index.ts" />
-var SmartgitClone;
-(function (SmartgitClone) {
-    function init() {
-        var clone = function (options) {
-            /***** URL Checks ******/
-            if (options.from == "undefined" || options.to == "undefined") {
-                plugins.beautylog.error("smartgit.clone".blue + " : Something is strange about the way you invoked the function");
-                return;
-            }
-            /***** Path Checks ******/
-            if (!/^\/.*/.test(options.to)) {
-                plugins.beautylog.error("It seems that the given path " + options.to + " is not absolute.");
-                return;
-            }
-            plugins.beautylog.log("Now cloning " + options.from);
-            var cloneOptions = {};
-            var cloneRepository = plugins.nodegit.Clone(options.from, options.to, cloneOptions);
-            smartgit.check(cloneRepository);
-        };
-        return clone;
-    }
-    SmartgitClone.init = init;
-})(SmartgitClone || (SmartgitClone = {}));
-/// <reference path="./index.ts" />
-var SmartgitInit;
-(function (SmartgitInit) {
-    SmartgitInit.init = function () {
-        var gitinit = function (dest) {
-            if (dest === void 0) { dest = "undefined"; }
-            if (dest == "undefined") {
-                return; // ...and return function here if not
-            }
-            var isBare = 0; //lets create a subfolder
-            plugins.nodegit.Repository.init(dest, isBare).then(function (repo) {
-                // do something with repo here.
-            });
-        };
-        return gitinit;
-    };
-})(SmartgitInit || (SmartgitInit = {}));
-/// <reference path="./index.ts" />
-var SmartgitCommit;
-(function (SmartgitCommit) {
-    SmartgitCommit.init = function () {
-        var commit = function (pathArg, commitMessage) {
-            var result = plugins.nodegit.index.addByPath(pathArg);
-            if (result == 0) {
-            }
-        };
-        return commit;
-    };
-})(SmartgitCommit || (SmartgitCommit = {}));
-/// <reference path="./index.ts" />
-var SmartgitCheck;
-(function (SmartgitCheck) {
-    SmartgitCheck.init = function () {
-        var check = function () {
-            return true;
-        };
-        return check;
-    };
-})(SmartgitCheck || (SmartgitCheck = {}));
-/// <reference path="typings/tsd.d.ts" />
-/// <reference path="smartgit.plugins.ts" />
-/// <reference path="smartgit.clone.ts" />
-/// <reference path="smartgit.init.ts" />
-/// <reference path="smartgit.commit.ts" />
-/// <reference path="smartgit.check.ts" />
-var plugins = SmartgitPlugins.init();
-//Build the smartgit object
-var smartgit = {};
-smartgit.clone = SmartgitClone.init();
-smartgit.commit = SmartgitCommit.init();
-smartgit.check = SmartgitCheck.init();
-smartgit.init = SmartgitInit.init();
-module.exports = smartgit;

npmextra.json

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

package.json

@@ -1,9 +1,9 @@
 {
   "name": "@pushrocks/smartgit",
-  "version": "1.0.6",
+  "version": "1.0.15",
   "description": "smart wrapper for nodegit",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "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/smartpath": "^4.0.1",
-    "@pushrocks/smartpromise": "^3.0.2",
-    "@pushrocks/smartshell": "^2.0.23",
-    "@pushrocks/smartstring": "^3.0.10",
+    "@pushrocks/smartfile": "^8.0.0",
+    "@pushrocks/smartpath": "^4.0.3",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartshell": "^2.0.26",
+    "@pushrocks/smartstring": "^3.0.18",
     "@types/minimatch": "^3.0.3",
-    "@types/nodegit": "^0.24.8",
-    "nodegit": "^0.24.3"
+    "@types/nodegit": "^0.26.7",
+    "nodegit": "^0.27.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
-    "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/tapbundle": "^3.0.9",
-    "tslint": "^5.17.0",
+    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tstest": "^1.0.44",
+    "@pushrocks/tapbundle": "^3.2.9",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "private": false,
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

test.js

@@ -1,9 +0,0 @@
-/// <reference path="typings/tsd.d.ts" />
-var smartgit = require("./index.js");
-var beautylog = require("beautylog");
-var path = require("path");
-smartgit.clone({
-    from: "https://github.com/pushrocks/docs.git",
-    to: path.resolve("./test/temp/")
-});
-beautylog.success("Test successfull");

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/index.ts

@@ -1,28 +1,3 @@
 import plugins = require('./smartgit.plugins');
 
-import { GitRepo } from './smartgit.classes.gitrepo';
-export { GitRepo };
-
-/**
- * creates a new GitRepo Instance after cloning a project
- */
-export const createRepoFromClone = async (fromArg: string, toArg: string): Promise<GitRepo> => {
-  let done = q.defer<GitRepo>();
-  plugins.smartfile.fs.ensureDir(toArg);
-  plugins.shelljs.exec(`git clone ${fromArg} ${toArg}`);
-  let newRepo = new GitRepo(toArg);
-  done.resolve(newRepo);
-  return done.promise;
-};
-
-/**
- * creates a new GitRepo instance after initializing a new Git Repository
- */
-export const createRepoFromInit = async (destinationDirArg: string): Promise<GitRepo> => {
-  const done = q.defer<GitRepo>();
-  plugins.smartfile.fs.ensureDir(destinationDirArg);
-  plugins.shelljs.exec(`cd ${destinationDirArg} && git init`);
-  let newRepo = new GitRepo(destinationDirArg);
-  done.resolve(newRepo);
-  return done.promise;
-};
+export * from './smartgit.classes.gitrepo';

ts/smartgit.classes.gitrepo.ts

@@ -8,17 +8,72 @@ export class GitRepo {
   /**
    * creates a new GitRepo Instance after cloning a project
    */
-  public static async createRepoFromClone(fromArg: string, toArg: string): Promise<GitRepo> {
-    return new 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',
+    });
+    return new GitRepo(ngRespository);
   }
 
-  /**
-   * creates a new GitRepo instance after initializing a new Git Repository
-   */
-  public static async createRepoFromInit(destinationDirArg: string): Promise<GitRepo> {
-    return new 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 fromOpeningRepoDir(dirArg: string) {
+    dirArg = plugins.path.resolve(dirArg);
+    const ngRepository = await plugins.nodegit.Repository.open(dirArg);
+    return new GitRepo(ngRepository);
   }
 
   // INSTANCE
-  nodegitRepo;
+  public nodegitRepo: plugins.nodegit.Repository;
+
+  constructor(nodegitRepoArg: plugins.nodegit.Repository) {
+    this.nodegitRepo = nodegitRepoArg;
+  }
+
+  /**
+   * lists remotes
+   */
+  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): Promise<string> {
+    const ngRemote = await this.nodegitRepo.getRemote(remoteName);
+    if (ngRemote) {
+      return ngRemote.url();
+    } else {
+      return null;
+    }
+  }
+
+  public async pushBranchToRemote(branchName: string, remoteName: string) {
+    await this.nodegitRepo.checkoutBranch(branchName);
+    const ngRemote = await this.nodegitRepo.getRemote(remoteName);
+    ngRemote.push([branchName]);
+  }
 }

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 };