embulk-executor-remoteserver 0.3.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +0 -1
  3. data/gradle.properties +1 -1
  4. data/{docker-compose.test.yml → test/docker-compose.yml} +7 -8
  5. data/test/setup.sh +13 -4
  6. metadata +5 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2c835aba3fc2c0ce9c17fa5d9fe70c756097081a
4
- data.tar.gz: 5831d9e3268af8ef640e1910c0ed1b86eaec88d6
3
+ metadata.gz: 6e3e581f4610b6a718fba908cdac5a526bc78775
4
+ data.tar.gz: 8ed2e998e2715585c10530626b3d0770cad8cc1f
5
5
  SHA512:
6
- metadata.gz: 46a1920c3c054f3d7b68c05308c38d4ab3ff3d4b6dd940733e29b5917803f2ce7a5a031efa214ebce2a76f8a3eb1929756fe9f7bc5d5bc9bccbcee148497b1ef
7
- data.tar.gz: 0de6447bb0d0b7756fdb6e2dcc30eeb82a52f589a51e50fc67b1cbfa7308a5bce4e648d4420079cc8711b5c0ec00912f024bbb1508f1b490be64accabac82d63
6
+ metadata.gz: 7ccde0fe8ccb9f5189da433a8822cb9d3035d1f612474a3e1f5eb00ffe1bfc30f219c6e185299c058843cd4d97c20d7a1df78dfd4c9f89c6582c539474349315
7
+ data.tar.gz: ffac80497a0e036476db4c17e2ffe0f6a3b9322352c8a2000c2477598d9ec5ca33a27992947cdee8ea20c6e98588c33bc5531e5fe0a5795b3cd9a6d81aebc545
data/.circleci/config.yml CHANGED
@@ -10,7 +10,6 @@ jobs:
10
10
  - v1-gradle-{{ checksum "gradle/dependency-locks/compileClasspath.lockfile" }}-{{ checksum "gradle/dependency-locks/testCompileClasspath.lockfile" }}
11
11
  - v1-gradle-
12
12
  - run: ./test/setup.sh
13
- - run: sudo chown -R circleci.circleci tmp/certs
14
13
  - run: ./gradlew check --info
15
14
  - run:
16
15
  name: Save test results
data/gradle.properties CHANGED
@@ -1 +1 @@
1
- version=0.3.0
1
+ version=0.3.1
data/{docker-compose.test.yml → test/docker-compose.yml} RENAMED
@@ -2,15 +2,14 @@ version: '3.2'
2
2
  services:
3
3
  server1: &server
4
4
  build:
5
- context: .
6
- dockerfile: Dockerfile
5
+ context: ..
7
6
  environment:
8
7
  LOG_LEVEL: debug
9
8
  ports:
10
9
  - "30001:30001"
11
10
  volumes:
12
- - ./tmp/output:/output
13
- - ./src/test/resources/json:/root/src/test/resources/json
11
+ - ../tmp/output:/output
12
+ - ../src/test/resources/json:/root/src/test/resources/json
14
13
 
15
14
  server2:
16
15
  <<: *server
@@ -30,9 +29,9 @@ services:
30
29
  ports:
31
30
  - "30003:30001"
32
31
  volumes:
33
- - ./tmp/output:/output
34
- - ./tmp/certs:/certs
35
- - ./src/test/resources/json:/root/src/test/resources/json
32
+ - ../tmp/output:/output
33
+ - ../tmp/certs:/certs
34
+ - ../src/test/resources/json:/root/src/test/resources/json
36
35
 
37
36
  tls-server2:
38
37
  <<: *tls-server
@@ -42,7 +41,7 @@ services:
42
41
  cert-generator:
43
42
  image: kamatama41/test-cert-generator
44
43
  volumes:
45
- - ./tmp/certs:/root/work
44
+ - ../tmp/certs:/root/work
46
45
  environment:
47
46
  SERVER_COMMON_NAME: embulk-server.local
48
47
  SERVER_P12_PASSWORD: abcde
data/test/setup.sh CHANGED
@@ -1,14 +1,23 @@
1
1
  #!/bin/bash
2
2
 
3
+ set -eux
4
+
3
5
  project_root="$(cd $(dirname $0)/..; pwd -P)"
4
6
  cd ${project_root}
5
7
 
6
8
  rm -rf tmp/output && mkdir -p tmp/output
7
9
  rm -rf tmp/certs && mkdir -p tmp/certs
10
+
8
11
  ./gradlew embulk_bundle_--clean -Pgemfile=test/Gemfile -PbundlePath=${project_root}/tmp/vendor/bundle
9
12
 
10
- if [[ "${SKIP_DOCKER_BUILD}" != "true" ]]; then
11
- docker-compose -f docker-compose.test.yml build
13
+ cd ${project_root}/test
14
+ if [[ "${SKIP_DOCKER_BUILD:=false}" != "true" ]]; then
15
+ docker-compose build
12
16
  fi
13
- docker-compose -f docker-compose.test.yml run cert-generator
14
- docker-compose -f docker-compose.test.yml up -d server1 server2 tls-server1 tls-server2
17
+
18
+ docker-compose run cert-generator
19
+ if [[ "${CIRCLECI:=false}" = "true" ]]; then
20
+ sudo chown -R circleci.circleci ../tmp/certs
21
+ fi
22
+
23
+ docker-compose down && docker-compose up -d server1 server2 tls-server1 tls-server2
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: embulk-executor-remoteserver
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shinichi Ishimura
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-24 00:00:00.000000000 Z
11
+ date: 2019-04-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -51,11 +51,10 @@ files:
51
51
  - LICENSE
52
52
  - README.md
53
53
  - build.gradle
54
- - classpath/embulk-executor-remoteserver-0.3.0.jar
54
+ - classpath/embulk-executor-remoteserver-0.3.1.jar
55
55
  - classpath/msgpack-core-0.8.16.jar
56
56
  - classpath/nsocket-0.3.4.jar
57
57
  - classpath/slf4j-api-1.7.26.jar
58
- - docker-compose.test.yml
59
58
  - docker/run_embulk_server.sh
60
59
  - example/Gemfile
61
60
  - example/README.md
@@ -100,6 +99,7 @@ files:
100
99
  - src/test/resources/json/test1.json
101
100
  - src/test/resources/json/test2.json
102
101
  - test/Gemfile
102
+ - test/docker-compose.yml
103
103
  - test/setup.sh
104
104
  homepage: https://github.com/kamatama41/embulk-executor-remoteserver
105
105
  licenses:
@@ -127,4 +127,5 @@ specification_version: 4
127
127
  summary: Docker executor plugin for Embulk
128
128
  test_files:
129
129
  - test/Gemfile
130
+ - test/docker-compose.yml
130
131
  - test/setup.sh