dugite - npm Package Compare versions

Comparing version 1.74.0 to 1.75.0

build/lib/errors.d.ts

@@ -38,11 +38,12 @@ /** The git errors which can be parsed from failed git commands. */
     LockFileAlreadyExists = 34,
-    PushWithFileSizeExceedingLimit = 35,
-    HexBranchNameRejected = 36,
-    ForcePushRejected = 37,
-    InvalidRefLength = 38,
-    ProtectedBranchRequiresReview = 39,
-    ProtectedBranchForcePush = 40,
-    ProtectedBranchDeleteRejected = 41,
-    ProtectedBranchRequiredStatus = 42,
-    PushWithPrivateEmail = 43,
+    NoMergeToAbort = 35,
+    PushWithFileSizeExceedingLimit = 36,
+    HexBranchNameRejected = 37,
+    ForcePushRejected = 38,
+    InvalidRefLength = 39,
+    ProtectedBranchRequiresReview = 40,
+    ProtectedBranchForcePush = 41,
+    ProtectedBranchDeleteRejected = 42,
+    ProtectedBranchRequiredStatus = 43,
+    PushWithPrivateEmail = 44
 }
@@ -87,2 +88,3 @@ /** A mapping from regexes to the git error they identify. */
     'Another git process seems to be running in this repository, e.g.': GitError;
+    'fatal: There is no merge to abort': GitError;
     'error: GH001: ': GitError;
@@ -89,0 +91,0 @@ 'error: GH002: ': GitError;

build/lib/errors.js

@@ -41,12 +41,13 @@ "use strict";
     GitError[GitError["LockFileAlreadyExists"] = 34] = "LockFileAlreadyExists";
+    GitError[GitError["NoMergeToAbort"] = 35] = "NoMergeToAbort";
     // GitHub-specific error codes
-    GitError[GitError["PushWithFileSizeExceedingLimit"] = 35] = "PushWithFileSizeExceedingLimit";
-    GitError[GitError["HexBranchNameRejected"] = 36] = "HexBranchNameRejected";
-    GitError[GitError["ForcePushRejected"] = 37] = "ForcePushRejected";
-    GitError[GitError["InvalidRefLength"] = 38] = "InvalidRefLength";
-    GitError[GitError["ProtectedBranchRequiresReview"] = 39] = "ProtectedBranchRequiresReview";
-    GitError[GitError["ProtectedBranchForcePush"] = 40] = "ProtectedBranchForcePush";
-    GitError[GitError["ProtectedBranchDeleteRejected"] = 41] = "ProtectedBranchDeleteRejected";
-    GitError[GitError["ProtectedBranchRequiredStatus"] = 42] = "ProtectedBranchRequiredStatus";
-    GitError[GitError["PushWithPrivateEmail"] = 43] = "PushWithPrivateEmail";
+    GitError[GitError["PushWithFileSizeExceedingLimit"] = 36] = "PushWithFileSizeExceedingLimit";
+    GitError[GitError["HexBranchNameRejected"] = 37] = "HexBranchNameRejected";
+    GitError[GitError["ForcePushRejected"] = 38] = "ForcePushRejected";
+    GitError[GitError["InvalidRefLength"] = 39] = "InvalidRefLength";
+    GitError[GitError["ProtectedBranchRequiresReview"] = 40] = "ProtectedBranchRequiresReview";
+    GitError[GitError["ProtectedBranchForcePush"] = 41] = "ProtectedBranchForcePush";
+    GitError[GitError["ProtectedBranchDeleteRejected"] = 42] = "ProtectedBranchDeleteRejected";
+    GitError[GitError["ProtectedBranchRequiredStatus"] = 43] = "ProtectedBranchRequiredStatus";
+    GitError[GitError["PushWithPrivateEmail"] = 44] = "PushWithPrivateEmail";
 })(GitError = exports.GitError || (exports.GitError = {}));
@@ -91,2 +92,3 @@ /** A mapping from regexes to the git error they identify. */
     'Another git process seems to be running in this repository, e.g.': GitError.LockFileAlreadyExists,
+    'fatal: There is no merge to abort': GitError.NoMergeToAbort,
     // GitHub-specific errors
@@ -93,0 +95,0 @@ 'error: GH001: ': GitError.PushWithFileSizeExceedingLimit,

build/lib/git-environment.d.ts

@@ -0,1 +1,2 @@
+/// <reference types="node" />
 /**
@@ -9,5 +10,5 @@ * Setup the process environment before invoking Git.
  */
