From a3d56a4677b4437e153e9aff99fc57cfc203c382 Mon Sep 17 00:00:00 2001 From: Toinane Date: Thu, 2 Mar 2017 22:28:40 +0100 Subject: [PATCH] delete travis and update main.js --- .travis.yml | 136 ------------------ ...ectron \302\267 octalmagerobotjs Wiki.URL" | 0 ...selection - electron - Atom Discussion.URL | 0 ... electron - electron - Atom Discussion.URL | 0 .../desktopCapturer - Electron.URL | 0 ...d at master \302\267 electronelectron.URL" | 0 ...agerobotjs Node.js Desktop Automation..URL | 0 main.js | 10 +- package.json | 21 +-- 9 files changed, 16 insertions(+), 151 deletions(-) delete mode 100644 .travis.yml rename "Electron \302\267 octalmagerobotjs Wiki.URL" => "links/Electron \302\267 octalmagerobotjs Wiki.URL" (100%) rename How to build an eye-dropper for color selection - electron - Atom Discussion.URL => links/How to build an eye-dropper for color selection - electron - Atom Discussion.URL (100%) rename Take desktop screenshots with electron - electron - Atom Discussion.URL => links/Take desktop screenshots with electron - electron - Atom Discussion.URL (100%) rename desktopCapturer - Electron.URL => links/desktopCapturer - Electron.URL (100%) rename "electrondesktop-capturer.md at master \302\267 electronelectron.URL" => "links/electrondesktop-capturer.md at master \302\267 electronelectron.URL" (100%) rename octalmagerobotjs Node.js Desktop Automation..URL => links/octalmagerobotjs Node.js Desktop Automation..URL (100%) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3f62cc4f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,136 +0,0 @@ ---- -sudo: false -language: cpp -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - g++-4.8-multilib - - gcc-multilib - - libgtk2.0-0 - - libxtst6 - - libnotify4 - - libgconf2-4 - - libgtk2.0-0:i386 - - libxtst6:i386 - - libnotify4:i386 - - libgconf2-4:i386 - - libnss3:i386 - - libasound2:i386 - - libxss1:i386 - -# Build matrix -os: -- linux -- osx -env: - global: - - secure: "qEdwCY/ilHkqWkqasN5MgWCnzzop4lEYkbpxEiVMTZBY12p4uV6ysPQ+ZLZcx10Cg90RIQlsPeEANIhCzkWfnQi+ySmeiKY9JR2eSnb69wM7dBQ/uxv04eVChAlZSsDHwmTIIzIzZFsrWrcwwJaENGCJYKqZ9LKOiGFGQ8Is09A=" - matrix: - - TRAVIS_NODE_VERSION="5" - - TRAVIS_NODE_VERSION="5" ARCH="x86" - - TRAVIS_NODE_VERSION="0.10" - - TRAVIS_NODE_VERSION="0.10" ARCH="x86" - - TRAVIS_NODE_VERSION="0.12" - - TRAVIS_NODE_VERSION="0.12" ARCH="x86" - - TRAVIS_NODE_VERSION="4" - - TRAVIS_NODE_VERSION="4" ARCH="x86" - - TRAVIS_NODE_VERSION="6" - - TRAVIS_NODE_VERSION="6" ARCH="x86" - - TRAVIS_NODE_VERSION="7" - - TRAVIS_NODE_VERSION="7" ARCH="x86" - - TRAVIS_ELECTRON_VERSION="1.4.6" ARCH="x64" TRAVIS_NODE_VERSION="5" - - TRAVIS_ELECTRON_VERSION="1.4.6" ARCH="ia32" TRAVIS_NODE_VERSION="5" -matrix: - exclude: - - os: osx - env: TRAVIS_NODE_VERSION="0.10" ARCH="x86" - - os: osx - env: TRAVIS_NODE_VERSION="0.12" ARCH="x86" - - os: osx - env: TRAVIS_NODE_VERSION="4" ARCH="x86" - - os: osx - env: TRAVIS_NODE_VERSION="6" ARCH="x86" - - os: osx - env: TRAVIS_NODE_VERSION="7" ARCH="x86" - - os: osx - env: TRAVIS_ELECTRON_VERSION="1.4.6" ARCH="ia32" TRAVIS_NODE_VERSION="5" - -before_install: -# reinstall latest nvm -- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh -- nvm install $TRAVIS_NODE_VERSION -- PATH=$PATH:`pwd`/node_modules/.bin - -- BASE_URL=$(node -p "'https://nodejs.org/dist/' + process.version") -- X86_FILE=$(node -p "'node-' + process.version + '-' + process.platform + '-x86'") -# download node if testing x86 architecture -- if [[ "$ARCH" == "x86" ]]; then wget $BASE_URL/$X86_FILE.tar.gz; tar -xf $X86_FILE.tar.gz; export PATH=$X86_FILE/bin:$PATH; fi - -# print versions -- uname -a -- file `which node` -- node --version -- node -p 'process.platform + "@" + process.arch' -- npm --version - -# use g++-4.8 on Linux -- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CXX=g++-4.8; fi -- $CXX --version - -# figure out if we should publish -- PUBLISH_BINARY=false -# if we are building a tag then publish -- echo $TRAVIS_BRANCH -- echo `git describe --tags --always HEAD` -- if [[ $TRAVIS_BRANCH == `git describe --tags --always HEAD` ]]; then PUBLISH_BINARY=true; fi; -- echo "Publishing native platform Binary Package? ->" $PUBLISH_BINARY - -# Cleanup the output of npm -- npm config set progress false -- npm config set spin false - -- > - if [[ ! -z $TRAVIS_ELECTRON_VERSION ]]; then - if [[ $TRAVIS_OS_NAME == "linux" ]]; then - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - fi - export npm_config_target=$TRAVIS_ELECTRON_VERSION - export npm_config_arch=$ARCH - export npm_config_disturl=https://atom.io/download/atom-shell - export npm_config_runtime=electron - npm install --arch=$ARCH electron@$TRAVIS_ELECTRON_VERSION - npm install electron-mocha - echo "installed Electron $TRAVIS_ELECTRON_VERSION" - fi -install: -# ensure source install works -- npm install --build-from-source - - -script: - # linting no longer works on node 0.10 -- node bin/lower-than-node-4.0.js || npm run lint -- npm run docs:diff -- > - if [[ -z $TRAVIS_ELECTRON_VERSION ]]; then - node ./ - npm test - else - electron test/electron - fi -# if publishing, do it -- if [[ $PUBLISH_BINARY == true ]]; then node-pre-gyp package; fi; -- if [[ $PUBLISH_BINARY == true ]]; then node-pre-gyp-github publish --release; fi; - -# cleanup -- node-pre-gyp clean - -# test binary exists -- if [[ $PUBLISH_BINARY == true ]]; then npm install --fallback-to-build=false; fi; - -after_success: -- bash <(curl -s https://codecov.io/bash) diff --git "a/Electron \302\267 octalmagerobotjs Wiki.URL" "b/links/Electron \302\267 octalmagerobotjs Wiki.URL" similarity index 100% rename from "Electron \302\267 octalmagerobotjs Wiki.URL" rename to "links/Electron \302\267 octalmagerobotjs Wiki.URL" diff --git a/How to build an eye-dropper for color selection - electron - Atom Discussion.URL b/links/How to build an eye-dropper for color selection - electron - Atom Discussion.URL similarity index 100% rename from How to build an eye-dropper for color selection - electron - Atom Discussion.URL rename to links/How to build an eye-dropper for color selection - electron - Atom Discussion.URL diff --git a/Take desktop screenshots with electron - electron - Atom Discussion.URL b/links/Take desktop screenshots with electron - electron - Atom Discussion.URL similarity index 100% rename from Take desktop screenshots with electron - electron - Atom Discussion.URL rename to links/Take desktop screenshots with electron - electron - Atom Discussion.URL diff --git a/desktopCapturer - Electron.URL b/links/desktopCapturer - Electron.URL similarity index 100% rename from desktopCapturer - Electron.URL rename to links/desktopCapturer - Electron.URL diff --git "a/electrondesktop-capturer.md at master \302\267 electronelectron.URL" "b/links/electrondesktop-capturer.md at master \302\267 electronelectron.URL" similarity index 100% rename from "electrondesktop-capturer.md at master \302\267 electronelectron.URL" rename to "links/electrondesktop-capturer.md at master \302\267 electronelectron.URL" diff --git a/octalmagerobotjs Node.js Desktop Automation..URL b/links/octalmagerobotjs Node.js Desktop Automation..URL similarity index 100% rename from octalmagerobotjs Node.js Desktop Automation..URL rename to links/octalmagerobotjs Node.js Desktop Automation..URL diff --git a/main.js b/main.js index b49f5f9b..162019cd 100644 --- a/main.js +++ b/main.js @@ -9,15 +9,15 @@ let win, tray; function createWindow(){ - var robot = require("robotjs"); +//var robot = require("robotjs"); // Get mouse position. -var mouse = robot.getMousePos(); +//var mouse = robot.getMousePos(); // Get pixel color in hex format. -var hex = robot.getPixelColor(mouse.x, mouse.y); -console.log("#" + hex + " at x:" + mouse.x + " y:" + mouse.y); - +//var hex = robot.getPixelColor(mouse.x, mouse.y); +//console.log("#" + hex + " at x:" + mouse.x + " y:" + mouse.y); + /*app.setUserTasks([ { program: __dirname+'/main.js', diff --git a/package.json b/package.json index e22f206b..a6279929 100644 --- a/package.json +++ b/package.json @@ -6,18 +6,19 @@ "main": "main.js", "scripts": { "start": "electron .", + "text": "xvfb-maybe electron-mocha main.js", "pack": "build --dir", "dist": "build" }, - "build":{ - "appId": "toinane.colorpicker", - "mac": { - "category": "toinane.app.design" - }, - "win": { - "iconUrl": "logo.png" - } - }, + "build": { + "appId": "toinane.colorpicker", + "mac": { + "category": "toinane.app.design" + }, + "win": { + "iconUrl": "logo.png" + } + }, "repository": "https://github.com/toinane/colorpicker", "keywords": [ "ColorPicker", @@ -26,7 +27,7 @@ "crea-that" ], "devDependencies": { - "electron": "^1.5.0" + "electron": "^1.6.1" }, "author": "Toinane", "homepage": "https://toinane.crea-th.at",