Skip to content

Commit

Permalink
Merge pull request #11 from mohayonao/v0.2.4
Browse files Browse the repository at this point in the history
v0.2.4
  • Loading branch information
mohayonao committed Nov 20, 2014
2 parents 22fbdb9 + 4d7504c commit b5b6184
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 25 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ node_js:
env:
global:
- secure: "m5WsEXZKSwx9sH4+Eynp5fS0WMzFbWGvwmziotmhGGP16bYwsHNkeYZY9tmKl4XWxXEcpvdpt1Pq8NIGskM+VJ2jTClWdgnl5RuLt8tcRbwaGYBp4J4OVbpkT7LHxKUspCgG+krJic1JcCNCgMT7VU+4hc5u0kJ9uo/DaZrzd84="
before_install:
- npm install -g gulp
- npm install -g coveralls
before_script:
- npm install gulp
script:
- gulp travis
- npm run travis
after_success:
- coveralls < ./coverage/lcov.info
- $(npm bin)/coveralls < ./coverage/lcov.info
13 changes: 7 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
"use strict";

var gulp = require("gulp");
var browserify = require("browserify");
var source = require("vinyl-source-stream");
var buffer = require("vinyl-buffer");
var jshint = require("gulp-jshint");
var mocha = require("gulp-mocha");
var istanbul = require("gulp-istanbul");
var browerify = require("gulp-browserify");
var uglify = require("gulp-uglify");
var rename = require("gulp-rename");

Expand Down Expand Up @@ -32,14 +34,13 @@ gulp.task("cover", function(cb) {
});

gulp.task("build", function() {
return gulp.src("index.js")
return browserify("./index.js")
.bundle()
/* gretro.js */
.pipe(browerify({
standalone: "gretro"
}))
.pipe(rename("gretro.js"))
.pipe(source("gretro.js"))
.pipe(gulp.dest("build"))
/* gretro.min.js */
.pipe(buffer())
.pipe(uglify())
.pipe(rename("gretro.min.js"))
.pipe(gulp.dest("build"));
Expand Down
29 changes: 18 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gretro",
"description": "Gretro is a JavaScript Graphic library for retro CG",
"version": "0.2.3",
"version": "0.2.4",
"author": "Nao Yonamine <mohayonao@gmail.com>",
"license": "MIT",
"repository": {
Expand All @@ -15,20 +15,27 @@
],
"main": "index.js",
"scripts": {
"test": "mocha"
"lint": "gulp lint",
"test": "gulp test",
"cover": "gulp cover",
"build": "gulp build",
"travis": "gulp travis"
},
"dependencies": {},
"devDependencies": {
"chai": "^1.9.1",
"browserify": "^6.3.2",
"chai": "^1.10.0",
"coveralls": "^2.11.2",
"gretro-text": "^0.1.0",
"gulp": "^3.8.7",
"gulp-browserify": "^0.5.0",
"gulp-istanbul": "^0.2.1",
"gulp-jshint": "^1.8.4",
"gulp-mocha": "^0.5.2",
"gulp": "^3.8.10",
"gulp-istanbul": "^0.3.1",
"gulp-jshint": "^1.9.0",
"gulp-mocha": "^2.0.0",
"gulp-rename": "^1.2.0",
"gulp-uglify": "^0.3.1",
"jshint-stylish": "^0.4.0",
"png": "^3.0.3"
"gulp-uglify": "^1.0.1",
"jshint-stylish": "^1.0.0",
"png": "^3.0.3",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion src/gretro.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var util = require("./utils");
var used = [];

exports.version = "0.2.3";
exports.version = "0.2.4";

exports.use = function(fn) {
/* istanbul ignore else */
Expand Down

0 comments on commit b5b6184

Please sign in to comment.