update gulpfile and update devDependencies

README.RU.md

@@ -9,7 +9,7 @@ Gulp + Ect.js + Sass (Compass) + CoffeeScript + LiveReload + Bower
 # Установка
 1\. Убедитесь в том, что вы установили [Ruby](http://www.ruby-lang.org/en/downloads/), [Node.js](http://nodejs.org/) и [Git](http://git-scm.com/downloads).
 
-2\. Установите [Sass](http://sass-lang.com/install), [Compass](http://compass-style.org/install/), [Gulp](https://github.com/gulpjs/gulp/blob/master/docs/getting-started.md), [CoffeeScript](http://coffeescript.org/#installation) and  [Bower](http://bower.io/).
+2\. Установите [Sass](http://sass-lang.com/install), [Compass](http://compass-style.org/install/), [Gulp](https://github.com/gulpjs/gulp/blob/master/docs/getting-started.md), [CoffeeScript](http://coffeescript.org/#installation) и  [Bower](http://bower.io/).
 
 3\. Склонируйте git репозиторий или [скачайте zip архив](https://github.com/AveVlad/psd2html-boilerplate/archive/master.zip) и распакуйте его.
 

gulpfile.coffee

@@ -15,15 +15,13 @@ gulp.task 'connect', p.connect.server(
 gulp.task 'ect', ->
   gulp
   .src([src + '/*.ect'])
-  .pipe(p.watch())
   .pipe(p.ect())
   .pipe(gulp.dest(out + '/'))
   .pipe(p.connect.reload())
 
 gulp.task 'compass', ->
   gulp
   .src([src + '/sass/*.sass'])
-  .pipe(p.watch())
   .pipe p.compass(
       css: out + '/css'
       sass: src + '/sass'
@@ -34,9 +32,13 @@ gulp.task 'compass', ->
 gulp.task 'coffee', ->
   gulp
   .src([src + '/coffee/*.coffee'])
-  .pipe(p.watch())
   .pipe(p.coffee(bare: true))
   .pipe(gulp.dest(out + '/js/'))
   .pipe(p.connect.reload())
 
-gulp.task 'default', ['connect', 'ect', 'coffee', 'compass']
+gulp.task 'watch', ->
+  gulp.watch [src + '/sass/*.sass', src + '/sass/**/*.sass'], ['compass']
+  gulp.watch [src + '/*.ect', src + '/ect/**/*.ect'], ['ect']
+  gulp.watch [src + '/coffee/*.coffee'], ['coffee']
+
+gulp.task 'default', ['connect', 'ect', 'coffee', 'compass', 'watch']

package.json

@@ -1,7 +1,7 @@
 {
   "name": "psd2html-boilerplate",
   "description": "Gulp + Ect.js + Sass (Compass) + CoffeeScript + LiveReload + Bower",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "license": "MIT",
   "repository": "avevlad/psd2html-boilerplate",
   "author": {
@@ -10,14 +10,13 @@
     "url": "http://vld.me"
   },
   "devDependencies": {
-    "gulp": "~3.5.1",
+    "gulp": "~3.5.2",
     "gulp-util": "~2.2.14",
     "gulp-coffee": "~1.4.1",
-    "gulp-compass": "~1.1.1",
-    "gulp-connect": "~0.3.0",
-    "gulp-ect": "~1.0.0",
-    "gulp-load-plugins": "~0.2.0",
-    "coffee-script": "~1.7.1",
-    "gulp-watch": "~0.5.0"
+    "gulp-compass": "~1.1.2",
+    "gulp-connect": "~0.3.1",
+    "gulp-ect": "~1.3.0",
+    "gulp-load-plugins": "~0.3.0",
+    "coffee-script": "~1.7.1"
   }
 }

public/css/main.css

@@ -3,7 +3,7 @@
 .icons-sprite {
   background: url('../images/icons-sdaf092d5c4.png') no-repeat; }
 
-/* line 17, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 17, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -24,38 +24,38 @@ time, mark, audio, video {
   font-size: 100%;
   vertical-align: baseline; }
 
-/* line 22, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 22, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 html {
   line-height: 1; }
 
-/* line 24, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 24, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 ol, ul {
   list-style: none; }
 
-/* line 26, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 26, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 table {
   border-collapse: collapse;
   border-spacing: 0; }
 
-/* line 28, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 28, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 caption, th, td {
   text-align: left;
   font-weight: normal;
   vertical-align: middle; }
 
-/* line 30, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 30, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 q, blockquote {
   quotes: none; }
-  /* line 103, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+  /* line 103, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
   q:before, q:after, blockquote:before, blockquote:after {
     content: "";
     content: none; }
 
-/* line 32, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 32, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 a img {
   border: none; }
 
-/* line 116, C:/Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 116, ../../../../../../Ruby200/lib/ruby/gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
   display: block; }