Skip to content

Version 0.2.1 #9

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

Merged
merged 2 commits into from
Feb 16, 2016
Merged

Version 0.2.1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ba4096
[0.1.4] Better handling of bad inputs
RickCarlino Feb 16, 2016
76afac3
[0.2.2] Better handling of bad inputs
RickCarlino Feb 16, 2016
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
2 changes: 1 addition & 1 deletion dist/farmbot-min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion dist/farmbot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ return (function(global) {

Farmbot.prototype.__onmessage = function(e) {
var msg = Farmbot.decodeFrame(e.data);
var id = msg.message.id;
var nullMessage = {name: "unknown", message: {}};
var id = (msg.message || nullMessage).id;
if (id) {
this.emit(id, msg.message);
} else {
Expand Down
19 changes: 12 additions & 7 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
var gulp = require('gulp'),
wrap = require('gulp-wrap-umd'),
minify = require('gulp-minify');
minify = require('gulp-minify'),
SRC_PATH = 'src/farmbot.js',
UMD_CONFIG = wrap({ namespace: 'Farmbot' }),
BUILD_PATH = gulp.dest('dist/');

gulp.task('build', function() {
gulp.src('src/farmbot.js')
.pipe(wrap({
namespace: 'Farmbot'
}))
.pipe(minify())
.pipe(gulp.dest('dist/'));
var lib = gulp
.src(SRC_PATH)
.pipe(UMD_CONFIG);

var minifiedLib = lib.pipe(minify());

lib.pipe(BUILD_PATH);
minifiedLib.pipe(BUILD_PATH);
});
6 changes: 2 additions & 4 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ module.exports = function(config) {
basePath: '',
frameworks: ['jasmine'],
files: [
'dist/farmbot-min.js',
// 'dist/farmbot.js',
// 'src/farmbot.js',
'dist/farmbot.js',
'test/helpers.js',
'test/**/*_test.js'
],
preprocessors: {
'src/**/*.js': 'coverage',
'dist/*.js': 'coverage',
},
reporters: [
'coverage',
Expand Down
9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "farmbot",
"version": "0.1.2",
"version": "0.2.2",
"description": "Javascript wrapper for Farmbot's authentication and RPC instructions",
"main": "dist/farmbot.js",
"scripts": {
Expand All @@ -21,14 +21,15 @@
"url": "https://github.com/FarmBot/farmbot-js/issues"
},
"homepage": "https://github.com/FarmBot/farmbot-js#readme",
"devDependencies": {
"dependencies": {
"gulp-minify": "0.0.5",
"gulp-wrap-umd": "^0.2.1",
"jasmine-core": "^2.3.4",
"karma": "^0.13.15",
"karma-chrome-launcher": "^0.2.1",
"karma-coverage": "^0.5.3",
"karma-jasmine": "^0.3.6",
"karma-spec-reporter": "0.0.23",
"source-map": "^0.5.3"
},
"dependencies": {}
}
}
3 changes: 2 additions & 1 deletion src/farmbot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@

Farmbot.prototype.__onmessage = function(e) {
var msg = Farmbot.decodeFrame(e.data);
var id = msg.message.id;
var nullMessage = {name: "unknown", message: {}};
var id = (msg.message || nullMessage).id;
if (id) {
this.emit(id, msg.message);
} else {
Expand Down