diff --git a/~dev_rating/deployConfig/database.php b/config/database.php
similarity index 100%
rename from ~dev_rating/deployConfig/database.php
rename to config/database.php
diff --git a/~dev_rating/deployConfig/general.json b/config/general.json
similarity index 100%
rename from ~dev_rating/deployConfig/general.json
rename to config/general.json
diff --git a/~dev_rating/deployConfig/security.php b/config/security.php
similarity index 100%
rename from ~dev_rating/deployConfig/security.php
rename to config/security.php
diff --git a/~dev_rating/deployConfig/session.php b/config/session.php
similarity index 100%
rename from ~dev_rating/deployConfig/session.php
rename to config/session.php
diff --git a/~dev_rating/deployConfig/twig.php b/config/twig.php
similarity index 100%
rename from ~dev_rating/deployConfig/twig.php
rename to config/twig.php
diff --git a/deploy/Makefile b/deploy/Makefile
index 0154a14511d69c8984b620b1f0ef69a07a510e8a..38158c95ef10af56bae864f0be742db1c5d9a33f 100644
--- a/deploy/Makefile
+++ b/deploy/Makefile
@@ -1,6 +1,5 @@
-all:
- npm install --save-dev gulp-rename
- npm install --save-dev gulp-concat-css
- npm install --save-dev gulp-minify-css
- npm install --save-dev gulp-less
- npm install --save-dev gulp-autoprefixer
+all: install_gulp
+ @
+
+install_gulp:
+ $(MAKE) build -C ./gulp
diff --git a/deploy/gulp-install.sh b/deploy/gulp-install.sh
deleted file mode 100755
index 8b0a00a4824f448663a034687d090929ec48ac73..0000000000000000000000000000000000000000
--- a/deploy/gulp-install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-npm install -g gulp
-npm install --save-dev gulp
-npm install --save-dev gulp-rename
-npm install --save-dev gulp-concat-css
-npm install --save-dev gulp-minify-css
-npm install --save-dev gulp-less
-npm install --save-dev gulp-autoprefixer
-
diff --git a/deploy/gulp/Makefile b/deploy/gulp/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..5e7e2cda7d494fa153076d8b1242611090f79dc6
--- /dev/null
+++ b/deploy/gulp/Makefile
@@ -0,0 +1,12 @@
+GULP_DEP := gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-autoprefixer
+INSTALL_PATH := ../
+LOCAL_FLAGS := --save-dev --prefix $(INSTALL_PATH)
+
+build: global $(GULP_DEP)
+ @
+
+global:
+ npm install -g gulp
+
+%:
+ npm install $(LOCAL_FLAGS) $@
diff --git a/deploy/gulp/gulp-install.bat b/deploy/gulp/gulp-install.bat
new file mode 100644
index 0000000000000000000000000000000000000000..d1733260a6928bedaff759288b5cad96f235bd33
--- /dev/null
+++ b/deploy/gulp/gulp-install.bat
@@ -0,0 +1,7 @@
+call npm install -g gulp
+call npm install --save-dev --prefix ../ gulp
+call npm install --save-dev --prefix ../ gulp-rename
+call npm install --save-dev --prefix ../ gulp-concat-css
+call npm install --save-dev --prefix ../ gulp-minify-css
+call npm install --save-dev --prefix ../ gulp-less
+call npm install --save-dev --prefix ../ gulp-autoprefixer
diff --git a/deploy/gulp/gulp-install.sh b/deploy/gulp/gulp-install.sh
new file mode 100644
index 0000000000000000000000000000000000000000..0d9effd9a6064b328d63cc8b948f729c409ced23
--- /dev/null
+++ b/deploy/gulp/gulp-install.sh
@@ -0,0 +1,7 @@
+npm install -g gulp
+npm install --save-dev --prefix ../ gulp
+npm install --save-dev --prefix ../ gulp-rename
+npm install --save-dev --prefix ../ gulp-concat-css
+npm install --save-dev --prefix ../ gulp-minify-css
+npm install --save-dev --prefix ../ gulp-less
+npm install --save-dev --prefix ../ gulp-autoprefixer
diff --git a/deploy/gulpfile.js b/deploy/gulpfile.js
index 4f6c6aaf6590f133661b73af000ef2aa8033441d..de3c15e6729367fc82d7c2469b67a77846e68d71 100644
--- a/deploy/gulpfile.js
+++ b/deploy/gulpfile.js
@@ -1,4 +1,5 @@
'use strict';
+var fs = require('fs');
var gulp = require('gulp');
var prefix = require('gulp-autoprefixer'); //префиксы
var concatCss = require('gulp-concat-css'); //конкатенация
@@ -6,21 +7,46 @@ var minifyCss = require('gulp-minify-css'); //минификация
var rename = require('gulp-rename'); //переименовывание
var less = require('gulp-less');
-var SRC_PATH = '../media/';
-var DEST_PATH = '../~dev_rating/static/';
+var ROOT_PATH = '../';
+var APP_PATH = ROOT_PATH + '~dev_rating/';
-gulp.task('less', function () {
- gulp.src(SRC_PATH + 'less/**/*.less')
- .pipe(less())
- .pipe(gulp.dest(DEST_PATH + 'css/'));
+var SRC_CONFIG_PATH = ROOT_PATH + 'config/';
+var DEST_CONFIG_PATH = APP_PATH + 'application/config/';
+
+var SRC_MEDIA_PATH = ROOT_PATH + 'media/';
+var DEST_MEDIA_PATH = APP_PATH + 'static/';
+
+gulp.task('less:compile', function () {
+ gulp.src(SRC_MEDIA_PATH + 'less/**/*.less')
+ .pipe(less())
+ .pipe(gulp.dest(DEST_MEDIA_PATH + 'css/'));
+});
+
+gulp.task('css:copy', function() {
+ gulp.src(SRC_MEDIA_PATH + 'css/**/*.css')
+ .pipe(gulp.dest(DEST_MEDIA_PATH + 'css/'));
});
-gulp.task('copyCss', function() {
- gulp.src(SRC_PATH + 'css/**/*.css').pipe(gulp.dest(DEST_PATH + 'css/'));
+gulp.task('js:copy', function() {
+ gulp.src(SRC_MEDIA_PATH + 'js/**/*.js')
+ .pipe(gulp.dest(DEST_MEDIA_PATH + 'js/'));
});
-gulp.task('copyJs', function() {
- gulp.src(SRC_PATH + 'js/**/*.js').pipe(gulp.dest(DEST_PATH + 'js/'));
+gulp.task('config:copy', function() {
+ gulp.src(SRC_CONFIG_PATH + '*')
+ .pipe(gulp.dest(DEST_CONFIG_PATH));
+});
+
+gulp.task('folders:create', function() {
+ var dirs = [
+ APP_PATH + 'application/logs/',
+ APP_PATH + 'application/cache/',
+ APP_PATH + 'application/cache/twig/'
+ ];
+ fs.mkdir(dirs[0], function(err, fd) {});
+ fs.mkdir(dirs[1], function(err, fd) {
+ fs.mkdir(dirs[2], function(err, fd) {});
+ });
});
// gulp.task('css', ['less'], function() {
@@ -37,13 +63,15 @@ gulp.task('copyJs', function() {
// });
gulp.task('watch', function () {
- gulp.watch(SRC_PATH + 'css/*.css', ['copyCss']);
- gulp.watch(SRC_PATH + 'less/*.less', ['less']);
-});
-
-// gulp.task('watch', function () {
-// gulp.watch(SRC_PATH + 'less/*.less', ['less']);
-// });
+ gulp.watch(SRC_MEDIA_PATH + 'css/*.css', ['css:copy']);
+ gulp.watch(SRC_MEDIA_PATH + 'less/*.less', ['less:compile']);
+});
-gulp.task('default', ['less','copyCss', 'copyJs']);
+gulp.task('default', [
+ 'less:compile',
+ 'css:copy',
+ 'js:copy',
+ 'config:copy',
+ 'folders:create'
+]);
diff --git a/deploy/initData/law faculty/students.csv b/deploy/init_data/law faculty/students.csv
similarity index 100%
rename from deploy/initData/law faculty/students.csv
rename to deploy/init_data/law faculty/students.csv
diff --git a/deploy/initData/law faculty/subjects.csv b/deploy/init_data/law faculty/subjects.csv
similarity index 100%
rename from deploy/initData/law faculty/subjects.csv
rename to deploy/init_data/law faculty/subjects.csv
diff --git a/deploy/initData/law faculty/teachers.csv b/deploy/init_data/law faculty/teachers.csv
similarity index 100%
rename from deploy/initData/law faculty/teachers.csv
rename to deploy/init_data/law faculty/teachers.csv
diff --git a/deploy/initData/mmcs faculty/english teachers.csv b/deploy/init_data/mmcs faculty/english teachers.csv
similarity index 100%
rename from deploy/initData/mmcs faculty/english teachers.csv
rename to deploy/init_data/mmcs faculty/english teachers.csv
diff --git a/deploy/initData/mmcs faculty/ped and masters students.csv b/deploy/init_data/mmcs faculty/ped and masters students.csv
similarity index 100%
rename from deploy/initData/mmcs faculty/ped and masters students.csv
rename to deploy/init_data/mmcs faculty/ped and masters students.csv
diff --git a/deploy/initData/mmcs faculty/ped subjects.csv b/deploy/init_data/mmcs faculty/ped subjects.csv
similarity index 100%
rename from deploy/initData/mmcs faculty/ped subjects.csv
rename to deploy/init_data/mmcs faculty/ped subjects.csv
diff --git a/deploy/initData/mmcs faculty/pedagogic teachers.csv b/deploy/init_data/mmcs faculty/pedagogic teachers.csv
similarity index 100%
rename from deploy/initData/mmcs faculty/pedagogic teachers.csv
rename to deploy/init_data/mmcs faculty/pedagogic teachers.csv
diff --git a/deploy/initData/mmcs faculty/reports/chessWithIds.jasper b/deploy/init_data/mmcs faculty/reports/chessWithIds.jasper
similarity index 100%
rename from deploy/initData/mmcs faculty/reports/chessWithIds.jasper
rename to deploy/init_data/mmcs faculty/reports/chessWithIds.jasper
diff --git a/deploy/initData/mmcs faculty/reports/chessWithWords.jasper b/deploy/init_data/mmcs faculty/reports/chessWithWords.jasper
similarity index 100%
rename from deploy/initData/mmcs faculty/reports/chessWithWords.jasper
rename to deploy/init_data/mmcs faculty/reports/chessWithWords.jasper
diff --git a/deploy/initData/mmcs faculty/reports/groupList.jasper b/deploy/init_data/mmcs faculty/reports/groupList.jasper
similarity index 100%
rename from deploy/initData/mmcs faculty/reports/groupList.jasper
rename to deploy/init_data/mmcs faculty/reports/groupList.jasper
diff --git a/deploy/initData/mmcs faculty/reports/sheet.jasper b/deploy/init_data/mmcs faculty/reports/sheet.jasper
similarity index 100%
rename from deploy/initData/mmcs faculty/reports/sheet.jasper
rename to deploy/init_data/mmcs faculty/reports/sheet.jasper
diff --git a/deploy/initData/mmcs faculty/students.csv b/deploy/init_data/mmcs faculty/students.csv
similarity index 100%
rename from deploy/initData/mmcs faculty/students.csv
rename to deploy/init_data/mmcs faculty/students.csv
diff --git a/deploy/initData/mmcs faculty/subjects.csv b/deploy/init_data/mmcs faculty/subjects.csv
similarity index 100%
rename from deploy/initData/mmcs faculty/subjects.csv
rename to deploy/init_data/mmcs faculty/subjects.csv
diff --git a/deploy/initData/mmcs faculty/teachers other.csv b/deploy/init_data/mmcs faculty/teachers other.csv
similarity index 100%
rename from deploy/initData/mmcs faculty/teachers other.csv
rename to deploy/init_data/mmcs faculty/teachers other.csv
diff --git a/deploy/initData/mmcs faculty/teachers.csv b/deploy/init_data/mmcs faculty/teachers.csv
similarity index 100%
rename from deploy/initData/mmcs faculty/teachers.csv
rename to deploy/init_data/mmcs faculty/teachers.csv
diff --git a/~dev_rating/index.php b/~dev_rating/index.php
index 0e5b82376e30c971eece0acd279cec0eab62baaf..8ef78b1b51111cb205d4ddc301921732ef01d1eb 100644
--- a/~dev_rating/index.php
+++ b/~dev_rating/index.php
@@ -23,12 +23,6 @@ $modules = 'modules';
*/
$system = 'system';
-/**
- * Директория, в которой содержатся конфиги, используемые при деплое.
- *
- * @link http://kohanaframework.org/guide/about.install#system
- */
-$deployConfig = 'deployConfig';
/**
* The default extension of resource files. If you change this, all resources
@@ -76,18 +70,13 @@ if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
$system = DOCROOT.$system;
-// Make the configs relative to the docroot, for symlink'd index.php
-if ( ! is_dir($deployConfig) AND is_dir(DOCROOT.$deployConfig))
- $deployConfig = DOCROOT.$deployConfig;
-
// Define the absolute paths for configured directories
define('APPPATH', realpath($application).DIRECTORY_SEPARATOR);
define('MODPATH', realpath($modules).DIRECTORY_SEPARATOR);
define('SYSPATH', realpath($system).DIRECTORY_SEPARATOR);
-define('CFGPATH', realpath($deployConfig).DIRECTORY_SEPARATOR);
// Clean up the configuration vars
-unset($application, $modules, $system, $deployConfig);
+unset($application, $modules, $system);
if (file_exists('install'.EXT))
{
@@ -95,11 +84,6 @@ if (file_exists('install'.EXT))
return include 'install'.EXT;
}
-if (file_exists('deploy'.EXT))
-{
- // Load the deploy check
- include 'deploy'.EXT;
-}
/**
* Define the start time of the application, used for profiling.