diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..176a458 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000..5ea0bf8 --- /dev/null +++ b/.jshintrc @@ -0,0 +1,12 @@ +{ + "bitwise": true, + "curly": true, + "esnext": true, + "immed": true, + "newcap": true, + "noarg": true, + "node": true, + "strict": true, + "undef": true, + "unused": "vars" +} diff --git a/README.md b/README.md index 7d08248..78c7ed3 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ brightness.set(0.75, function (err) { console.log('Changed brightness to 75%'); }); -brightness.get(function (err, level) { - console.log(level); +brightness.get(function (err, brightness) { + console.log(brightness); //=> 0.4375 }); ``` @@ -35,8 +35,8 @@ $ npm install --global osx-brightness $ osx-brightness --help Example - $ osx-brightness - $ osx-brightness 0.75 + $ osx-brightness + $ osx-brightness 0.75 ``` diff --git a/cli.js b/cli.js index 545e76d..094428a 100644 --- a/cli.js +++ b/cli.js @@ -7,7 +7,8 @@ var brightness = require('./'); var cli = meow({ help: [ 'Example', - ' $ osx-brightness 75' + ' $ osx-brightness', + ' $ osx-brightness 75' ].join('\n') }); @@ -21,12 +22,12 @@ if (steps) { } }); } else { - brightness.get(function (err, level) { + brightness.get(function (err, brightness) { if (err) { console.error(err.message); process.exit(1); } - console.log(level); + console.log(brightness); }); } diff --git a/index.js b/index.js index 2ee1966..1a8fb85 100644 --- a/index.js +++ b/index.js @@ -2,56 +2,56 @@ var execFile = require('child_process').execFile; -module.exports = { - get: function (cb) { - if (process.platform !== 'darwin') { - throw new Error('Only OS X systems are supported'); - } +module.exports.get = function (cb) { + if (process.platform !== 'darwin') { + throw new Error('Only OS X systems are supported'); + } - var cmd = 'ioreg'; - var args = [ - '-c', - 'AppleBacklightDisplay', - '-r', - '-d', - 1 - ]; - - execFile(cmd, args, function (err, stdout, stderr) { - if (err) { - cb(err); - return; - } - - var reg = new RegExp('"brightness"={(.*?)}'); - var str = reg.exec(stdout)[0]; - - try { - var b = JSON.parse(str.substring(str.indexOf('{'), str.lastIndexOf('}') + 1).replace(/=/g, ':')); - } catch (err) { - cb(err); - return; - } - - cb(null, b.value / b.max); - }); - }, - set: function (val, cb) { - if (process.platform !== 'darwin') { - throw new Error('Only OS X systems are supported'); + var cmd = 'ioreg'; + var args = [ + '-c', + 'AppleBacklightDisplay', + '-r', + '-d', + 1 + ]; + + execFile(cmd, args, function (err, stdout) { + if (err) { + cb(err); + return; } - if (typeof val !== 'number' || isNaN(val) === 'true' || val < 0 || val > 1) { - throw new Error('Expected a value between 0 and 1'); + var reg = new RegExp('"brightness"={(.*?)}'); + var str = reg.exec(stdout)[0]; + var b; + + try { + b = JSON.parse(str.substring(str.indexOf('{'), str.lastIndexOf('}') + 1).replace(/=/g, ':')); + } catch (err) { + cb(err); + return; } - execFile('./main', [val], {cwd: __dirname}, function (err, res) { - if (err) { - cb(err); - return; - } + cb(null, b.value / b.max); + }); +}; - cb(); - }); +module.exports.set = function (val, cb) { + if (process.platform !== 'darwin') { + throw new Error('Only OS X systems are supported'); } + + if (typeof val !== 'number' || isNaN(val) === 'true' || val < 0 || val > 1) { + throw new Error('Expected a value between 0 and 1'); + } + + execFile('./main', [val], {cwd: __dirname}, function (err) { + if (err) { + cb(err); + return; + } + + cb(); + }); };