Skip to content

Commit fafd49f

Browse files
s1hofmanns1hofmann
committed
Merge branch 'develop' into feature/87/api_docs
# Conflicts: # docs/classes/assert.html # docs/classes/bresenham.html # docs/classes/clipboard.html # docs/classes/clipboardaction.html # docs/classes/image.html # docs/classes/imageprocessor.html # docs/classes/imagereader.html # docs/classes/imagewriter.html # docs/classes/keyboard.html # docs/classes/keyboardaction.html # docs/classes/linehelper.html # docs/classes/locationparameters.html # docs/classes/matchrequest.html # docs/classes/matchresult.html # docs/classes/mouse.html # docs/classes/mouseaction.html # docs/classes/nativeadapter.html # docs/classes/point.html # docs/classes/region.html # docs/classes/scaledmatchresult.html # docs/classes/screen.html # docs/classes/screenaction.html # docs/classes/templatematchingfinder.html # docs/classes/visionadapter.html # docs/enums/button.html # docs/enums/filetype.html # docs/enums/key.html # docs/globals.html # docs/interfaces/__global.jest.matchers.html # docs/interfaces/clipboardactionprovider.html # docs/interfaces/datasink.html # docs/interfaces/datasource.html # docs/interfaces/finderinterface.html # docs/interfaces/keyboardactionprovider.html # docs/interfaces/mouseactioninterface.html # docs/interfaces/screenactionprovider.html # package-lock.json
2 parents cc7ee90 + 985ecc3 commit fafd49f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3258
-2918
lines changed

‎.build/run_linux.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
echo $PWD
5+
6+
docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${NODE_VERSION}"

‎.build/run_osx.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
echo $PWD
5+
6+
npm ci
7+
npm run compile
8+
npm test

‎.build/setup_linux.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
5+
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
6+
sudo apt-get update
7+
sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
8+
docker pull s1hofmann/nut-ci:latest
9+
docker run -it -d --name nut-ci --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash

‎.build/setup_osx.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env bash
2+
set -e

‎.travis.yml‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
os: linux
2-
dist: xenial
3-
4-
language: node_js
5-
node_js:
6-
- "lts/dubnium"
71
cache: npm
82

93
addons:
@@ -17,26 +11,40 @@ services:
1711

1812
matrix:
1913
include:
20-
- name: "Node 10"
14+
- name: "Linux Node 10"
15+
os: linux
16+
dist: xenial
2117
env: NODE_VERSION=10
22-
- name: "Node 11"
18+
- name: "Linux Node 11"
19+
os: linux
20+
dist: xenial
2321
env: NODE_VERSION=11
24-
- name: "Node 12"
22+
- name: "Linux Node 12"
23+
os: linux
24+
dist: xenial
2525
env: NODE_VERSION=12
26+
- name: "macOS Node 10"
27+
os: osx
28+
osx_image: xcode11
29+
language: node_js
30+
node_js: "10"
31+
- name: "macOS Node 11"
32+
os: osx
33+
osx_image: xcode11
34+
language: node_js
35+
node_js: "11"
36+
- name: "macOS Node 12"
37+
os: osx
38+
osx_image: xcode11
39+
language: node_js
40+
node_js: "12.13.0"
2641

2742
before_install:
28-
# Update Docker
29-
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
30-
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
31-
- sudo apt-get update
32-
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
33-
- docker pull s1hofmann/nut-ci:latest
34-
- docker run -it -d --name nut-ci --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash
35-
43+
- "bash ./.build/setup_${TRAVIS_OS_NAME}.sh"
3644
install: true
3745

3846
script:
39-
- travis_retry docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${NODE_VERSION}"
47+
- "bash ./.build/run_${TRAVIS_OS_NAME}.sh"
4048

