merge fixes

Author: wzrdtales

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,35 @@
+## I'm submitting a...
+<!-- Check one of the following options with "x" -->
+<pre><code>
+[ ] Bug report  <!-- Please search GitHub for a similar issue or PR before submitting -->
+[ ] Feature request
+</code></pre>
+
+## Current behavior
+<!-- Describe how the issue manifests. -->
+
+
+## Expected behavior
+<!-- Describe what the desired behavior would be. -->
+
+
+## Minimal reproduction of the problem with instructions
+
+## What is the motivation / use case for changing the behavior?
+<!-- Describe the motivation or the concrete use case. -->
+
+
+## Environment
+
+<pre><code>
+db-migrate version: X.Y.Z
+plugins with versions: X.Y.Z
+db-migrate driver with versions: <!-- eg. mongodb vX.Y.Z -->
+
+Additional information:
+- Node version: XX  <!-- run `node --version` -->
+- Platform:  <!-- Mac, Linux, Windows -->
+
+Others:
+<!-- Anything else relevant?  Operating system version, IDE, package manager, HTTP server, ... -->
+</code></pre>

.github/stale.yml

@@ -0,0 +1,23 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - feature
+  - Refactoring
+  - RFC
+  - bug
+  - documentation
+  - bounty
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.npmignore

@@ -1,3 +1,4 @@
+.github
 test
 migrations
 VCSeeder

.travis.yml

@@ -1,10 +1,10 @@
 language: node_js
 
 node_js:
-  - 4.0
-  - 4.2
-  - 5
+  - 4
   - 6
+  - 8
+  - node
 
 notifications:
   email:
@@ -21,6 +21,8 @@ os:
   - linux
 
 matrix:
+  allow_failures:
+    - node_js: node
   fast_finish: true
 
 sudo: false
@@ -41,4 +43,4 @@ before_install:
   - export CXX=g++-4.8; export CC=gcc-4.8;
 
 before_script:
-    - cp test/db.config.ci test/db.config.json
+  - cp test/db.config.ci test/db.config.json

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

api.js

@@ -42,7 +42,7 @@ function dbmigrate (plugins, isModule, options, callback) {
   });
 
   /* $lab:coverage:off$ */
-  if (options && !options.throwUncatched) load('helper/register-events')();
+  if (!options || !options.throwUncatched) load('helper/register-events')();
   /* $lab:coverage:on$ */
 
   if (typeof options === 'object') {

commitlint.config.js

@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-angular'] };

connect.js

@@ -39,7 +39,10 @@ exports.connect = function (config, PassedClass, callback) {
         } catch (e) {}
 
         if (switched) {
-          db.switchDatabase(newConf, function () {
+          db.switchDatabase(newConf, function (err) {
+            if (err) {
+              return callback(err);
+            }
             internals.locTitle = internals.migrationMode;
             callback(
               null,

lib/commands/db.js

@@ -25,13 +25,14 @@ function executeDB (internals, config, callback) {
         function (err) {
           if (err) {
             if (err.error) err = err.error;
-            log.info('Error: Failed to create database!', err);
+            log.error('Error: Failed to create database!', err);
           } else {
             log.info('Created database "' + internals.argv.dbname + '"');
           }
 
           db.close();
-          if (typeof callback === 'function') callback();
+          if (typeof callback === 'function') callback(err);
+          else process.exit(1);
         }
       );
     } else if (internals.mode === 'drop') {
@@ -43,13 +44,14 @@ function executeDB (internals, config, callback) {
         function (err) {
           if (err) {
             if (err.error) err = err.error;
-            log.info('Error: Failed to drop database!', err);
+            log.error('Error: Failed to drop database!', err);
           } else {
             log.info('Deleted database "' + internals.argv.dbname + '"');
           }
 
           db.close();
-          if (typeof callback === 'function') callback();
+          if (typeof callback === 'function') callback(err);
+          process.exit(1);
         }
       );
     }

lib/commands/set-default-argv.js

@@ -119,7 +119,7 @@ module.exports = function (internals, isModule) {
 
   internals.argv = deepExtend(internals.argv.argv, rc('db-migrate', {}));
   internals.argv.rcconfig = internals.argv.config;
-  internals.argv.config = _config;
+  internals.argv.config = internals.argv.configFile || _config;
 
   if (internals.argv.version) {
     console.log(internals.dbm.version);