Skip to content

Commit

Permalink
Resolve #58, #59
Browse files Browse the repository at this point in the history
* Fix bug with default component scheme
* Fix bug with unnecessary message while tars init
* Deps update
  • Loading branch information
artem-malko committed Jul 17, 2016
1 parent af5ce11 commit a81a8b5
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 24 deletions.
2 changes: 1 addition & 1 deletion lib/command-actions/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ module.exports = function init(options) {

if (tarsUtils.isTarsInited().inited) {
tarsUtils.tarsSay('TARS has been inited already!');
tarsUtils.tarsSay('You can\'t init Tars in current directory again.');
tarsUtils.tarsSay('You can\'t init Tars in current directory again.', true);
return;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/command-actions/update-project.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ function updateConfigFiles() {
*/
if (currentTarsVersion < '1.8.0') {
fsExtra.copySync(
`${dest.tars.fullPath}/markup/components/default_component_scheme.json`,
`${dest.templater.fullPath}/markup/components/default_component_scheme.json`,
`${cwd}/markup/${componentsFolderName}/default_component_scheme.json`
);
}
Expand Down
3 changes: 1 addition & 2 deletions lib/constants.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict';

const tarsUtils = require('./utils');
const currentTarsVersion = tarsUtils.getTarsProjectVersion();

const GENERAL_BUILD_OPTIONS = {
'ie9': {
Expand Down Expand Up @@ -80,7 +79,7 @@ const ADD_COMPONENT = {
}
};

if (currentTarsVersion >= '1.8.0') {
if (tarsUtils.isTarsInited().inited && tarsUtils.getTarsProjectVersion() >= '1.8.0') {
ADD_COMPONENT.scheme = {
title: ' Structure of new component is based on scheme file'
};
Expand Down
34 changes: 14 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tars-cli",
"version": "1.8.4",
"version": "1.8.5",
"engines": {
"npm": "^3.x.x",
"node": "^4.x.x"
Expand Down Expand Up @@ -31,38 +31,33 @@
"license": "MIT",
"dependencies": {
"autoprefixer": "^6.3.6",
"babel-core": "^6.9.1",
"babel-core": "^6.10.4",
"babel-loader": "^6.2.4",
"browser-sync": "^2.13.0",
"chalk": "^1.1.3",
"chokidar": "^1.5.2",
"chokidar": "^1.6.0",
"cli-spinner": "^0.2.5",
"commander": "^2.9.0",
"comment-json": "^1.1.3",
"del": "2.2.0",
"digits": "0.1.4",
"del": "2.2.1",
"download": "^4.4.3",
"eslint-loader": "^1.3.0",
"es6-promise": "3.0.2",
"eslint-loader": "^1.4.1",
"extfs": "0.0.7",
"fs-extra": "^0.30.0",
"gulp": "^3.9.1",
"gulp-add-src": "^0.2.0",
"gulp-babel": "^6.1.2",
"gulp-cached": "^1.1.0",
"gulp-changed": "^1.3.0",
"gulp-compile-handlebars": "0.6.1",
"gulp-concat": "2.6.0",
"gulp-csso": "^2.0.0",
"gulp-data": "^1.2.1",
"gulp-eslint": "^2.0.0",
"gulp-eslint": "^3.0.1",
"gulp-if": "^2.0.1",
"gulp-imagemin": "3.0.1",
"gulp-importify": "^0.0.7",
"gulp-jade": "^1.1.0",
"gulp-jade-inheritance": "^0.5.5",
"gulp-jscs": "^3.0.2",
"gulp-jshint": "^1.12.0",
"gulp-html-prettify": "https://github.com/artem-malko/gulp-html-prettify/archive/master.tar.gz",
"gulp-less": "^3.1.0",
"gulp-minify-html": "^1.0.6",
Expand All @@ -71,38 +66,37 @@
"gulp-postcss": "^6.1.1",
"gulp-rename": "^1.2.2",
"gulp-replace-task": "^0.11.0",
"gulp-sass": "^2.3.1",
"gulp-sass": "^2.3.2",
"gulp-sourcemaps": "^1.6.0",
"gulp-strip-debug": "^1.1.0",
"gulp-stylus": "^2.4.0",
"gulp-stylus": "^2.5.0",
"gulp-svg-spritesheet": "https://github.com/artem-malko/gulp-svg-spritesheet/archive/master.tar.gz",
"gulp-svg-symbols": "https://github.com/artem-malko/gulp-svg-symbols/archive/master.tar.gz",
"gulp-svg2png": "2.0.0",
"gulp-uglify": "^1.5.3",
"gulp-uglify": "^1.5.4",
"gulp-util": "3.0.7",
"gulp-zip": "^3.2.0",
"gulp.spritesmith": "^6.2.1",
"inquirer": "^1.0.3",
"jshint-stylish": "^2.0.1",
"inquirer": "^1.1.2",
"handlebars": "^3.0.0",
"mkdirp": "^0.5.1",
"ncp": "^2.0.0",
"run-sequence": "^1.2.1",
"run-sequence": "^1.2.2",
"source-map-loader": "^0.1.5",
"stream-combiner": "0.2.2",
"stream-combiner2": "^1.1.1",
"through2": "^2.0.1",
"webpack": "^1.13.1",
"webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.10.0",
"webpack-hot-middleware": "^2.12.1",
"win-spawn": "^2.0.0"
},
"devDependencies": {
"eslint": "^2.11.1"
"eslint": "^3.1.0"
},
"optionalDependencies": {
"posix": "^4.0.2",
"fsevents": "^1.0.12"
"fsevents": "^1.0.13"
},
"bin": {
"tars": "./bin/tars.js"
Expand Down

0 comments on commit a81a8b5

Please sign in to comment.