minke 1.13.19 → 1.13.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db5c87cfe8c45388d9219ed6df1533ddede1ea85
-  data.tar.gz: 4df5df6ff06439bbdadd40cb65111a4aacfaed5a
+  metadata.gz: 811e42427f6cae2eeca648798c896f854dd27696
+  data.tar.gz: e526903241f2dcc47cfba0d034766a6ada9d75eb
 SHA512:
-  metadata.gz: 09c308d7681d4f510db4a3a6511e825848e160379a3cc0857d07a3d959081bc98e0b6a7fd25fbc82fbae3a7f3dcfd7f07f2d3ad151e7b41262f4d83ce8455be7
-  data.tar.gz: 25de6501558149029163480c0c4815d38f3324afce9de60e282c8ad1f05cc9f96560514cbe77c8d5866a1bbea619fed956c96a68f5dff3b8b40d80bae80bc7f8
+  metadata.gz: ac68a11e3ca4f3d397381d507d672c6b95c4ce2a01629be346d83c422647f91dd09e50a06e759428f29df1c496225eafa5bcfc4b573bc168acb2dba8f6ac7c49
+  data.tar.gz: bbe73b673a52fd539be0d145c08e6e2341fa9101e4f8ac901e7acfc152b1431f0a47865aa36e8a7243a3aa2c2ea899d3ef5b3a5155c66fad1c24c2df250c4f78

data/.travis.yml

@@ -30,7 +30,7 @@ after_deploy:
     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` .;
     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
     docker push nicholasjackson/minke:latest;
-    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.19;
-    docker push nicholasjackson/minke:1.13.19;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.20;
+    docker push nicholasjackson/minke:1.13.20;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/README.md

@@ -6,6 +6,7 @@
 | Test Coverage: | [![Test Coverage](https://codeclimate.com/github/nicholasjackson/minke/badges/coverage.svg)](https://codeclimate.com/github/nicholasjackson/minke/coverage) |
 | 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) |
 | 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) |
+| Ruby Doc: | [http://www.rubydoc.info/gems/minke/1.13.19/index](http://www.rubydoc.info/gems/minke/1.13.19/index) |
 
 # Documentation and Tutorial 
 [https://minke.rocks/index.html](http://minke.rocks/index.html)

data/docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM ruby:2.3.1
 
-ENV COMPOSE_VERSION 1.7.1
+ENV COMPOSE_VERSION 1.11.1
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
   # Build-time metadata as defined at http://label-schema.org

data/docker/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "rake"
 gem "cucumber"
 
-gem 'minke', "= 1.13.18"
+gem 'minke', "= 1.13.20"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.6"

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.19"
+MINKE_VERSION="1.13.20"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
@@ -14,12 +14,12 @@ if [[ $1 == "-A" || $2 == "-A" ]]; then
     # for docker machine
     SSH_SOCK=boot2docker.$$.ssh.socket
     docker-machine ssh ${DOCKER_MACHINE} -A -S $SSH_SOCK -M -f -n tail -f /dev/null
-    AGENT_SOCK=$(docker-machine ssh ${DOCKER_MACHINE} -S $SSH_SOCK echo \$SSH_AUTH_SOCK)
-    SSH_AUTH="-e AGENT_SOCK=${AGENT_SOCK}"
+    AGENT_SOCK=$(docker-machine ssh ${DOCKER_MACHINE} -S $SSH_SOCK echo \$\(readlink -f \$SSH_AUTH_SOCK\))
+    SSH_AUTH="-e AGENT_SOCK=${AGENT_SOCK} -e SSH_AUTH_SOCK=/ssh-agent/ssh.sock -v ${AGENT_SOCK}:/ssh-agent/ssh.sock"
   fi
 
   if [[ "${DOCKER_MACHINE}" == "" ]]; then
-    SSH_AUTH="-e AGENT_SOCK=${SSH_AUTH_SOCK}"
+    SSH_AUTH="-e AGENT_SOCK=${SSH_AUTH_SOCK} -e SSH_AUTH_SOCK=/ssh-agent/ssh.sock -v ${SSH_AUTH_SOCK}:/ssh-agent/ssh.sock"
   fi
   
   echo "Forwarding SSH Keys: ${SSH_AUTH}"
@@ -38,6 +38,7 @@ if [[ $1 != \generate* ]]; then
   done < <(grep :path Gemfile)
 
   DIR=$(dirname `pwd`)
+  
   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}"
 
   echo "Running command: minke ${COMMAND}"
@@ -45,8 +46,8 @@ if [[ $1 != \generate* ]]; then
   eval "${DOCKER_RUN}"
   id=$(docker network rm minke_${NEW_UUID})
   
+  # Clean up socket
   if [[ "${DOCKER_MACHINE}" != "" ]]; then
-    # Clean up socket
     docker-machine ssh default -S $SSH_SOCK -O exit
   fi
 fi

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.19"
+  VERSION = "1.13.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.19
+  version: 1.13.20
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler