diff --git a/lib/package.coffee b/lib/package.coffee index 0d46640..35c25f6 100644 --- a/lib/package.coffee +++ b/lib/package.coffee @@ -3,7 +3,7 @@ class Package fs = require "fs" - rc = require "rc" + rc = require "runtime-configuration" url = require "url" util = require "util" glob = require "glob" @@ -154,24 +154,25 @@ class Package return callback.call( @, err ) if err # load npmrc configuration - @rc = rc "npm", registry: "https://registry.npmjs.org/" + rc "npm", registry: "https://registry.npmjs.org/", ( err, config ) => + @rc = config - try - # try to load info from package.json - @pkg = @require @path + try + # try to load info from package.json + @pkg = @require @path - # fill dependencies - @dependencies = @pkg.dependencies - @devDependencies = @pkg.devDependencies + # fill dependencies + @dependencies = @pkg.dependencies + @devDependencies = @pkg.devDependencies - callback.call @ - catch e - if e.code is "ENOENT" - # if package.json not exists, should initialize dependencies - @create callback - else - # if package.json is broken - callback.call @, e + callback.call @ + catch e + if e.code is "ENOENT" + # if package.json not exists, should initialize dependencies + @create callback + else + # if package.json is broken + callback.call @, e @ diff --git a/package.json b/package.json index 87f8af2..1be95df 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "request": "2.12.0", "wrench": "1.4.4", "colors": "0.6.0-1", - "rc": "0.0.6" + "runtime-configuration": "0.1.1" }, "devDependencies": { "mocha": "1.8.1", diff --git a/test/helpers.js b/test/helpers.js index adc4056..62c7643 100644 --- a/test/helpers.js +++ b/test/helpers.js @@ -1,7 +1,7 @@ global.fs = require( "fs" ) global.path = require( "path" ) global.wrench = require( "wrench" ) -global.rc = require( "rc" ) +global.rc = require( "runtime-configuration" ) global.sinon = require( "sinon" ) global.request = require( "request" ) global.exec = require('child_process').exec diff --git a/test/specs/programmatic/package.coffee b/test/specs/programmatic/package.coffee index 2633395..ad71580 100644 --- a/test/specs/programmatic/package.coffee +++ b/test/specs/programmatic/package.coffee @@ -1,8 +1,9 @@ describe "Package", -> - before -> - @npmrc = rc "npm", registry: "https://registry.npmjs.org/" - + before ( done ) -> + rc "npm", registry: "https://registry.npmjs.org/", ( err, @npmrc ) => + done() + describe "@lookup()", -> it "should lookup package.json in specified directory", ( done ) ->