Use bem decl for merge, subtract and intersect

.gitignore

@@ -1,3 +1,2 @@
 node_modules
 coverage
-benchmark/fixtures/libs

.jscsrc

@@ -2,7 +2,6 @@
     "excludeFiles": [
         "node_modules",
         "exlib",
-        "benchmark/fixtures",
         "coverage",
         "docs"
     ],
@@ -18,7 +17,6 @@
     "disallowSpacesInNamedFunctionExpression": {
         "beforeOpeningRoundBrace": true
     },
-    "requireMultipleVarDecl": true,
     "requireBlocksOnNewline": 1,
     "disallowPaddingNewlinesInBlocks": true,
     "disallowSpacesInsideArrayBrackets": "nested",
@@ -27,7 +25,6 @@
     "disallowQuotedKeysInObjects": "allButReserved",
     "disallowSpaceAfterObjectKeys": true,
     "requireCommaBeforeLineBreak": true,
-    "requireOperatorBeforeLineBreak": true,
     "disallowSpaceAfterPrefixUnaryOperators": true,
     "disallowSpaceBeforePostfixUnaryOperators": true,
     "requireSpaceBeforeBinaryOperators": true,

.jshintignore

@@ -1,5 +1,4 @@
 node_modules
 exlib
-benchmark/fixtures
 coverage
 docs

.jshintrc

@@ -13,7 +13,9 @@
     "unused": true,
 
     "node": true,
+    "esversion": 6,
 
     "expr": true,
-    "sub": true
+    "sub": true,
+    "laxbreak": true
 }

.travis.yml

@@ -4,10 +4,9 @@ language: node_js
 
 matrix:
   include:
-    - node_js: iojs-v1
-    - node_js: "0.10"
-    - node_js: "0.12"
+    - node_js: "4"
       env: COVERALLS=1
+    - node_js: "5"
 
 after_success:
   - if [ "x$COVERALLS" = "x1" ]; then npm run coveralls; fi

CHANGELOG.md

@@ -235,27 +235,27 @@
 * Модуль `inherit` обновлён до версии `2.2.2`.
 * Модуль `js-yaml` обновлён до версии `3.2.3`.
 
