Skip to content

Exclude dev deps from being auto-added to deps and vice versa #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions default-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ function niceName (n) {
return n.replace(/^node-|[.-]js$/g, '').toLowerCase()
}

function readDeps (test) { return function (cb) {
function readDeps (test, excluded) { return function (cb) {
fs.readdir('node_modules', function (er, dir) {
if (er) return cb()
var deps = {}
var n = dir.length
if (n === 0) return cb(null, deps)
dir.forEach(function (d) {
if (d.match(/^\./)) return next()
if (test !== isTestPkg(d))
if (test !== isTestPkg(d) || excluded[d])
return next()

var dp = path.join(dirname, 'node_modules', d, 'package.json')
Expand Down Expand Up @@ -137,11 +137,11 @@ exports.directories = function (cb) {
}

if (!package.dependencies) {
exports.dependencies = readDeps(false)
exports.dependencies = readDeps(false, package.devDependencies || {})
}

if (!package.devDependencies) {
exports.devDependencies = readDeps(true)
exports.devDependencies = readDeps(true, package.dependencies || {})
}

// MUST have a test script!
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"validate-npm-package-name": "^2.0.1"
},
"devDependencies": {
"mkdirp": "^0.5.1",
"npm": "^2",
"rimraf": "^2.1.4",
"tap": "^1.2.0"
Expand Down
60 changes: 60 additions & 0 deletions test/dependencies.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
var tap = require('tap')
var init = require('../')
var path = require('path')
var rimraf = require('rimraf')
var mkdirp = require('mkdirp')
var fs = require('fs')

var EXPECT = {
name: 'test-deps',
version: '1.0.0',
description: '',
author: '',
scripts: { test: 'mocha' },
main: 'index.js',
keywords: [],
license: 'ISC',
dependencies: {
'tap': '*'
},
devDependencies: {
'mocha': '^1.0.0'
}
}

var origwd = process.cwd()
var testdir = path.resolve(__dirname, 'test-deps')
mkdirp.sync(testdir)
process.chdir(testdir)

fs.writeFileSync(path.resolve(testdir, 'package.json'), JSON.stringify({
dependencies: {
'tap': '*'
}
}))

var fakedeps = ['mocha', 'tap', 'async', 'foobar']

fakedeps.forEach(function(dep) {
var depdir = path.resolve(testdir, 'node_modules', dep)
mkdirp.sync(depdir)

fs.writeFileSync(path.resolve(depdir, 'package.json'), JSON.stringify({
name: dep,
version: '1.0.0'
}))
})

tap.test('read in dependencies and dev deps', function (t) {
init(testdir, testdir, {yes: 'yes', 'save-prefix': '^'}, function (er, data) {
if (er) throw er

t.same(data, EXPECT, 'used the correct dependency information')
t.end()
})
})

tap.test('teardown', function (t) {
process.chdir(origwd)
rimraf(testdir, t.end.bind(t))
})