minke 1.13.4 → 1.13.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +2 -2
- data/bin/minke +2 -5
- data/docker/Gemfile +1 -1
- data/lib/minke/helpers/shell.rb +2 -3
- data/lib/minke/scripts/minke +5 -4
- data/lib/minke/version.rb +1 -1
- data/lib/minke.rb +1 -0
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a0416f3e50c39ec19fc793b2d6a1706cc521fea8
|
4
|
+
data.tar.gz: 16ef6ecab0adac8658a892c4eb9abad9456e4626
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 25949f80afb1d4a8c99eff183aba029079a11f8206d33721b8c3d4bf09a8d468713fab5f927e7c5f6905eb7f701e86e9ef4cb9ba71405353e79d2de518a6e7f2
|
7
|
+
data.tar.gz: 72513cb55be4b42f3c99a133aca0629fed3345bed984c28aa45074b124fd91a1db3dc8d42196afe9136e5c8fca2a3df0d93f912e531eb3a3746add3554463454
|
data/.travis.yml
CHANGED
@@ -30,7 +30,7 @@ after_deploy:
|
|
30
30
|
docker build -t nicholasjackson/minke --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` .;
|
31
31
|
docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
|
32
32
|
docker push nicholasjackson/minke:latest;
|
33
|
-
docker tag nicholasjackson/minke nicholasjackson/minke:1.13.
|
34
|
-
docker push nicholasjackson/minke:1.13.
|
33
|
+
docker tag nicholasjackson/minke nicholasjackson/minke:1.13.5;
|
34
|
+
docker push nicholasjackson/minke:1.13.5;
|
35
35
|
curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
|
36
36
|
fi
|
data/bin/minke
CHANGED
@@ -96,14 +96,11 @@ end
|
|
96
96
|
|
97
97
|
def doCommand(command, verbose, config_file = nil)
|
98
98
|
config, generator_config = load_config(config_file, verbose) unless config_file == nil
|
99
|
-
|
99
|
+
Minke::Command.new(
|
100
100
|
config,
|
101
101
|
generator_config,
|
102
102
|
verbose
|
103
|
-
)
|
104
|
-
|
105
|
-
puts c
|
106
|
-
c.public_send(command)
|
103
|
+
).public_send(command)
|
107
104
|
end
|
108
105
|
|
109
106
|
def doGenerate(options)
|
data/docker/Gemfile
CHANGED
data/lib/minke/helpers/shell.rb
CHANGED
@@ -10,8 +10,6 @@ module Minke
|
|
10
10
|
def execute command
|
11
11
|
@logger.debug command
|
12
12
|
|
13
|
-
require 'open3'
|
14
|
-
cmd = 'ping www.google.com'
|
15
13
|
Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
|
16
14
|
while line = stdout.gets
|
17
15
|
@logger.debug line
|
@@ -19,7 +17,8 @@ module Minke
|
|
19
17
|
|
20
18
|
exit_status = wait_thr.value
|
21
19
|
unless exit_status.success?
|
22
|
-
|
20
|
+
@logger.error "Error executing command: #{command}"
|
21
|
+
abort
|
23
22
|
end
|
24
23
|
end
|
25
24
|
end
|
data/lib/minke/scripts/minke
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
#!/bin/bash
|
2
|
-
MINKE_VERSION="1.13.
|
2
|
+
MINKE_VERSION="1.13.5"
|
3
3
|
ERROR="Please specify a command e.g. ./minke build"
|
4
4
|
|
5
5
|
DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
|
@@ -31,18 +31,19 @@ COMMAND=$*
|
|
31
31
|
# Test if interactive terminal and set the flag
|
32
32
|
[[ -t 1 ]] && IT="-it" || IT=""
|
33
33
|
|
34
|
-
if [[ $1 ==
|
34
|
+
if [[ $1 == \generate* ]]; then
|
35
35
|
echo "Generating new template"
|
36
36
|
DIR=${PWD}
|
37
37
|
DOCKER_RUN="docker run --rm -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor/gems:${GEMSETFOLDER} -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR} ${DOCKER_IMAGE} /bin/bash -c '${RVM_COMMAND} && bundle install && minke ${COMMAND}'"
|
38
|
+
|
38
39
|
eval "${DOCKER_RUN}"
|
39
40
|
fi
|
40
41
|
|
41
|
-
if [[ $1 !=
|
42
|
+
if [[ $1 != \generate* ]]; then
|
42
43
|
DIR=$(dirname `pwd`)
|
43
44
|
DOCKER_RUN="docker run --rm ${IT} --net=minke_${NEW_UUID} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor/gems:${GEMSETFOLDER} -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} /bin/bash -c '${RVM_COMMAND} && minke ${COMMAND}'"
|
44
45
|
|
45
|
-
echo "Running command:
|
46
|
+
echo "Running command: ${COMMAND}"
|
46
47
|
|
47
48
|
eval "docker network create minke_${NEW_UUID}"
|
48
49
|
eval "${DOCKER_RUN}"
|
data/lib/minke/version.rb
CHANGED
data/lib/minke.rb
CHANGED