-[#201]: https://github.com/enb-bem/enb-bem-techs/issues/201
-[#192]: https://github.com/enb-bem/enb-bem-techs/issues/192
-[#191]: https://github.com/enb-bem/enb-bem-techs/issues/191
-[#185]: https://github.com/enb-bem/enb-bem-techs/pull/185
-[#179]: https://github.com/enb-bem/enb-bem-techs/issues/179
-[#175]: https://github.com/enb-bem/enb-bem-techs/issues/175
-[#156]: https://github.com/enb-bem/enb-bem-techs/issues/156
-[#151]: https://github.com/enb-bem/enb-bem-techs/issues/151
-[#148]: https://github.com/enb-bem/enb-bem-techs/issues/148
-[#136]: https://github.com/enb-bem/enb-bem-techs/issues/136
-[#129]: https://github.com/enb-bem/enb-bem-techs/issues/129
-[#116]: https://github.com/enb-bem/enb-bem-techs/issues/116
-[#113]: https://github.com/enb-bem/enb-bem-techs/issues/113
-[#112]: https://github.com/enb-bem/enb-bem-techs/issues/112
-[#107]: https://github.com/enb-bem/enb-bem-techs/issues/107
-[#103]: https://github.com/enb-bem/enb-bem-techs/issues/103
-[#99]: https://github.com/enb-bem/enb-bem-techs/issues/99
-[#97]: https://github.com/enb-bem/enb-bem-techs/issues/97
-[#94]: https://github.com/enb-bem/enb-bem-techs/issues/94
-[#93]: https://github.com/enb-bem/enb-bem-techs/issues/93
-[#70]: https://github.com/enb-bem/enb-bem-techs/issues/70
-[#67]: https://github.com/enb-bem/enb-bem-techs/issues/67
-[#41]: https://github.com/enb-bem/enb-bem-techs/issues/41
-[#10]: https://github.com/enb-bem/enb-bem-techs/issues/10
+[#201]: https://github.com/enb/enb-bem-techs/issues/201
+[#192]: https://github.com/enb/enb-bem-techs/issues/192
+[#191]: https://github.com/enb/enb-bem-techs/issues/191
+[#185]: https://github.com/enb/enb-bem-techs/pull/185
+[#179]: https://github.com/enb/enb-bem-techs/issues/179
+[#175]: https://github.com/enb/enb-bem-techs/issues/175
+[#156]: https://github.com/enb/enb-bem-techs/issues/156
+[#151]: https://github.com/enb/enb-bem-techs/issues/151
+[#148]: https://github.com/enb/enb-bem-techs/issues/148
+[#136]: https://github.com/enb/enb-bem-techs/issues/136
+[#129]: https://github.com/enb/enb-bem-techs/issues/129
+[#116]: https://github.com/enb/enb-bem-techs/issues/116
+[#113]: https://github.com/enb/enb-bem-techs/issues/113
+[#112]: https://github.com/enb/enb-bem-techs/issues/112
+[#107]: https://github.com/enb/enb-bem-techs/issues/107
+[#103]: https://github.com/enb/enb-bem-techs/issues/103
+[#99]: https://github.com/enb/enb-bem-techs/issues/99
+[#97]: https://github.com/enb/enb-bem-techs/issues/97
+[#94]: https://github.com/enb/enb-bem-techs/issues/94
+[#93]: https://github.com/enb/enb-bem-techs/issues/93
+[#70]: https://github.com/enb/enb-bem-techs/issues/70
+[#67]: https://github.com/enb/enb-bem-techs/issues/67
+[#41]: https://github.com/enb/enb-bem-techs/issues/41
+[#10]: https://github.com/enb/enb-bem-techs/issues/10

CONTRIBUTORS.md

@@ -10,7 +10,7 @@
 Контрибьютеры
 -------------
 
-Список контрибьютеров данного проекта доступен по ссылке https://github.com/enb-bem/enb-bem-techs/graphs/contributors.
+Список контрибьютеров данного проекта доступен по ссылке https://github.com/enb/enb-bem-techs/graphs/contributors.
 
 Вы так же можете получить его с помощью команды `git log --pretty=format:"%an <%ae>" | sort -u`.
 

LICENSE.txt

@@ -1,6 +1,6 @@
 © YANDEX LLC, 2014
 
-The Source Code called `enb-bem-techs` available at https://github.com/enb-bem/enb-bem-techs is subject to the terms of the Mozilla Public License, v. 2.0 (hereinafter - MPL). The text of MPL is the following:
+The Source Code called `enb-bem-techs` available at https://github.com/enb/enb-bem-techs is subject to the terms of the Mozilla Public License, v. 2.0 (hereinafter - MPL). The text of MPL is the following:
 
 Mozilla Public License, version 2.0
 

README.md

@@ -1,7 +1,7 @@
 enb-bem-techs
 =============
 
-[![NPM version](https://img.shields.io/npm/v/enb-bem-techs.svg?style=flat)](https://www.npmjs.org/package/enb-bem-techs) [![Build Status](https://img.shields.io/travis/enb-bem/enb-bem-techs/master.svg?style=flat&label=tests)](https://travis-ci.org/enb-bem/enb-bem-techs) [![Build status](https://img.shields.io/appveyor/ci/blond/enb-bem-techs.svg?style=flat&label=windows)](https://ci.appveyor.com/project/blond/enb-bem-techs) [![Coverage Status](https://img.shields.io/coveralls/enb-bem/enb-bem-techs.svg?style=flat)](https://coveralls.io/r/enb-bem/enb-bem-techs?branch=master) [![Dependency Status](https://img.shields.io/david/enb-bem/enb-bem-techs.svg?style=flat)](https://david-dm.org/enb-bem/enb-bem-techs)
+[![NPM version](https://img.shields.io/npm/v/enb-bem-techs.svg?style=flat)](https://www.npmjs.org/package/enb-bem-techs) [![Build Status](https://img.shields.io/travis/enb/enb-bem-techs/master.svg?style=flat&label=tests)](https://travis-ci.org/enb/enb-bem-techs) [![Build status](https://img.shields.io/appveyor/ci/blond/enb-bem-techs.svg?style=flat&label=windows)](https://ci.appveyor.com/project/blond/enb-bem-techs) [![Coverage Status](https://img.shields.io/coveralls/enb/enb-bem-techs.svg?style=flat)](https://coveralls.io/r/enb/enb-bem-techs?branch=master) [![Dependency Status](https://img.shields.io/david/enb/enb-bem-techs.svg?style=flat)](https://david-dm.org/enb/enb-bem-techs)
 
 `enb-bem-techs` — это основной пакет технологий для работы с проектами, созданными по БЭМ-методологии.
 
@@ -15,7 +15,7 @@ enb-bem-techs
 * [levelsToBemdecl](docs/api.ru.md#levelstobemdecl) — формирует BEMDECL-файл из БЭМ-сущностей с указанных уровней.
 * [bemjsonToBemdecl](docs/api.ru.md#bemjsontobemdecl) — формирует BEMDECL-файл из BEMJSON-файла.
 * [deps](docs/api.ru.md#deps) — дополняет декларацию БЭМ-сущностей необходимыми зависимостями.
-* [depsOld](docs/api.ru.md#depsold) — дополняет декларацию БЭМ-сущностей необходимыми зависимостями. Использует алгоритм, заимствованный из [bem-tools](https://ru.bem.info/tools/bem/bem-tools/).
+* [depsOld](docs/api.ru.md#depsold) — дополняет декларацию БЭМ-сущностей необходимыми зависимостями. Использует алгоритм, заимствованный из [bem-tools](https://github.com/bem/bem-tools/tree/support/0.10.x).
 * [depsByTechToBemdecl](docs/api.ru.md#depsbytechtobemdecl) — формирует BEMDECL-файл на основе зависимостей по технологиям.
 * [files](docs/api.ru.md#files) — собирает список исходных файлов и директорий для сборки.
 * [provideBemdecl](docs/api.ru.md#providebemdecl) — копирует BEMDECL-файл из указанной ноды (node) в текущую.
@@ -38,12 +38,12 @@ $ npm install --save-dev enb-bem-techs
 Документация
 ------------
 
-* [API технологий](docs/api.ru.md)
-* [Как устроены БЭМ-проекты](docs/bem-project.md)
+* [Как устроены БЭМ-проекты](https://ru.bem.info/methodology/filesystem/)
 * [Сборка бандла](docs/build-bundle.md)
 * [Сборка страницы](docs/build-page.md)
 * [Сборка merged-бандла](docs/build-merged-bundle.md)
 * [Сборка дистрибутива](docs/build-dist.md)
+* [API технологий](docs/api.ru.md)
 
 Лицензия
 --------

appveyor.yml

@@ -1,7 +1,7 @@
 version: "{build}"
 
 environment:
-  nodejs_version: "0.12"
+  nodejs_version: "4"
 
 matrix:
   fast_finish: true