diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d838da9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +examples/ diff --git a/examples/.psrite b/examples/.psrite deleted file mode 100644 index a96f4b9..0000000 --- a/examples/.psrite +++ /dev/null @@ -1,17 +0,0 @@ -.sprite { - background: url( 'examples/p.png' ) no-repeat; - background-size: 1969px 1233px; -} - -.sprite.image-2 { - width: 1233px; - height: 1233px; - background-position: 0px 0px; -} - -.sprite.image-1 { - width: 736px; - height: 736px; - background-position: -1233px 0px; -} - diff --git a/examples/examples/p.png b/examples/examples/p.png deleted file mode 100644 index 1fd73d9..0000000 Binary files a/examples/examples/p.png and /dev/null differ diff --git a/examples/image-1.png b/examples/image-1.png deleted file mode 100644 index 7214a3c..0000000 Binary files a/examples/image-1.png and /dev/null differ diff --git a/examples/image-2.png b/examples/image-2.png deleted file mode 100644 index 48444cd..0000000 Binary files a/examples/image-2.png and /dev/null differ diff --git a/lib/sprites-generator.js b/lib/sprites-generator.js index 541ba7f..faa938f 100644 --- a/lib/sprites-generator.js +++ b/lib/sprites-generator.js @@ -1,59 +1,44 @@ var Builder = require('node-spritesheet').Builder, commands = require('./commands'), fs = require('fs'), - deferred = require('deferred') - , path=require('path'); + deferred = require('deferred'), + path = require('path'); var options = {} askParams().then(function(options) { - console.log('1',options) + console.log('1', options) var b = new Builder(options); console.log(options) b.build(function() { console.log('terminated') }) -}, function(err){ - console.log('err',err) +}, function(err) { + console.log('err', err) }) function askParams() { - var def = deferred() - - commands.askInputFolder().then(function(inputFolder) { - - options.inputFolder = path.resolve(inputFolder) - options.outputDirectory=inputFolder - - commands.askOutputImage().then(function(outputImage) { - - options.outputImage = outputImage - - - commands.askOutputCss().then(function(outputCss) { - - options.outputCss = outputCss - - commands.askSelector().then(function(selector) { - - options.selector = selector - - listFilesOf(options.inputFolder).then(function(files) { - options.images = files - - - def.resolve(options) + var def = deferred(), + options = {}, + thisFolderName = path.resolve('./').match(/[^\/]+$/g)[0]; + + + options.inputFolder = path.resolve('./') + options.outputDirectory = options.inputFolder + options.outputImage = thisFolderName + '.png' + options.outputCss = thisFolderName + '.css' + options.selector = '.' + thisFolderName + + listFilesOf(options.inputFolder).then(function(files) { + options.images = files + def.resolve(options) + }, function(err) { + console.log('err', err) + }) - }, function(err){ - console.log('err',err) - }) - }) - }) - }) - }) return def.promise; } @@ -66,7 +51,9 @@ function listFilesOf(folder) { return def.reject(err) } console.log('Images:', files) - def.resolve(files.map(function(el){return path.resolve(folder,el)})) + def.resolve(files.filter(function(el){return el.match(/\.png$/g)!=null }).map(function(el) { + return path.resolve(folder, el) + })) }); return def.promise; } \ No newline at end of file