minke 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1269e53e6dd27dd353fea28c6685abfdc5c587ef
-  data.tar.gz: 4712f2d2267f4304948ae9c9df9c414a27cc41df
+  metadata.gz: 3c0c0c9395b0fcb8cfe60184a42428302fd900aa
+  data.tar.gz: b820e7b8141110c619f4658f0e1e50c926c23472
 SHA512:
-  metadata.gz: 947f7c63f787d7ecf89ae5fbb3d7f8caee3c0a50879dee58654257824d2ce14e70bca21b5c209f79e67ac248b2cfe50bd8f898c04aae1b6c046ba27d10c938e9
-  data.tar.gz: a0747a16ad9a200a9ec9888371cc5ed684199b7fa715a0a2430dd7997f51b72523ef76d26f49c06f200cabdaa99665d2ea38260a719e8e1a2d48176ae4a52049
+  metadata.gz: 57b4a2bbc57132aa7cd8714f9a8711713986984f99fb0d0e41a5aa16a57509d3775e529100fab843dec94742e1d981334e9ba5147c3ed9970f98378fbb078d92
+  data.tar.gz: dd21696ed28db73d5f6eb4187532b59c25d70f39636b7d0224de615074016774b331adc60225fc022b2c4a48cd5840d2bc050239a3795b053f9f9070b57a7486

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

data/docker/Gemfile

@@ -11,5 +11,5 @@ gem 'cucumber-api', '~> 0.3'
 gem 'minke', "= 1.13.1"
 gem 'minke-generator-swift', "= 0.2.2"
 gem 'minke-generator-netmvc'
-gem 'minke-generator-go', "= 0.8.2"
+gem 'minke-generator-go', "= 0.8.3"
 gem 'minke-generator-spring'

data/lib/minke/scripts/minke

@@ -1,19 +1,15 @@
 #!/bin/bash
-MINKE_VERSION="1.13.1"
-ERROR="Please specify a command e.g. ./minke test"
+MINKE_VERSION="1.13.2"
+ERROR="Please specify a command e.g. ./minke --help"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
 
-GEMSET='minkegems'
+GEMSET=$(<.ruby-gemset)
+LEN=$(echo ${#GEMSET})
 
-if [ -f ".ruby-gemset" ]; then
-  GEMSET=$(<.ruby-gemset)
-  LEN=$(echo ${#GEMSET})
-  
-  if [ $LEN -lt 1 ]; then
-    GEMSET='minkegems'
-  fi
+if [ $LEN -lt 1 ]; then
+  GEMSET='minkegems'
 fi
 
 GEMSETFOLDER="/usr/local/rvm/gems/ruby-2.3.1@${GEMSET}"
@@ -32,20 +28,20 @@ COMMAND=$*
 # Test if interactive terminal and set the flag
 [[ -t 1 ]] && IT="-it" || IT=""
 
-if [[ $1 == \ -g* ]]; then
+if [[ $1 == "generate" ]] || [[ $2 == "generate" ]]; then
   echo "Generating new template"
   DIR=${PWD}
   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}'"
   eval "${DOCKER_RUN}"
 fi
 
-if [[ $1 != \ -g* ]]; then
+if [[ $1 != "generate" ]] || [[ $2 != "generate" ]]; then
   DIR=$(dirname `pwd`)
-  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} && ${COMMAND}'"
+  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}'"
 
-  echo "Running command: ${COMMAND}"
+  echo "Running command: minke ${COMMAND}"
 
   eval "docker network create minke_${NEW_UUID}"
-  eval "${DOCKER_RUN}"
+  echo "${DOCKER_RUN}"
   eval "docker network rm minke_${NEW_UUID}"
 fi

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.1"
+  VERSION = "1.13.2"
 end

metadata

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