clever-odm - npm Package Compare versions

Comparing version 1.0.2 to 1.0.3

bin/rebase.js

@@ -37,6 +37,6 @@ var injector    = require( 'injector' )
                 console.log( 'Mongo Database is rebased' );
-                env.moduleLoader.shutdown();
+                process.exit( 0 );
             } else {
-                console.error('Error ' + env.config['clever-odm'].uri, err);
-                env.moduleLoader.shutdown();
+                console.error( 'Error ' + env.config['clever-odm'].uri, err );
+                process.exit( 1 );
             }
@@ -43,0 +43,0 @@ }

bin/seedModels.js

@@ -103,4 +103,9 @@ var path        = require( 'path' )
         function forEachModelTypeComplete( err ) {
-            console.log( err ? 'Error: ' : 'Seed completed with no errors', err );
-            env.moduleLoader.shutdown();
+            if ( err === null || err === undefined ) {
+                console.log( 'Seed completed with no errors' );
+                process.exit( 0 );
+            } else {
+                console.log( err );
+                process.exit( 1 );
+            }
         }
@@ -107,0 +112,0 @@ );

Gruntfile.js

@@ -6,24 +6,63 @@ 'use strict';
   , pkgJson     = require( path.resolve( path.join( __dirname, '..', '..', 'package.json') ) )
-  , ormEnabled  = pkgJson.bundledDependencies.indexOf( 'clever-orm' ) !== -1;
+  , ormEnabled  = pkgJson.bundledDependencies.indexOf( 'clever-orm' ) !== -1
+  , _           = require( 'underscore' );
 
 module.exports = function( grunt ) {
-    // Arguments for individual module rebase/seed
-    var dbTarget = grunt.option( 'module' ) || null;
+    var dbTarget        = grunt.option( 'module' ) || null
+      , defaultConfig   = require( path.join( __dirname, 'config', 'default.json' ) )
+      , configFile      = null
+      , config          = {};
 
     return [{
         prompt: {
-            cleverOdmConfig: {
+            odmConfigPrompt: {
                 options: {
                     questions: [
                         {
-                            config: 'cleverOdm.uri',
+                            config: 'cleverstackodm.environment',
+                            type: 'list',
+                            message: 'What environment is this configuration for?',
+                            choices: [
+                                { name: 'LOCAL' },
+                                { name: 'TEST' },
+                                { name: 'DEV' },
+                                { name: 'STAG' },
+                                { name: 'PROD' }
+                            ],
+                            default: function() {
+                                return process.env.NODE_ENV ? process.env.NODE_ENV.toUpperCase() : 'LOCAL';
+                            },
+                            filter: function( env ) {
+                                _.extend( config, defaultConfig );
+
+                                configFile = path.resolve( path.join( __dirname, '..', '..', 'config', env.toLowerCase() + '.json' ) );
+
+                                if ( fs.existsSync( configFile ) ) {
+                                    _.extend( config, require( configFile ) );
+                                    
+                                    Object.keys( defaultConfig[ 'clever-odm' ] ).forEach( function( key ) {
+                                        if ( typeof config[ 'clever-odm' ][ key ] === 'undefined' ) {
+                                            config[ 'clever-odm' ][ key ] = defaultConfig[ 'clever-odm' ][ key ];
+                                        }
+                                    });
+                                }
+
+                                return true;
+                            }
+                        },
+                        {
+                            config: 'cleverstackodm.uri',
                             type: 'input',
                             message: 'Mongo URI',
-                            default: '',
+                            default: function() {
+                                return config[ 'clever-odm' ].uri !== '' ? config[ 'clever-odm' ].uri : 'mongodb://localhost/nodeseed';
+                            }
                         },
                         {
-                            config: 'cleverOdm.debug',
-                            type: 'boolean',
-                            message: 'Enable mongoose debug mode?',
-                            default: true
+                            config: 'cleverstackodm.mongoose.debug',
+                            type: 'confirm',
+                            message: 'Enable debugging',
+                            default: function() {
+                                return config[ 'clever-odm' ].mongoose.debug !== '' ? config[ 'clever-odm' ].mongoose.debug : 'mongodb://localhost/nodeseed';
+                            }
                         }
@@ -43,3 +82,3 @@ ]
     }, function( grunt ) {
-        grunt.loadNpmTasks('grunt-prompt');
+        grunt.loadNpmTasks( 'grunt-prompt' );
 
@@ -70,24 +109,15 @@ // Register each command
             console.log( 'The database tables for your modules should now be installed and seeded with data!' );
-        } );
+        });
 
-        grunt.registerTask( 'prompt:cleverOdm', [ 'prompt:cleverOdmConfig', 'cleverOdmCreateConfig' ] );
-        grunt.registerTask( 'cleverOdmCreateConfig', 'Creates a .json config file for database credentials', function ( ) {
-            var conf = grunt.config( 'cleverOdm' )
-              , obj  = {
-                    'clever-odm': { mongoose: {} }
-                }
-              , env  = process.env.NODE_ENV ? process.env.NODE_ENV.toLowerCase() : 'local'
-              , file = path.join( process.cwd( ), 'config', env + '.json' );
+        grunt.registerTask( 'prompt:cleverOdmConfig', [ 'prompt:odmConfigPrompt', 'cleverOdmCreateConfig' ] );
+        grunt.registerTask( 'cleverOdmCreateConfig', 'Creates a .json config file for database credentials', function() {
+            var conf = grunt.config( 'cleverstackodm' );
 
-            if ( fs.existsSync( file ) ) {
-                obj = require( file );
-            }
+            delete conf.environment;
 
-            obj[ 'clever-odm' ] = obj[ 'clever-odm' ] || {};
-            obj[ 'clever-odm' ].uri = conf.uri;
-            obj[ 'clever-odm' ].mongoose.debug = conf.debug;
+            config[ 'clever-odm' ] = _.extend( config[ 'clever-odm' ], conf );
 
-            fs.writeFileSync( file, JSON.stringify( obj, null, '  ' ) );
-        } );
+            fs.writeFileSync( configFile, JSON.stringify( config, null, '    ' ) );
+        });
     }];
 };

package.json

 {
     "name": "clever-odm",
     "description": "CleverStack ODM (NoSQL) Module",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "main": "module.js",
@@ -6,0 +6,0 @@ "author": {

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

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Mixed license

License

(Experimental) Package contains multiple licenses.

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

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

25104

increased by31.15%

Number of package files

13

increased by18.18%

Lines of code

369

increased by9.17%

Number of lines in readme file

27

increased by12.5%

Worsened metrics

Number of low license alerts

1

increased byInfinity%

Number of low supply chain risk alerts

8

increased by14.29%

No dependency changes