-export declare function setupEnvironment(environmentVariables: Object): {
-    env: Object;
+export declare function setupEnvironment(environmentVariables: NodeJS.ProcessEnv): {
+    env: NodeJS.ProcessEnv;
     gitLocation: string;
 };

build/lib/git-environment.js

@@ -23,3 +23,3 @@ "use strict";
 function resolveGitDir() {
-    if (process.env.LOCAL_GIT_DIRECTORY) {
+    if (process.env.LOCAL_GIT_DIRECTORY != null) {
         return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
@@ -50,3 +50,3 @@ }
 function resolveGitExecPath() {
-    if (process.env.GIT_EXEC_PATH) {
+    if (process.env.GIT_EXEC_PATH != null) {
         return path.resolve(process.env.GIT_EXEC_PATH);
@@ -53,0 +53,0 @@ }

build/lib/git-process.d.ts

@@ -65,3 +65,3 @@ /// <reference types="node" />
 export declare class GitProcess {
-    private static pathExists(path);
+    private static pathExists;
     /**
@@ -68,0 +68,0 @@ * Execute a command and interact with the process outputs directly.

package.json

 {
   "name": "dugite",
-  "version": "1.74.0",
+  "version": "1.75.0",
   "description": "Elegant bindings for Git",
@@ -13,5 +13,5 @@ "main": "./build/lib/index.js",
     "test": "npm run test:fast && npm run test:slow && npm run test:external",
-    "test:fast": "cross-env LOCAL_GIT_DIRECTORY=./git/ mocha --require ts-node/register test/fast/*.ts test/auth/*.ts",
-    "test:slow": "cross-env LOCAL_GIT_DIRECTORY=./git/ mocha -t 20000ms --require ts-node/register test/slow/*.ts test/auth/*.ts",
-    "test:external": "mocha -t 20000ms --require ts-node/register test/external/*.ts",
+    "test:fast": "cross-env LOCAL_GIT_DIRECTORY=./git/ mocha -t 5000 --require ts-node/register test/fast/*.ts test/auth/*.ts",
+    "test:slow": "cross-env LOCAL_GIT_DIRECTORY=./git/ mocha -t 30000 --require ts-node/register test/slow/*.ts test/auth/*.ts",
+    "test:external": "mocha -t 30000 --require ts-node/register test/external/*.ts",
     "postinstall": "node ./script/download-git.js",
@@ -41,12 +41,12 @@ "prettify": "prettier \"{examples,lib,script,test}/**/*.ts\" --write",
     "rimraf": "^2.5.4",
-    "tar": "^4.0.2"
+    "tar": "^4.4.6"
   },
   "devDependencies": {
-    "@types/chai": "^4.0.5",
+    "@types/chai": "^4.1.4",
     "@types/checksum": "^0.1.30",
-    "@types/mkdirp": "^0.5.1",
-    "@types/mocha": "^2.2.44",
-    "@types/node": "^8.0.53",
-    "@types/progress": "^2.0.0",
-    "@types/request": "^2.0.8",
+    "@types/mkdirp": "^0.5.2",
+    "@types/mocha": "^5.2.5",
+    "@types/node": "^10.10.1",
+    "@types/progress": "^2.0.1",
+    "@types/request": "^2.47.1",
     "@types/rimraf": "2.0.2",
@@ -56,10 +56,10 @@ "byline": "^5.0.0",
     "chai-as-promised": "^7.1.1",
-    "cross-env": "^5.1.1",
+    "cross-env": "^5.2.0",
     "find-git-exec": "0.0.1-alpha.2",
-    "mocha": "^4.0.1",
-    "prettier": "^1.8.2",
+    "mocha": "^5.2.0",
+    "prettier": "^1.14.3",
     "temp": "^0.8.3",
-    "ts-node": "^3.0.2",
-    "typescript": "^2.6.1"
+    "ts-node": "^7.0.1",
+    "typescript": "^3.0.3"
   }
 }

README.md

 # Dugite - JS bindings for Git
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/desktop/dugite.svg)](https://greenkeeper.io/)
+
 This project provides bindings for Node applications to interact with Git repositories, using the same command line interface that core Git offers.
@@ -4,0 +6,0 @@

script/download-git.js

@@ -61,3 +61,4 @@ const fs = require('fs')
       'User-Agent': 'dugite'
-    }
+    },
+    secureProtocol: 'TLSv1_2_method'
   }
@@ -64,0 +65,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

877

increased by0.69%

Number of lines in readme file

61

increased by3.39%

Worsened metrics

Total package byte prevSize

58744

decreased by-0.65%

Dependency changes

• Updatedtar@^4.4.6