minke 1.13.16 → 1.13.18

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2aa0e68808d27776c9de9795277ad0dad8f178e3
4
- data.tar.gz: cb2a53605cd6deb9a35a8e0b9c42d9a277803105
3
+ metadata.gz: 37f21bb55040f8575e3f678af26ec5f622bd6158
4
+ data.tar.gz: a467dc8c47cb96fb4a8c90c332e1e271845648d8
5
5
  SHA512:
6
- metadata.gz: c18c441499f82ec11f8b40eb36cc9f64a1fe4d9d90f1e85805eefb1b9424ecc1b6511a780853f952e03cfaf1ecd4ff5b57d777384d33eeb574a79926c7cdf61a
7
- data.tar.gz: 126c9ab80a44e8bdd379cadeac8600a94599a4ad44e77ac8def8ef6f4ceb31700e2a55364b2ec06226c25810c93c06b0456bd6496bfe5d58e41b96a261046c5d
6
+ metadata.gz: 6567b76c4342cb898cf5b7111af987c86419be86f6ca1240d6f96fb2041a8a46a5c8b8f23716f12cfe2ec2fb6598666bab7ff43af3047abe9b61997ff77fe8c0
7
+ data.tar.gz: d819a2df102d12f1647bf6c1b4b0cd98785575cff6f64c3f6abe6a5c01c703646838ad48f6bde16d7804071740597559bce5c012299d8084189c83ede524c599
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.16;
34
- docker push nicholasjackson/minke:1.13.16;
33
+ docker tag nicholasjackson/minke nicholasjackson/minke:1.13.18;
34
+ docker push nicholasjackson/minke:1.13.18;
35
35
  curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
36
36
  fi
data/Gemfile CHANGED
@@ -2,8 +2,10 @@ source 'https://rubygems.org'
2
2
 
3
3
  # Specify your gem's dependencies in go_builder.gemspec
4
4
  gemspec
5
-
6
- gem "codeclimate-test-reporter", group: :test, require: nil
5
+ group :test do
6
+ gem "simplecov"
7
+ gem "codeclimate-test-reporter", "~> 1.0.0"
8
+ end
7
9
  #gem 'minke-generator-go', :path => '/Users/nicj/Developer/gems/minke-generator-go'
8
10
  #gem 'minke-generator-node', :path => '/Users/nicj/Developer/gems/minke-generator-node'
9
11
  #gem 'minke-generator-spring', :path => '/Users/nicj/Developer/gems/minke-generator-spring'
data/docker/Dockerfile CHANGED
@@ -1,4 +1,4 @@
1
- FROM ruby:latest
1
+ FROM ruby:2.3.1
2
2
 
3
3
  ENV COMPOSE_VERSION 1.7.1
4
4
  ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
data/docker/Gemfile CHANGED
@@ -3,8 +3,8 @@ source 'https://rubygems.org'
3
3
  gem "rake"
4
4
  gem "cucumber"
5
5
 
6
- gem 'minke', "= 1.13.16"
6
+ gem 'minke', "= 1.13.18"
7
7
  gem 'minke-generator-swift', "= 0.4"
8
8
  gem 'minke-generator-netmvc'
9
- gem 'minke-generator-go', "= 0.8.5"
9
+ gem 'minke-generator-go', "= 0.8.6"
10
10
  gem 'minke-generator-spring'
@@ -195,6 +195,12 @@ module Minke
195
195
  #
196
196
  # [Required]
197
197
  attr_accessor :application_compose_file
198
+
199
+ ##
200
+ # Working directory to use for build root, relative to project root
201
+ #
202
+ # [Optional]
203
+ attr_accessor :working_directory
198
204
  end
199
205
 
200
206
  ##
@@ -50,6 +50,7 @@ module Minke
50
50
  d.build_docker_file = section['build_docker_file'] unless section['build_docker_file'] == nil
51
51
  d.application_docker_file = section['application_docker_file'] unless section['application_docker_file'] == nil
52
52
  d.application_compose_file = section['application_compose_file'] unless section['application_compose_file'] == nil
53
+ d.working_directory = section['working_directory'] unless section['working_directory'] == nil
53
54
  end
54
55
  end
55
56
 
@@ -1,5 +1,5 @@
1
1
  #!/bin/bash
2
- MINKE_VERSION="1.13.16"
2
+ MINKE_VERSION="1.13.18"
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:]')
@@ -67,15 +67,16 @@ module Minke
67
67
  begin
68
68
  @logger.info "Running command: #{command}"
69
69
 
70
- settings = @generator_config.build_settings.docker_settings
71
- build_image = create_container_image
70
+ settings = @generator_config.build_settings.docker_settings
71
+ build_image = create_container_image
72
+ working_directory = create_working_directory
72
73
 
73
74
  args = {
74
75
  :image => build_image,
75
76
  :command => command,
76
77
  :volumes => settings.binds,
77
78
  :environment => settings.env,
78
- :working_directory => settings.working_directory
79
+ :working_directory => working_directory
79
80
  }
80
81
  container, success = @docker_runner.create_and_run_container args
81
82
 
@@ -108,6 +109,18 @@ module Minke
108
109
  build_image
109
110
  end
110
111
 
112
+ def create_working_directory
113
+ base_path = @generator_config.build_settings.docker_settings.working_directory
114
+ override_path = @task_settings.docker.working_directory unless @task_settings.docker == nil
115
+
116
+ if override_path != nil
117
+ path = Pathname.new(base_path)
118
+ return (path + override_path).to_s
119
+ else
120
+ return base_path
121
+ end
122
+ end
123
+
111
124
  end
112
125
  end
113
126
  end
data/lib/minke/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Minke
2
- VERSION = "1.13.16"
2
+ VERSION = "1.13.18"
3
3
  end
data/minke.gemspec CHANGED
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.add_development_dependency 'guard-rspec'
26
26
  spec.add_development_dependency 'webmock'
27
27
  spec.add_development_dependency 'pry'
28
+ spec.add_development_dependency 'pry-coolline'
28
29
 
29
30
  spec.add_runtime_dependency 'sshkey'
30
31
  spec.add_runtime_dependency 'colorize'
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.16
4
+ version: 1.13.18
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-26 00:00:00.000000000 Z
11
+ date: 2016-12-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -94,6 +94,20 @@ dependencies:
94
94
  - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: pry-coolline
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: '0'
104
+ type: :development
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ">="
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: sshkey
99
113
  requirement: !ruby/object:Gem::Requirement