minke 1.13.13 → 1.13.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +2 -2
  3. data/docker/Dockerfile +2 -1
  4. data/docker/Gemfile +1 -6
  5. data/docker/entrypoint.sh +2 -3
  6. data/lib/minke/scripts/minke +2 -2
  7. data/lib/minke/tasks/bundle.rb +1 -1
  8. data/lib/minke/version.rb +1 -1
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 092b621f2c34657f5172c89665d9f4b4266c9de6
4
- data.tar.gz: 52b40dda95844eae63c628ba7aa6771e572e96fe
3
+ metadata.gz: e3b59e1ea5d9381f5999bf6f892ac2603f2fa6d7
4
+ data.tar.gz: 615125bf7abf184d7eb054bbbd762d2efea64dae
5
5
  SHA512:
6
- metadata.gz: 29fb75e537d3a8bd1eb872e1b6e3917228ab511a8cb74ca8645082acaf93beb398f66a84c9f95e8516d1fe7e1cf84c8396428f5f9347329a0bbe9925786d2daf
7
- data.tar.gz: dff9a4587bcffa74139b67ee1ad4ce577a23a6839cb1614ce2b265cb0720cda148c1ec71b93504946c3ad6fd6e52ef0607446b865745771fada408b55fe61d33
6
+ metadata.gz: abf2299d8977a32f46b90bbf55243d972ee18286e175e33d5e83b2d3cf8cce493d19287cc880b95dc5def07f5aac0c5b1fb1fb1eb8f86dbc6d22c003be0af0c2
7
+ data.tar.gz: 5d5413b6f6a6aff6dc9c5b7b16e8c917b6c0dfa28eac2f66804acfed2a1b89e5840b0eebbef476134af8ec657150f4f5eaa95a0bbffa547725f829494fa635d8
data/.travis.yml CHANGED
@@ -30,7 +30,7 @@ after_deploy:
30
30
  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` .;
31
31
  docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
32
32
  docker push nicholasjackson/minke:latest;
33
- docker tag nicholasjackson/minke nicholasjackson/minke:1.13.13;
34
- docker push nicholasjackson/minke:1.13.13;
33
+ docker tag nicholasjackson/minke nicholasjackson/minke:1.13.14;
34
+ docker push nicholasjackson/minke:1.13.14;
35
35
  curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
36
36
  fi
data/docker/Dockerfile CHANGED
@@ -33,12 +33,13 @@ COPY Gemfile Gemfile
33
33
  COPY entrypoint.sh /
34
34
  RUN chmod +x /entrypoint.sh
35
35
 
36
+ RUN gem update --system
37
+ RUN gem install bundler -v 1.13.6
36
38
  RUN bundle install
37
39
 
38
40
  RUN mkdir /usr/local/backup
39
41
 
40
42
  RUN cp -R /usr/local/bundle/* /usr/local/backup
41
- RUN rm -rf /usr/local/backup/cache
42
43
 
43
44
  ENTRYPOINT ["/entrypoint.sh"]
44
45
 
data/docker/Gemfile CHANGED
@@ -1,14 +1,9 @@
1
1
 
2
2
  source 'https://rubygems.org'
3
-
4
3
  gem "rake"
5
- gem "bundler"
6
- gem 'nokogiri'
7
4
  gem "cucumber"
8
- gem "cucumber-rest-api", "= 0.3"
9
- gem 'cucumber-api', '~> 0.3'
10
5
 
11
- gem 'minke', "= 1.13.13"
6
+ gem 'minke', "= 1.13.14"
12
7
  gem 'minke-generator-swift', "= 0.4"
13
8
  gem 'minke-generator-netmvc'
14
9
  gem 'minke-generator-go', "= 0.8.5"
data/docker/entrypoint.sh CHANGED
@@ -1,10 +1,9 @@
1
1
  #!/usr/bin/env bash
2
-
3
- INSTALL="echo \"#Copying cache\" && cp -r /usr/local/backup/* /usr/local/bundle/ && gem install bundler && bundle install"
2
+ INSTALL="echo \"#Copying cache\" && gem install bundler && bundle install"
4
3
  COMMAND="bundle exec minke $@"
5
4
 
6
5
  if [[ $1 != \generate* ]]; then
7
- if [ "$(ls -A ./vendor)" ]; then
6
+ if [ -d "./vendor" ]; then
8
7
  eval $COMMAND
9
8
  else
10
9
  eval "$INSTALL && $COMMAND"
data/lib/minke/scripts/minke CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/bin/bash
2
- MINKE_VERSION="1.13.13"
2
+ MINKE_VERSION="1.13.14"
3
3
 
4
4
  DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"
5
5
  NEW_UUID=$(base64 /dev/urandom | tr -d '/+' | head -c 32 | tr '[:upper:]' '[:lower:]')
@@ -23,7 +23,7 @@ if [[ $1 != \generate* ]]; then
23
23
  done < <(grep :path Gemfile)
24
24
 
25
25
  DIR=$(dirname `pwd`)
26
- 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}"
26
+ 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}"
27
27
 
28
28
  echo "Running command: minke ${COMMAND}"
29
29
 
data/lib/minke/tasks/bundle.rb CHANGED
@@ -10,7 +10,7 @@ module Minke
10
10
  def run args = nil
11
11
  @logger.info '### Install gems'
12
12
 
13
- @shell_helper.execute('bundle install -j3')
13
+ @shell_helper.execute('bundle install')
14
14
  end
15
15
 
16
16
  end
data/lib/minke/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Minke
2
- VERSION = "1.13.13"
2
+ VERSION = "1.13.14"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: minke
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.13.13
4
+ version: 1.13.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nic Jackson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-25 00:00:00.000000000 Z
11
+ date: 2016-10-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler