From 2d52f3deaca683cfee30846535a4560e9253bdcd Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 17 Feb 2014 11:28:24 -0800 Subject: [PATCH] Rename path variables to packagePath --- src/package.coffee | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/package.coffee b/src/package.coffee index 6683872b1..d12fb7cc0 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -1,43 +1,40 @@ +path = require 'path' CSON = require 'season' -{basename, join} = require 'path' module.exports = class Package - @build: (path) -> + @build: (packagePath) -> AtomPackage = require './atom-package' ThemePackage = require './theme-package' try - metadata = @loadMetadata(path) + metadata = @loadMetadata(packagePath) if metadata.theme - pack = new ThemePackage(path, {metadata}) + pack = new ThemePackage(packagePath, {metadata}) else - pack = new AtomPackage(path, {metadata}) + pack = new AtomPackage(packagePath, {metadata}) catch e - console.warn "Failed to load package.json '#{basename(path)}'", e.stack ? e + console.warn "Failed to load package.json '#{path.basename(packagePath)}'", e.stack ? e pack - @load: (path) -> - pack = @build(path) + @load: (packagePath) -> + pack = @build(packagePath) pack?.load() pack - @loadMetadata: (path, ignoreErrors=false) -> - if metadataPath = CSON.resolve(join(path, 'package')) + @loadMetadata: (packagePath, ignoreErrors=false) -> + if metadataPath = CSON.resolve(path.join(packagePath, 'package')) try metadata = CSON.readFileSync(metadataPath) catch e throw e unless ignoreErrors metadata ?= {} - metadata.name = basename(path) + metadata.name = basename(packagePath) metadata - name: null - path: null - constructor: (@path) -> - @name = basename(@path) + @name = path.basename(@path) enable: -> atom.config.removeAtKeyPath('core.disabledPackages', @metadata.name)