minke 1.11.0 → 1.11.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- ZjYxZTYwNDkzZDQwOTQ0OTJhYjRjZjBmYzViNDE5OWQ0YmYxOTNhMg==
5
- data.tar.gz: !binary |-
6
- NGFhMWY0MTY5MDBlMGQ1ZDM1YzVmNjUyNjQwYWE2MmI5ZjRkNzAyZA==
2
+ SHA1:
3
+ metadata.gz: f0b6d139c785e4975c59280ecd2983128af2b8ed
4
+ data.tar.gz: ffdcc500a8d82dfdddc3d70efc356df23d5c95e2
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- NDRkZmEwNzMzZDI2MjM4ZmFiMDJjZjM4ZjEyMDI3MTkwMjE0NmUyMGYwYmU3
10
- M2Y1NjU4NjRhMjllNDdlYTMyODJjM2NlNDQ5N2ZmNTQyODUxNzRhY2ViOGQ3
11
- NDc3MGQ3NjA2YWMxYjg5NzQ5MWY0Mzc1NGI5NGE3MzhmYzBmZTA=
12
- data.tar.gz: !binary |-
13
- YTExMTAzZDUxNmRmNjQ2MzZhODM2Y2UxMzQzZTY3MzQxZjEyN2E4ZmMxMDMz
14
- ZjljNWFjNWRhOWRmZTY2YWUwMTFkZTRjMjczNDBiMGUxZDRlNzJiNmEzYmIw
15
- MjJlM2E3ODVmODk4ZTE2ZTY4ZDBiMTVhYjJhYmQ3N2Y2MDRhZmQ=
6
+ metadata.gz: 4ea0b5b0a0a63b44f1ac1ac2ac68aec214b815eac4198e2ba11a9aedcd39c900f7a8cb1fb1f4ce9cec3a2e5a1dd266a43d5838d0a33095684b4fa33eb16b1cef
7
+ data.tar.gz: 39dd8b65b7f96a719e775356271cfb8aca3e39ca6d87659f0a5ec44df0d309b8fcd6cfb53816cd71cf1a98d9b5179bc11642a8dd5765cfe554b6e89b23dfd2a0
data/docker/Dockerfile CHANGED
@@ -4,7 +4,14 @@ ENV COMPOSE_VERSION 1.7.1
4
4
  ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
5
5
 
6
6
  RUN apt-get update
7
- RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates
7
+ RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates apt-transport-https
8
+
9
+ RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
10
+
11
+ RUN echo "deb https://apt.dockerproject.org/repo debian-jessie main" > /etc/apt/sources.list.d/docker.list
12
+
13
+ RUN apt-get update
14
+ RUN apt-get -y install docker-engine
8
15
 
9
16
  RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && curl -L get.rvm.io | bash -s stable --ruby=2.3.1 --with-gems="bundle"
10
17
 
@@ -3,9 +3,12 @@ require 'minke'
3
3
  reader = Minke::Config::Reader.new
4
4
  @config = reader.read './config.yml'
5
5
 
6
+ DOCKER_IP = Minke::Docker::DockerRunner.new(nil).get_docker_ip_address
7
+ ENV['DOCKER_IP'] = DOCKER_IP
8
+
6
9
  namespace :app do
7
10
  desc "fetch dependent packages"
8
- task :fetch => ['config:set_docker_env'] do
11
+ task :fetch do
9
12
  if @config.fetch != nil
10
13
  puts 'run fetch'
11
14
  runner = Minke::Tasks::Fetch.new create_dependencies :fetch
@@ -38,7 +41,7 @@ namespace :app do
38
41
  end
39
42
 
40
43
  desc "run application with Docker Compose"
41
- task :run => ['config:set_docker_env'] do
44
+ task :run do
42
45
  if @config.run != nil
43
46
  runner = Minke::Tasks::Run.new create_dependencies :run
44
47
  runner.run
@@ -49,7 +52,7 @@ namespace :app do
49
52
  task :build_and_run => [:build_image, :run]
50
53
 
51
54
  desc "run end to end Cucumber tests USAGE: rake app:cucumber[@tag]"
52
- task :cucumber, [:feature] => ['config:set_docker_env'] do |t, args|
55
+ task :cucumber, [:feature] do |t, args|
53
56
  if @config.cucumber != nil
54
57
  runner = Minke::Tasks::Cucumber.new create_dependencies :cucumber
55
58
  runner.run
@@ -6,7 +6,10 @@ module Minke
6
6
  puts "## Update dependencies"
7
7
 
8
8
  puts '### Install gems'
9
- @shell_helper.execute('bundle install -j3 && bundle update')
9
+ rvm_installed = @shell_helper.execute('which rvm')
10
+ rvm_command = 'source /usr/local/rvm/scripts/rvm && ' if rvm_installed
11
+
12
+ @shell_helper.execute("#{rvm_command}bundle install -j3 && bundle update")
10
13
 
11
14
  puts '### Install generator dependencies'
