Skip to content
Open
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ All notable changes to this project will be documented in this file. See [standa
### Bug Fixes

* **engines:** update node version restrictions to match Ghost ([c45909d](https://github.com/TryGhost/Ghost-CLI/commit/c45909d))
* **utils:** prerelease statisfies engine definition ([8bfcc38](https://github.com/TryGhost/Ghost-CLI/commit/8bfcc38))
* **utils:** prerelease satisfies engine definition ([8bfcc38](https://github.com/TryGhost/Ghost-CLI/commit/8bfcc38))



Expand Down Expand Up @@ -1317,7 +1317,7 @@ All notable changes to this project will be documented in this file. See [standa

### Bug Fixes

* **extensions:** remove unecessary getters from systemd and nginx extensions ([f5f6e05](https://github.com/TryGhost/Ghost-CLI/commit/f5f6e05))
* **extensions:** remove unnecessary getters from systemd and nginx extensions ([f5f6e05](https://github.com/TryGhost/Ghost-CLI/commit/f5f6e05))
* **instance:** clean up config usage around application (#254) ([22c804c](https://github.com/TryGhost/Ghost-CLI/commit/22c804c))
* **setup:** reset setup default to true ([7c4cdf3](https://github.com/TryGhost/Ghost-CLI/commit/7c4cdf3))
* **systemd:** fix is-enabled error handling in systemd process manager ([ff6cfba](https://github.com/TryGhost/Ghost-CLI/commit/ff6cfba))
Expand Down
2 changes: 1 addition & 1 deletion lib/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const findExtensions = require('./utils/find-extensions');

const debug = createDebug('ghost-cli:bootstrap');

// Extra alises for commands
// Extra aliases for commands
const extraAliases = {
'--version': 'version',
'-v': 'version',
Expand Down
2 changes: 1 addition & 1 deletion lib/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class CliError extends Error {

// TODO: we receive all possible properties now, except the excluded ones above
// Currently we're logging only the message and the stack property.
// This part of the code could probably be simplyfied if we won't need other
// This part of the code could probably be simplified if we won't need other
// properties in the future
originalError[property] = options.err[property];
});
Expand Down
2 changes: 1 addition & 1 deletion lib/instance.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class Instance {
}

/**
* Gets a list of availble configurations for this instance
* Gets a list of available configurations for this instance
*
* @method getAvailableConfigs
* @return {Promise<{[s: string]: Config}>}
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/configure/get-prompts.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const {validate: validateUrl, ensureProtocol} = require('../../utils/url');
/**
* Gets inquirer prompts based on passed argv and current config values
*
* @param {Config} config Config instane
* @param {Config} config Config instance
* @param {Object} argv Argv options
*/
module.exports = function getPrompts(config, argv, environment) {
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ class UI {
}

/**
* Error handler for the CLI. Takes a given error and outputs a formated and more human-readable
* Error handler for the CLI. Takes a given error and outputs a formatted and more human-readable
* error to the specified out stream.
*
* @param {Error|Object} error Error to handle
Expand Down Expand Up @@ -469,7 +469,7 @@ class UI {
this.log(`\nTry running ${(chalk.cyan('ghost doctor'))} to check your system for known issues.`);
} else if (error !== false) {
// If the error is false, we're just exiting (makes the promise chains easier)
this.log('An unknown error occured.', null, true);
this.log('An unknown error occurred.', null, true);
this.log(`\nTry running ${(chalk.cyan('ghost doctor'))} to check your system for known issues.`);
}
}
Expand All @@ -478,7 +478,7 @@ class UI {
* Helper method to format the debug information whenever an error occurs
*
* @param {System} system System instance
* @return string Formated debug info
* @return string Formatted debug info
*
* @method _formatString
* @private
Expand Down
2 changes: 1 addition & 1 deletion test/unit/commands/migrate-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe('Unit: Commands > Migrate', function () {
});
});

it('quiet supresses output', function () {
it('quiet suppresses output', function () {
const {cmd, instance, parse} = build([]);

return cmd.run({quiet: true}).then(() => {
Expand Down
6 changes: 3 additions & 3 deletions test/unit/tasks/install-dependencies-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe('Unit: Tasks > install-dependencies', function () {
});
});

it('base function calls subtasks and yarn util correctly with GHOST_NODE_VERISON_CHECK set', function () {
it('base function calls subtasks and yarn util correctly with GHOST_NODE_VERSION_CHECK set', function () {
const yarnStub = sinon.stub().returns(new Observable(o => o.complete()));
const installDependencies = proxyquire(modulePath, {
'../utils/yarn': yarnStub
Expand Down Expand Up @@ -306,7 +306,7 @@ describe('Unit: Tasks > install-dependencies', function () {
});

describe('dist subtask', function () {
it('rejects if Ghost version isn\'t compatible with the current Node version and GHOST_NODE_VERISON_CHECK is not set', function () {
it('rejects if Ghost version isn\'t compatible with the current Node version and GHOST_NODE_VERSION_CHECK is not set', function () {
const data = {
engines: {node: '^0.10.0'},
dist: {shasum: 'asdf1234', tarball: 'something.tgz'}
Expand All @@ -327,7 +327,7 @@ describe('Unit: Tasks > install-dependencies', function () {
});
});

it('resolves if Ghost version isn\'t compatible with the current Node version and GHOST_NODE_VERISON_CHECK is set', function () {
it('resolves if Ghost version isn\'t compatible with the current Node version and GHOST_NODE_VERSION_CHECK is set', function () {
const data = {
engines: {node: '^0.10.0'},
dist: {shasum: 'asdf1234', tarball: 'something.tgz'}
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ui/index-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ describe('Unit: UI', function () {

expect(formatDebug.calledOnce).to.be.true;
expect(log.calledTwice).to.be.true;
expect(log.args[0][0]).to.match(/error occured/);
expect(log.args[0][0]).to.match(/error occurred/);
expect(stripAnsi(log.args[1][0])).to.match(/Try running ghost doctor to check your system for known issues./);
expect(log.args[0][2]).to.be.true;
});
Expand Down