Skip to content

Commit

Permalink
Unified variable names to terse terms #5
Browse files Browse the repository at this point in the history
  • Loading branch information
sthzg committed Aug 12, 2016
1 parent 4c00fc2 commit 6cd920e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion generators/activate/index.js
Expand Up @@ -29,7 +29,7 @@ class Generator extends generators.Base {
tasks.validateSubgenName(this);
},
cacheInstalledPackages() {
tasks.cacheInstalledPackages(this);
tasks.cacheInstalledPkgs(this);
},
populateHostgenPkg() {
tasks.populateHostgenPkg(this);
Expand Down
2 changes: 1 addition & 1 deletion generators/deactivate/index.js
Expand Up @@ -27,7 +27,7 @@ class Generator extends generators.Base {
tasks.validateSubgenName(this);
},
cacheInstalledPackages() {
tasks.cacheInstalledPackages(this);
tasks.cacheInstalledPkgs(this);
},
populateHostgenPkg() {
tasks.populateHostgenPkg(this);
Expand Down
2 changes: 1 addition & 1 deletion generators/scan/index.js
Expand Up @@ -24,7 +24,7 @@ class Generator extends generators.Base {
tasks.validateHostName(this);
},
cacheInstalledPackages() {
tasks.cacheInstalledPackages(this);
tasks.cacheInstalledPkgs(this);
},
populateHostgenPkg() {
tasks.populateHostgenPkg(this);
Expand Down
12 changes: 6 additions & 6 deletions utils/records.js
Expand Up @@ -12,7 +12,7 @@ const Immutable = require('immutable');
/**
* @private Base record used to build more concrete message classes like {@link SuccessMsg} and {@link ErrorMsg}.
*/
class Message extends Immutable.Record({ hasError: false, data: {} }) {
class Msg extends Immutable.Record({ hasError: false, data: {} }) {
constructor(data) {
data.data = Immutable.fromJS(data.data, function (key, value) {
var isIndexed = Immutable.Iterable.isIndexed(value);
Expand All @@ -29,7 +29,7 @@ class Message extends Immutable.Record({ hasError: false, data: {} }) {
*
* @param {Object} data
*/
const SuccessMsg = (data) => new Message({
const SuccessMsg = (data) => new Msg({
data: data
});

Expand All @@ -39,7 +39,7 @@ const SuccessMsg = (data) => new Message({
*
* @param {Object} err
*/
const ErrorMsg = (err) => new Message({
const ErrorMsg = (err) => new Msg({
hasError: true,
data: {
err: err
Expand All @@ -61,15 +61,15 @@ const pkgDefaults = {
};


const Package = Immutable.Record(pkgDefaults);
const Pkg = Immutable.Record(pkgDefaults);


/**
* Record to store host generator's package data.
*
* @param {Object} pkg
*/
const HostGenPkg = (pkg={}) => Package(Object.assign({}, pkgDefaults, pkg, {
const HostGenPkg = (pkg={}) => Pkg(Object.assign({}, pkgDefaults, pkg, {
isHost: true
}));

Expand All @@ -79,7 +79,7 @@ const HostGenPkg = (pkg={}) => Package(Object.assign({}, pkgDefaults, pkg, {
*
* @param {Object} pkg
*/
const SubGenPkg = (pkg={}) => Package(Object.assign({}, pkgDefaults, pkg, {
const SubGenPkg = (pkg={}) => Pkg(Object.assign({}, pkgDefaults, pkg, {
isHost: false
}));

Expand Down
4 changes: 2 additions & 2 deletions utils/tasks.js
Expand Up @@ -241,7 +241,7 @@ function validateSubgenName(generator) {
/**
* Caches root paths to installed npm packages into class member.
*/
function cacheInstalledPackages(generator) {
function cacheInstalledPkgs(generator) {
generator.pkgList = utils.populatePkgStoreFromPaths(
utils.getInstalledPkgPaths(generator.env.getNpmPaths())
);
Expand Down Expand Up @@ -385,7 +385,7 @@ function validateCompatibility(generator) {

module.exports = {
activateSubgen,
cacheInstalledPackages,
cacheInstalledPkgs,
checkActivationState,
deactivateSubgen,
setSubgenDestPath,
Expand Down
4 changes: 2 additions & 2 deletions utils/utils.js
Expand Up @@ -14,7 +14,7 @@ var records = require('./records.js');
* Builds a default error object.
*
* @param err string or object providing error information
* @returns Message Record
* @returns Msg Record
*/
function buildError(err = null) {
return records.ErrorMsg(err);
Expand All @@ -25,7 +25,7 @@ function buildError(err = null) {
* Builds a default success object.
*
* @param data an object that will be merged into the return body.
* @returns Message Record
* @returns Msg Record
*/
function buildSuccess(data = {}) {
return records.SuccessMsg(data);
Expand Down

0 comments on commit 6cd920e

Please sign in to comment.