Skip to content

Corrige pacote do imagemin desatualizado e utiliza gulp-sass no lugar de gulp-compass #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luchesigui wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Corrige pacote do imagemin desatualizado e utiliza gulp-sass no lugar de gulp-compass #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59ffe89
Fix gulp bootstrap
fdaciuk Jul 21, 2014
7ef1468
troca gulp-compass por gulp-sass que nao usa ruby
Sep 8, 2017
b17dcb9
atualiza versao do gulp-imagemin
Sep 8, 2017
1174824
troca build de compass por sass
Sep 8, 2017
84162f9
atualiza versao do pacote
Sep 8, 2017
67e2f81
remove arquivo de configuracao do ruby
Sep 8, 2017
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
28 changes: 0 additions & 28 deletions config.rb
View file
Open in desktop

This file was deleted.

95 changes: 58 additions & 37 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
var fs = require( 'fs' );
var gulp = require( 'gulp' );
var clean = require( 'gulp-clean' );
var compass = require( 'gulp-compass' );
var sass = require( 'gulp-sass' );
var plumber = require( 'gulp-plumber' );
var imagemin = require( 'gulp-imagemin' );
var jshint = require( 'gulp-jshint' );
var minifycss = require( 'gulp-minify-css' );
var curl = require( 'node-curl' );
// var rename = require( 'gulp-rename' );
var gulpconcat = require( 'gulp-concat' );
var rename = require( 'gulp-rename' );
var gulpconcat = require( 'gulp-concat' );
var uglify = require( 'gulp-uglify' );
var zip = require( 'gulp-zip' );
var rsync = require( 'rsyncwrapper' ).rsync;
Expand Down Expand Up @@ -44,7 +43,7 @@ gulp.task( 'uglify', [ 'jshint' ], function() {



gulp.task( 'uglify-bootstrap', function() {
gulp.task( 'uglify-bootstrap', [ 'clean-bootstrap' ], function() {
gulp.src([
gulpconfig.dirs.src_js + '/bootstrap/transition.js',
gulpconfig.dirs.src_js + '/bootstrap/alert.js',
Expand All @@ -65,16 +64,10 @@ gulp.task( 'uglify-bootstrap', function() {



gulp.task( 'compass', function() {
gulp.task( 'sass', function() {
var stream = gulp.src( gulpconfig.dirs.sass + '/**/*' )
.pipe( plumber() )
.pipe(
compass({
config_file : './config.rb',
css : gulpconfig.dirs.css,
sass: gulpconfig.dirs.sass
})
)
.pipe( sass().on('error', sass.logError) )
.pipe( minifycss() )
.pipe( gulp.dest( gulpconfig.dirs.css ) );

Expand All @@ -85,7 +78,7 @@ gulp.task( 'compass', function() {

gulp.task( 'watch', function() {
var watchers = [
gulp.watch( gulpconfig.dirs.sass + '/**/*', [ 'compass' ] ),
gulp.watch( gulpconfig.dirs.sass + '/**/*', [ 'sass' ] ),
gulp.watch( gulpconfig.dirs.src_js + '/**/*.js', [ 'uglify' ] )
];

Expand Down Expand Up @@ -191,51 +184,79 @@ gulp.task( 'zip', function() {



gulp.task( 'get-bootstrap', function() {
gulp.task( 'clean', function() {
var dirs = gulpconfig.dirs;

gulp.src([
dirs.tmp + '/*',
dirs.sass + '/bootstrap/*',
dirs.src_js + '/bootstrap/*',
dirs.sass + '/bootstrap',
dirs.src_js + '/bootstrap',
dirs.src_js + '/libs/bootstrap.min.js',
dirs.fonts + '/bootstrap/*'
dirs.fonts + '/bootstrap'
], { read: false })
.pipe( clean({ force: true }) );
});



gulp.task( 'curl', function() {
curl( 'https://github.com/twbs/bootstrap-sass/archive/master.zip', { raw: 1 }, function() {
fs.writeFile( './tmp/bootstrap-sass.zip', this.body, function( err ) {
if( err ) throw err;
console.log( './tmp/bootstrap.zip created!' );
});
gulp.task( 'get-bootstrap', [ 'clean' ], function() {
var url = 'https://github.com/twbs/bootstrap-sass/archive/master.zip';
return require( 'gulp-download' )( url )
.pipe( gulp.dest( gulpconfig.dirs.tmp ) );
});



gulp.task( 'unzip', [ 'get-bootstrap' ], function( cb ) {
var exec = require( 'child_process' ).exec;
exec( 'cd tmp/ && unzip master.zip && cd ..', function( err, stdout, stderr ) {
console.log( stdout );
console.log( stderr );
cb( err );
});
});



gulp.task( 'rename', [ 'unzip' ], function() {
gulp.src( gulpconfig.dirs.tmp + '/bootstrap-sass-master/assets/stylesheets/bootstrap/**/*' )
.pipe( gulp.dest( gulpconfig.dirs.sass + '/bootstrap' ) );

gulp.src( gulpconfig.dirs.tmp + '/bootstrap-sass-master/assets/javascripts/bootstrap/**/*' )
.pipe( gulp.dest( gulpconfig.dirs.src_js + '/bootstrap' ) );

gulp.src( gulpconfig.dirs.tmp + '/bootstrap-sass-master/assets/fonts/bootstrap/**/*' )
.pipe( gulp.dest( gulpconfig.dirs.fonts + '/bootstrap' ) );
});



gulp.task( 'clean-bootstrap', [ 'rename' ], function() {
var dirs = gulpconfig.dirs;

gulp.src([
dirs.tmp + '/*',
dirs.sass + '/bootstrap/bootstrap.scss'
], { read: false })
.pipe( clean({ force: true }) );
});







/**
* Execution Tasks
*/
gulp.task( 'default', [ 'jshint', 'compass', 'uglify' ] );
gulp.task( 'default', [ 'jshint', 'sass', 'uglify' ] );
gulp.task( 'optimize', [ 'imagemin' ] );
gulp.task( 'ftp', [ 'ftp-deploy' ] );
gulp.task( 'compress', [ 'default', 'zip' ] );
gulp.task( 'bootstrap', [
'get-bootstrap',
'curl'
// 'curl-bootstrap-sass',
// 'unzip-bootstrap-scss',
// 'rename-bootstrap-scss',
// 'rename-bootstrap-js',
// 'rename-bootstrap-fonts',
// 'clean-bootstrap',
// 'uglify-bootstrap',
// 'compass'
]);
gulp.task( 'bootstrap', [ 'uglify-bootstrap' ], function() {
gulp.start( 'sass' );
});



Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"name": "odin",
"description": "Tema base para desenvolvimento em WordPress",
"version": "2.2.3",
"version": "2.2.4",
"title": "Odin Framework",
"homepage": "http://wpod.in/",
"main": "gulpfile.js",
"devDependencies": {
"colors": "^0.6.2",
"gulp": "^3.8.6",
"gulp-clean": "^0.3.1",
"gulp-compass": "^1.1.9",
"gulp-concat": "^2.3.3",
"gulp-download": "0.0.1",
"gulp-ftp": "^0.4.0",
"gulp-imagemin": "^0.6.1",
"gulp-imagemin": "^3.3.0",
"gulp-jshint": "^1.7.1",
"gulp-minify-css": "^0.3.7",
"gulp-plumber": "^0.6.4",
"gulp-rename": "^1.2.0",
"gulp-sass": "^3.1.0",
"gulp-uglify": "^0.3.1",
"gulp-zip": "^0.4.0",
"node-curl": "^0.3.1",
"rsyncwrapper": "^0.4.0"
}
}