12
15
 
@@ -37,6 +37,7 @@ module Minke
37
37
  ensure
38
38
  puts "Stopping Consul"
39
39
  @consul.stop unless @task_settings.consul_loader == nil
40
+ sleep 3
40
41
  @docker_network.remove
41
42
  end
42
43
  end
data/lib/minke/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Minke
2
- VERSION = "1.11.0"
2
+ VERSION = "1.11.1"
3
3
  end
data/lib/minke.rb CHANGED
@@ -48,7 +48,7 @@ require 'minke/generators/config_processor'
48
48
  require 'minke/generators/config_variables'
49
49
  require 'minke/generators/processor'
50
50
  require 'minke/generators/register'
51
- require 'minke/generators/shell_script.rb'
51
+ require 'minke/generators/shell_script'
52
52
 
53
53
  require 'minke/encryption/encryption'
54
54
  require 'minke/encryption/key_locator'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: minke
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.11.0
4
+ version: 1.11.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nic Jackson
@@ -14,182 +14,182 @@ dependencies:
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.10'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.10'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rspec
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ! '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ! '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: guard
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ! '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ! '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: guard-rspec
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ! '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ! '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: webmock
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ! '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ! '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: sshkey
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ! '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ! '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: colorize
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ! '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ! '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: cucumber
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ! '>='
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ! '>='
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rake
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: '10.0'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: '10.0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: docker-api
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ! '>='
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ! '>='
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: rest-client
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ~>
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
159
  version: '1.8'
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ~>
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
166
  version: '1.8'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: consul_loader
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ~>
171
+ - - "~>"
172
172
  - !ruby/object:Gem::Version
173
173
  version: '1.0'
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ~>
178
+ - - "~>"
179
179
  - !ruby/object:Gem::Version
180
180
  version: '1.0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: multi_json
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ! '>='
185
+ - - ">="
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ! '>='
192
+ - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  description:
@@ -200,12 +200,12 @@ executables:
200
200
  extensions: []
201
201
  extra_rdoc_files: []
202
202
  files:
203
- - .codeclimate.yml
204
- - .gitignore
205
- - .rspec
206
- - .ruby-gemset
207
- - .ruby-version
208
- - .travis.yml
203
+ - ".codeclimate.yml"
204
+ - ".gitignore"
205
+ - ".rspec"
206
+ - ".ruby-gemset"
207
+ - ".ruby-version"
208
+ - ".travis.yml"
209
209
  - CODE_OF_CONDUCT.md
210
210
  - Gemfile
211
211
  - Guardfile
@@ -243,8 +243,6 @@ files:
243
243
  - lib/minke/helpers/rake.rb
244
244
  - lib/minke/helpers/shell.rb
245
245
  - lib/minke/rake/app.rake
246
- - lib/minke/rake/config.rake
247
- - lib/minke/rake/docker.rake
248
246
  - lib/minke/scripts/minke.sh
249
247
  - lib/minke/tasks/build.rb
250
248
  - lib/minke/tasks/build_image.rb
@@ -267,17 +265,17 @@ require_paths:
267
265
  - lib
268
266
  required_ruby_version: !ruby/object:Gem::Requirement
269
267
  requirements:
270
- - - ! '>='
268
+ - - ">="
271
269
  - !ruby/object:Gem::Version
272
270
  version: '0'
273
271
  required_rubygems_version: !ruby/object:Gem::Requirement
274
272
  requirements:
275
- - - ! '>='
273
+ - - ">="
276
274
  - !ruby/object:Gem::Version
277
275
  version: '0'
278
276
  requirements: []
279
277
  rubyforge_project:
280
- rubygems_version: 2.4.5
278
+ rubygems_version: 2.6.4
281
279
  signing_key:
282
280
  specification_version: 4
283
281
  summary: Minke is a suite of rake tasks for building and testing microservices with
@@ -1,6 +0,0 @@
1
- namespace :config do
2
- task :set_docker_env do
3
- DOCKER_IP = Minke::Docker::DockerRunner.new(nil).get_docker_ip_address
4
- ENV['DOCKER_IP'] = DOCKER_IP
5
- end
6
- end
@@ -1,23 +0,0 @@
1
- namespace :docker do
2
- desc "updates build images for swagger and golang will overwrite existing images"
3
- task :update_images do
4
- config = Minke::Config::Reader.new.read './config.yml'
5
-
6
- puts "## Updating Docker images"
7
- runner = Minke::Docker::DockerRunner.new
8
- runner.pull_image config.docker.build_image
9
-
10
- puts ""
11
- end
12
-
13
- desc "pull images for golang from Docker registry if not already downloaded"
14
- task :fetch_images do
15
- config = Minke::Config::Reader.new.read './config.yml'
16
-
17
- puts "## Pulling Docker images"
18
- runner = Minke::Docker::DockerRunner.new
19
- runner.pull_image config.docker.build_image unless runner.find_image config.docker.build_image
20
-
21
- puts ""
22
- end
23
- end