4149
after_success:
4250
- sonar-scanner

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## 1.3.2
6+
7+
- Enhancement: Revisit mouse speed settings [(#85)](https://github.com/nut-tree/nut.js/issues/85)
8+
9+
## 1.3.1
10+
11+
- Bugfix: Wrong result size for scaled image search [(#68)](https://github.com/nut-tree/nut.js/issues/68)
12+
- Enhancement: Switch from robotjs to libnut [(#86)](https://github.com/nut-tree/nut.js/issues/86)
13+
- Enhancement: Update to OpenCV4 [(#89)](https://github.com/nut-tree/nut.js/issues/89)
14+
- Enhancement: Enable matrix builds [(#13)](https://github.com/nut-tree/nut.js/issues/13)
15+
516
## 1.3.0
617

718
- Enhancement: Enabled prebuilt bindings for OpenCV [(#77)](https://github.com/nut-tree/nut.js/issues/77)

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
# nut.js (Native UI Toolkit) [![Build Status](https://travis-ci.com/nut-tree/nut.js.svg?branch=master)](https://travis-ci.com/nut-tree/nut.js) [![Greenkeeper badge](https://badges.greenkeeper.io/nut-tree/nut.js.svg)](https://greenkeeper.io/) [![SonarCloud badge](https://sonarcloud.io/api/project_badges/measure?project=nut-tree%3Anut.js&metric=alert_status)](https://sonarcloud.io/dashboard?id=nut-tree%3Anut.js) [![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=nut-tree%3Anut.js&metric=coverage)](https://sonarcloud.io/component_measures?id=nut-tree%3Anut.js&metric=coverage)
1+
# nut.js (Native UI Toolkit) [![Build Status](https://travis-ci.com/nut-tree/nut.js.svg?branch=master)](https://travis-ci.com/nut-tree/nut.js) [![SonarCloud badge](https://sonarcloud.io/api/project_badges/measure?project=nut-tree%3Anut.js&metric=alert_status)](https://sonarcloud.io/dashboard?id=nut-tree%3Anut.js) [![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=nut-tree%3Anut.js&metric=coverage)](https://sonarcloud.io/component_measures?id=nut-tree%3Anut.js&metric=coverage)
22
<p align="center">
33
Native UI testing / automation with node.js
44
</p>
55
<br/>
66
<p align="center">
7-
<a target="_blank" href="https://robotjs.io/">
8-
<img src="https://img.shields.io/badge/Built_with-ROBOT-C86414.svg?style=flat-square" alt="Built with Robot" />
9-
</a>
107
<a target="_blank" href="https://github.com/justadudewhohacks/opencv4nodejs">
118
<img src="https://img.shields.io/badge/Built_with-opencv4nodejs-C86414.svg?style=flat-square" alt="Built with opencv4nodejs" />
129
</p>
1310

1411
# About
1512

1613
<p align="center">
17-
<img src=".gfx/nut.png" alt="logo" width="200"/>
14+
<img src="https://github.com/nut-tree/nut.js/raw/master/.gfx/nut.png" alt="logo" width="200"/>
1815
</p>
1916

2017
`nut.js` is a cross-platform native UI testing tool.

‎appveyor.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
platform:
2+
- x64
3+
4+
image:
5+
- Visual Studio 2017
6+
7+
init:
8+
- git config --global core.autocrlf true
9+
10+
environment:
11+
matrix:
12+
- nodejs_version: "10"
13+
- nodejs_version: "11"
14+
- nodejs_version: "12"
15+
16+
clone_folder: c:\projects\nut
17+
18+
install:
19+
- ps: Install-Product node $env:nodejs_version x64
20+
- node --version
21+
- cd c:\projects\nut
22+
- npm ci
23+
- npm run compile
24+
25+
build: off
26+
27+
test_script:
28+
- npm test

‎docs/classes/assert.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ <h3>constructor</h3>
104104
<li class="tsd-description">
105105
<aside class="tsd-sources">
106106
<ul>
107-
<li>Defined in <a href="https://github.com/nut-tree/nut.js/blob/fa788ce/lib/assert.class.ts#L5">assert.class.ts:5</a></li>
107+
<li>Defined in <a href="https://github.com/nut-tree/nut.js/blob/cc7ee90/lib/assert.class.ts#L5">assert.class.ts:5</a></li>
108108
</ul>
109109
</aside>
110110
<h4 class="tsd-parameters-title">Parameters</h4>
@@ -130,7 +130,7 @@ <h3>is<wbr>Visible</h3>
130130
<li class="tsd-description">
131131
<aside class="tsd-sources">
132132
<ul>
133-
<li>Defined in <a href="https://github.com/nut-tree/nut.js/blob/fa788ce/lib/assert.class.ts#L8">assert.class.ts:8</a></li>
133+
<li>Defined in <a href="https://github.com/nut-tree/nut.js/blob/cc7ee90/lib/assert.class.ts#L8">assert.class.ts:8</a></li>
134134
</ul>
135135
</aside>
136136
<h4 class="tsd-parameters-title">Parameters</h4>
@@ -159,7 +159,7 @@ <h3>not<wbr>Visible</h3>
159159
<li class="tsd-description">
160160
<aside class="tsd-sources">
161161
<ul>
162-
<li>Defined in <a href="https://github.com/nut-tree/nut.js/blob/fa788ce/lib/assert.class.ts#L25">assert.class.ts:25</a></li>
162+
<li>Defined in <a href="https://github.com/nut-tree/nut.js/blob/cc7ee90/lib/assert.class.ts#L25">assert.class.ts:25</a></li>
163163
</ul>
164164
</aside>
165165
<h4 class="tsd-parameters-title">Parameters</h4>

‎docs/classes/bresenham.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ <h3><span class="tsd-flag ts-flagStatic">Static</span> compute</h3>
9797
<li class="tsd-description">
9898
<aside class="tsd-sources">
9999
<ul>
100-
<li>Defined in <a href="https://github.com/nut-tree/nut.js/blob/fa788ce/lib/util/bresenham.class.ts#L4">util/bresenham.class.ts:4</a></li>
100+
<li>Defined in <a href="https://github.com/nut-tree/nut.js/blob/cc7ee90/lib/util/bresenham.class.ts#L4">util/bresenham.class.ts:4</a></li>
101101
</ul>
102102
</aside>
103103
<h4 class="tsd-parameters-title">Parameters</h4>

0 commit comments

Comments
 (0)