minke 1.13.8 → 1.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec16a6f8bb966d59cb0305eb6abc45e93b31939a
-  data.tar.gz: 960268cd2550e92d486b51017a11c61c01e7d174
+  metadata.gz: e9e8e41df805b4ae39e2b77c7ee0a3556bbc25be
+  data.tar.gz: 1ea8151c518be563da7fabd04bfb9d8ae23dfede
 SHA512:
-  metadata.gz: f72fe2a479b1298b9365ed4f6f6dc7d6af2e17f4e305122a3b99d44d77b64a67b7f8285682a878de40c768b86287ca26046d0d9fada2f72f0a76921e47c2367c
-  data.tar.gz: 763efb3149550d65dce85329d5a825d8bb8eb48f8514796d1bceaf41bbfc2b2f5f8d5be12b1deaca64b6864a7349087a51cbba19ac28d06090e9c6b1dff0f568
+  metadata.gz: f3722a5affda81a67ba07a8bc08b791e8ee57dbf404bd0e3f5407283a4a61d9a61c83fb7b7b2e15f6eb46cc54fa3d546ada6fff1cfe85152ce2b4dca3ed31e08
+  data.tar.gz: 404a404c30fa0aa2cbab7ae66acb122748dba8f84c6eaea2fc8baeb988db0c66e2c6d26831bb1313d30c8afad8da428edf2a64ca35e11db03d21ff0c2e198912

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.8;
-    docker push nicholasjackson/minke:1.13.8;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.9;
+    docker push nicholasjackson/minke:1.13.9;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/bin/minke

@@ -79,8 +79,10 @@ subcommands = {
 
 global.order!
 command = ARGV.shift
-subcommands[command].order!
 
+if !subcommands[command].nil?
+  subcommands[command].order!
+end
 
 def load_config config_file, verbose
   reader = Minke::Config::Reader.new Minke::Logging.create_logger(verbose)

data/docker/Gemfile

@@ -8,7 +8,7 @@ gem "cucumber"
 gem "cucumber-rest-api", "= 0.3"
 gem 'cucumber-api', '~> 0.3'
 
-gem 'minke', "= 1.13.7"
+gem 'minke', "= 1.13.9"
 gem 'minke-generator-swift', "= 0.2.2"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.5"

data/lib/minke/scripts/minke

@@ -1,10 +1,10 @@
 #!/bin/bash
-MINKE_VERSION="1.13.7"
+MINKE_VERSION="1.13.9"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
 
-DOCKER_IMAGE="minketester"
+DOCKER_IMAGE="nicholasjackson/minke:${MINKE_VERSION}"
 
 COMMAND=$*
 
@@ -14,9 +14,6 @@ GEM_VOLUMES=""
 [[ -t 1 ]] && IT="-it" || IT=""
 
 if [[ $1 != \generate* ]]; then
-
-  echo "Generate"
-
   # Test if we need to mount any special volumes for paths specified in the Gemfile
   while read -r line; do
     l=$(echo $line | sed "s/.*:path *=> *//" | sed "s/['|\"]\(.*\)['|\"]/\1/")
@@ -24,7 +21,7 @@ if [[ $1 != \generate* ]]; then
   done < <(grep :path Gemfile)
 
   DIR=$(dirname `pwd`)
-  DOCKER_RUN="docker run --rm ${IT} --net=minke_${NEW_UUID} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor:/usr/local/bundle -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} ${COMMAND}"
+  DOCKER_RUN="docker run --rm --net=minke_${NEW_UUID} ${GEM_VOLUMES} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -v ${DIR}/_build/vendor:/usr/local/bundle -e DOCKER_NETWORK=minke_${NEW_UUID} -w ${DIR}/_build ${DOCKER_IMAGE} ${COMMAND}"
 
   echo "Running command: minke ${COMMAND}"
 
@@ -36,7 +33,7 @@ fi
 
 if [[ $1 = \generate* ]]; then
   DIR=$(pwd)
-  DOCKER_RUN="docker run --rm ${IT} -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -w ${DIR}/${DIR} ${DOCKER_IMAGE} ${COMMAND}"
+  DOCKER_RUN="docker run --rm -v ${DOCKER_SOCK} -v ${DIR}:${DIR} -w ${DIR}:${DIR} ${DOCKER_IMAGE} ${COMMAND}"
   echo $DOCKER_RUN 
   eval "$DOCKER_RUN"
 fi

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.8"
+  VERSION = "1.13.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.8
+  version: 1.13.9
 platform: ruby
 authors:
 - Nic Jackson