minke 1.13.13 → 1.13.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 092b621f2c34657f5172c89665d9f4b4266c9de6
-  data.tar.gz: 52b40dda95844eae63c628ba7aa6771e572e96fe
+  metadata.gz: e3b59e1ea5d9381f5999bf6f892ac2603f2fa6d7
+  data.tar.gz: 615125bf7abf184d7eb054bbbd762d2efea64dae
 SHA512:
-  metadata.gz: 29fb75e537d3a8bd1eb872e1b6e3917228ab511a8cb74ca8645082acaf93beb398f66a84c9f95e8516d1fe7e1cf84c8396428f5f9347329a0bbe9925786d2daf
-  data.tar.gz: dff9a4587bcffa74139b67ee1ad4ce577a23a6839cb1614ce2b265cb0720cda148c1ec71b93504946c3ad6fd6e52ef0607446b865745771fada408b55fe61d33
+  metadata.gz: abf2299d8977a32f46b90bbf55243d972ee18286e175e33d5e83b2d3cf8cce493d19287cc880b95dc5def07f5aac0c5b1fb1fb1eb8f86dbc6d22c003be0af0c2
+  data.tar.gz: 5d5413b6f6a6aff6dc9c5b7b16e8c917b6c0dfa28eac2f66804acfed2a1b89e5840b0eebbef476134af8ec657150f4f5eaa95a0bbffa547725f829494fa635d8

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

data/docker/Dockerfile

@@ -33,12 +33,13 @@ COPY Gemfile Gemfile
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
+RUN gem update --system
+RUN gem install bundler -v 1.13.6
 RUN bundle install
 
 RUN mkdir /usr/local/backup
 
 RUN cp -R /usr/local/bundle/* /usr/local/backup
-RUN rm -rf /usr/local/backup/cache
 
 ENTRYPOINT ["/entrypoint.sh"]
 

data/docker/Gemfile

@@ -1,14 +1,9 @@
 
 source 'https://rubygems.org'
-
 gem "rake"
-gem "bundler"
-gem 'nokogiri'
 gem "cucumber"
-gem "cucumber-rest-api", "= 0.3"
-gem 'cucumber-api', '~> 0.3'
 
-gem 'minke', "= 1.13.13"
+gem 'minke', "= 1.13.14"
 gem 'minke-generator-swift', "= 0.4"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.5"

data/docker/entrypoint.sh

@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
-
-INSTALL="echo \"#Copying cache\" && cp -r /usr/local/backup/* /usr/local/bundle/ && gem install bundler && bundle install"
+INSTALL="echo \"#Copying cache\" && gem install bundler && bundle install"
 COMMAND="bundle exec minke $@"
 
 if [[ $1 != \generate* ]]; then
-  if [ "$(ls -A ./vendor)" ]; then
+  if [ -d "./vendor" ]; then
     eval $COMMAND 
   else  
     eval "$INSTALL && $COMMAND"

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.13"
+MINKE_VERSION="1.13.14"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
 NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
@@ -23,7 +23,7 @@ if [[ $1 != \generate* ]]; then
   done < <(grep :path Gemfile)
 
   DIR=$(dirname `pwd`)
-  DOCKER_RUN="docker run ${IT} --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}"
+  DOCKER_RUN="docker run ${IT} --rm --net=minke_${NEW_UUID} ${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}/_build ${DOCKER_IMAGE} ${COMMAND}"
 
   echo "Running command: minke ${COMMAND}"
 

data/lib/minke/tasks/bundle.rb

@@ -10,7 +10,7 @@ module Minke
       def run args = nil
         @logger.info '### Install gems'
 
-        @shell_helper.execute('bundle install -j3')
+        @shell_helper.execute('bundle install')
       end
 
     end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.13"
+  VERSION = "1.13.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.13
+  version: 1.13.14
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler