minke 1.13.19 → 1.13.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +2 -2
  3. data/README.md +1 -0
  4. data/docker/Dockerfile +1 -1
  5. data/docker/Gemfile +1 -1
  6. data/lib/minke/scripts/minke +6 -5
  7. data/lib/minke/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: db5c87cfe8c45388d9219ed6df1533ddede1ea85
4
- data.tar.gz: 4df5df6ff06439bbdadd40cb65111a4aacfaed5a
3
+ metadata.gz: 811e42427f6cae2eeca648798c896f854dd27696
4
+ data.tar.gz: e526903241f2dcc47cfba0d034766a6ada9d75eb
5
5
  SHA512:
6
- metadata.gz: 09c308d7681d4f510db4a3a6511e825848e160379a3cc0857d07a3d959081bc98e0b6a7fd25fbc82fbae3a7f3dcfd7f07f2d3ad151e7b41262f4d83ce8455be7
7
- data.tar.gz: 25de6501558149029163480c0c4815d38f3324afce9de60e282c8ad1f05cc9f96560514cbe77c8d5866a1bbea619fed956c96a68f5dff3b8b40d80bae80bc7f8
6
+ metadata.gz: ac68a11e3ca4f3d397381d507d672c6b95c4ce2a01629be346d83c422647f91dd09e50a06e759428f29df1c496225eafa5bcfc4b573bc168acb2dba8f6ac7c49
7
+ data.tar.gz: bbe73b673a52fd539be0d145c08e6e2341fa9101e4f8ac901e7acfc152b1431f0a47865aa36e8a7243a3aa2c2ea899d3ef5b3a5155c66fad1c24c2df250c4f78
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.19;
34
- docker push nicholasjackson/minke:1.13.19;
33
+ docker tag nicholasjackson/minke nicholasjackson/minke:1.13.20;
34
+ docker push nicholasjackson/minke:1.13.20;
35
35
  curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
36
36
  fi
data/README.md CHANGED
@@ -6,6 +6,7 @@
6
6
  | Test Coverage: | [![Test Coverage](https://codeclimate.com/github/nicholasjackson/minke/badges/coverage.svg)](https://codeclimate.com/github/nicholasjackson/minke/coverage) |
7
7
  | Build Status: | [![Build Status](https://travis-ci.org/nicholasjackson/minke.svg?branch=master)](https://travis-ci.org/nicholasjackson/minke) [ ![Codeship Status for nicholasjackson/minke](https://codeship.com/projects/9e365bb0-46c3-0134-0bf1-568f97ef61e4/status?branch=master)](https://codeship.com/projects/168996) |
8
8
  | Chat: | [![Join the chat at https://gitter.im/nicholasjackson/minke](https://badges.gitter.im/nicholasjackson/minke.svg)](https://gitter.im/nicholasjackson/minke?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) |
9
+ | Ruby Doc: | [http://www.rubydoc.info/gems/minke/1.13.19/index](http://www.rubydoc.info/gems/minke/1.13.19/index) |
9
10
 
10
11
  # Documentation and Tutorial
11
12
  [https://minke.rocks/index.html](http://minke.rocks/index.html)
data/docker/Dockerfile CHANGED
@@ -1,6 +1,6 @@
1
1
  FROM ruby:2.3.1
2
2
 
3
- ENV COMPOSE_VERSION 1.7.1
3
+ ENV COMPOSE_VERSION 1.11.1
4
4
  ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
5
5
 
6
6
  # Build-time metadata as defined at http://label-schema.org
data/docker/Gemfile CHANGED
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
3
3
  gem "rake"
4
4
  gem "cucumber"
5
5
 
6
- gem 'minke', "= 1.13.18"
6
+ gem 'minke', "= 1.13.20"
7
7
  gem 'minke-generator-swift', "= 0.4"
8
8
  gem 'minke-generator-netmvc'
9
9
  gem 'minke-generator-go', "= 0.8.6"
data/lib/minke/scripts/minke CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/bin/bash
2
- MINKE_VERSION="1.13.19"
2
+ MINKE_VERSION="1.13.20"
3
3
 
4
4
  DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
5
5
  NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
@@ -14,12 +14,12 @@ if [[ $1 == "-A" || $2 == "-A" ]]; then
14
14
  # for docker machine
15
15
  SSH_SOCK=boot2docker.$$.ssh.socket
16
16
  docker-machine ssh ${DOCKER_MACHINE} -A -S $SSH_SOCK -M -f -n tail -f /dev/null
17
- AGENT_SOCK=$(docker-machine ssh ${DOCKER_MACHINE} -S $SSH_SOCK echo \$SSH_AUTH_SOCK)
18
- SSH_AUTH="-e AGENT_SOCK=${AGENT_SOCK}"
17
+ AGENT_SOCK=$(docker-machine ssh ${DOCKER_MACHINE} -S $SSH_SOCK echo \$\(readlink -f \$SSH_AUTH_SOCK\))
18
+ SSH_AUTH="-e AGENT_SOCK=${AGENT_SOCK} -e SSH_AUTH_SOCK=/ssh-agent/ssh.sock -v ${AGENT_SOCK}:/ssh-agent/ssh.sock"
19
19
  fi
20
20
 
21
21
  if [[ "${DOCKER_MACHINE}" == "" ]]; then
22
- SSH_AUTH="-e AGENT_SOCK=${SSH_AUTH_SOCK}"
22
+ SSH_AUTH="-e AGENT_SOCK=${SSH_AUTH_SOCK} -e SSH_AUTH_SOCK=/ssh-agent/ssh.sock -v ${SSH_AUTH_SOCK}:/ssh-agent/ssh.sock"
23
23
  fi
24
24
 
25
25
  echo "Forwarding SSH Keys: ${SSH_AUTH}"
@@ -38,6 +38,7 @@ if [[ $1 != \generate* ]]; then
38
38
  done < <(grep :path Gemfile)
39
39
 
40
40
  DIR=$(dirname `pwd`)
41
+
41
42
  DOCKER_RUN="docker run ${IT} --rm --net=minke_${NEW_UUID} ${SSH_AUTH} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -e BUNDLE_PATH=${PWD}/vendor -e BUNDLE_JOBS=2 -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_minke ${DOCKER_IMAGE} ${COMMAND}"
42
43
 
43
44
  echo "Running command: minke ${COMMAND}"
@@ -45,8 +46,8 @@ if [[ $1 != \generate* ]]; then
45
46
  eval "${DOCKER_RUN}"
46
47
  id=$(docker network rm minke_${NEW_UUID})
47
48
 
49
+ # Clean up socket
48
50
  if [[ "${DOCKER_MACHINE}" != "" ]]; then
49
- # Clean up socket
50
51
  docker-machine ssh default -S $SSH_SOCK -O exit
51
52
  fi
52
53
  fi
data/lib/minke/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Minke
2
- VERSION = "1.13.19"
2
+ VERSION = "1.13.20"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: minke
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.13.19
4
+ version: 1.13.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nic Jackson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-30 00:00:00.000000000 Z
11
+ date: 2017-02-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler