Skip to content

Commit b54ca5a

Browse files
committed
Convert initializer to using . Fix grunt module issue in #9.
1 parent 62a9d8e commit b54ca5a

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

lib/initializes-bowerrc.coffee

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
fs = require('fs')
22
path = require('path')
3+
findsRoot = require('find-root-package')
34

45
module.exports =
56
initialize: (dir = process.cwd()) ->
6-
return unless (topDir = findTopPackageJson(dir)) && (topDir != dir)
7+
topDir = findsRoot.findTopPackageJson(dir)
8+
return unless isInstalledAsDependency(dir, topDir)
79
return if fs.existsSync(dest = path.join(topDir, '.bowerrc'))
810
console.log("Writing a default '.bowerrc' file into '#{topDir}'")
911
fs.writeFileSync dest, """
@@ -13,16 +15,7 @@ module.exports =
1315
1416
"""
1517

16-
findTopPackageJson = (dir) ->
17-
current = path.resolve(dir)
18-
grandparent = path.resolve(dir, "..", "..")
19-
if current == grandparent || !hasPackageJson(grandparent)
20-
if hasPackageJson(current)
21-
current
22-
else
23-
null
24-
else
25-
findTopPackageJson(grandparent)
18+
isInstalledAsDependency = (dir, topDir) ->
19+
topDir? && topDir != dir
20+
2621

27-
hasPackageJson = (dir) ->
28-
fs.existsSync(path.join(dir, "package.json"))

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
},
2323
"dependencies": {
2424
"grunt-bower-task": "~0.4.0",
25-
"coffee-script": "~1.6.3"
25+
"coffee-script": "~1.6.3",
26+
"find-root-package": "0.0.1"
2627
},
2728
"peerDependencies": {
28-
"lineman": ">= 0.19.0"
29+
"grunt": "~0.4.1",
30+
"lineman": ">= 0.27.0"
2931
},
3032
"devDependencies": {
31-
"grunt": "^0.4.4",
3233
"grunt-release": "^0.7.0"
3334
},
3435
"licenses": [

0 commit comments

Comments
 (0)