minke 1.13.15 → 1.13.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91332371ea0b79e30114c2dd941a6944a0e87ee7
-  data.tar.gz: 6016853d9987a423e99ae2e742ef627ea3e17af5
+  metadata.gz: 2aa0e68808d27776c9de9795277ad0dad8f178e3
+  data.tar.gz: cb2a53605cd6deb9a35a8e0b9c42d9a277803105
 SHA512:
-  metadata.gz: a97898bcd0001be5e23b3f686989b464de19fb1e31eff3035eb3772b97b1a297e7193e8b927c85baa4c443cc6894fb8947062ac8bbf142aa9577ad69187e334f
-  data.tar.gz: 30bc1a0027fc42c3c4a60d7446fdfd8881e60503c50cc571e1886a3b5eeeebbea8386bc772ffafe240f17c837a09362ed01ffde1bb534743612b34f230fda1de
+  metadata.gz: c18c441499f82ec11f8b40eb36cc9f64a1fe4d9d90f1e85805eefb1b9424ecc1b6511a780853f952e03cfaf1ecd4ff5b57d777384d33eeb574a79926c7cdf61a
+  data.tar.gz: 126c9ab80a44e8bdd379cadeac8600a94599a4ad44e77ac8def8ef6f4ceb31700e2a55364b2ec06226c25810c93c06b0456bd6496bfe5d58e41b96a261046c5d

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

data/docker/Gemfile

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

data/docker/entrypoint.sh

@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
-INSTALL="echo \"#Copying cache\" && gem install bundler && bundle install"
-COMMAND="bundle exec minke $@"
+bundle_install=true
+
+if [[ -e "Gemfile.sha" ]]; then
+  sha=`cat Gemfile.sha`
+  current_sha=`sha1sum Gemfile`
 
-if [[ $1 != \generate* ]]; then
-  if [ -d "./vendor" ]; then
-    eval $COMMAND 
-  else  
-    eval "$INSTALL && $COMMAND"
+  if [[ "$sha" == "$current_sha" ]]; then
+    bundle_install=false
   fi
 fi
 
-if [[ $1 = \generate* ]]; then
-  eval $COMMAND
+if $bundle_install; then
+  bundle install
+  sha1sum Gemfile > Gemfile.sha
 fi
+
+COMMAND="bundle exec minke $@"
+eval $COMMAND

data/lib/minke/command.rb

@@ -81,7 +81,6 @@ module Minke
     def fetch
       if config.fetch != nil
         tasks = create_tasks :fetch
-        tasks[:bundler].run
         tasks[:fetch].run
       end
     end

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.15"
+MINKE_VERSION="1.13.16"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.15"
+  VERSION = "1.13.16"
 end

metadata

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