minke 1.11.8 → 1.11.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +13 -5
  2. data/docker/Gemfile +1 -1
  3. data/lib/minke/docker/service_discovery.rb +4 -5
  4. data/lib/minke/helpers/shell.rb +8 -0
  5. data/lib/minke/tasks/fetch.rb +3 -4
  6. data/lib/minke/version.rb +1 -1
  7. metadata +37 -37
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 59a4b6a990a26c0bf4d5f5e34385ee3314780e24
4
- data.tar.gz: 2dc81a3479ea63e37a86a0d72990a6a1f59a77a3
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZGQxNDJkN2M5ZDBiYjQ0MDkwYjAwNTAwNDBmZGRhZDNjM2ZjYzc0OA==
5
+ data.tar.gz: !binary |-
6
+ NDY1MTI2ODBhZGZlMDg3MDk5Yzc2YmViMGU5NDcwZTA0ZmQyMmQyOA==
5
7
  SHA512:
6
- metadata.gz: 0fcc553b0bf46655b1954eb5d27f00a9a0dc6fe646d355704e4c01cf72c5681b607151f576eac0e7bdeb5c9676f68e04fbdc3b4b0ab53e02660be08818e2fc65
7
- data.tar.gz: bd01fcd5c3a7dbdbe4a45dbe6bab057a4d38c65e303594d80f91b487690a4f85cddd8e4ac97c3c73a0e312644794eab93efb24c73bcd367d0d51db7677e35ca1
8
+ metadata.gz: !binary |-
9
+ ZWQwMDRhYWZiYTM4OTgwODEzMGJmZWZiZGEwYTNkMDQ4OGI5MmY2ZGEzZDc5
10
+ ZGQxNjJkN2RmNzJiMGI0ZjI3MTVjMTBlMGU1NzA0ODZiNmJkYThkNGUxMjZk
11
+ N2U3ZTNmMGUxMDA1N2E0ZDM4MzA5NjcwMjE2NjE5MTk4Yjk5NTA=
12
+ data.tar.gz: !binary |-
13
+ MTQzOWY0ZDlmMThhYTNjMDIzNTQwZWFmNjNmZGEzM2YwZmUzNGYyOTljODFi
14
+ YWZmMjIwNWY0OGFhNmYzOTAxNmE4MGMzNzc0OTNhMDUyODZkYzU0ODkyYzQw
15
+ Yzg3MjExNWY4ZjI4YmVlZGZmNGI4N2FiNDRmOWVhYTIzN2E0MmM=
data/docker/Gemfile CHANGED
@@ -7,7 +7,7 @@ gem "cucumber"
7
7
  gem "cucumber-rest-api", "= 0.3"
8
8
  gem 'cucumber-api', '~> 0.3'
9
9
 
10
- gem 'minke', "= 1.11.8"
10
+ gem 'minke', "= 1.11.9"
11
11
  gem 'minke-generator-swift', "= 0.1.8"
12
12
  gem 'minke-generator-netmvc'
13
13
  gem 'minke-generator-go'
data/lib/minke/docker/service_discovery.rb CHANGED
@@ -33,17 +33,16 @@ module Minke
33
33
  # Will attempt to locate the private details for a running container given
34
34
  # its name and private port
35
35
  # Parameters:
36
- # - network: the name of the network the container is running on
37
36
  # - service_name: the name of the running service
38
37
  # - private_port: the private port which you wish to retrieve an address for
39
38
  # Returns:
40
39
  # private address for the container e.g. 172.17.0.2:8080
41
- def bridge_address_for network, service_name, private_port
40
+ def bridge_address_for service_name, private_port
42
41
  begin
43
42
  container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
44
- ip = container_details.first.info['NetworkSettings']['Networks']["#{network}"]['IPAddress']
43
+ ip = container_details.first.info['NetworkSettings']['Networks']["#{@docker_network}"]['IPAddress']
45
44
  rescue
46
- raise "Unable to find bridge address for network: #{network}, container: #{service_name}, port: #{private_port}"
45
+ raise "Unable to find bridge address for network: #{@docker_network}, container: #{service_name}, port: #{private_port}"
47
46
  end
48
47
  return "#{ip}:#{private_port}"
49
48
  end
@@ -54,7 +53,7 @@ module Minke
54
53
  if url.type == 'external'
55
54
  "#{url.protocol}://#{url.address}:#{url.port}#{url.path}"
56
55
  elsif url.type == 'bridge'
57
- address = bridge_address_for @docker_network, url.address, url.port
56
+ address = bridge_address_for url.address, url.port
58
57
  "#{url.protocol}://#{address}#{url.path}"
59
58
  elsif url.type == 'public'
60
59
  address = public_address_for url.address, url.port
data/lib/minke/helpers/shell.rb CHANGED
@@ -24,6 +24,14 @@ module Minke
24
24
  def write_file filename, data
25
25
  File.open(filename, 'w') { |file| file.write(data) }
26
26
  end
27
+
28
+ def read_file filename
29
+ File.open(filename, 'rb') { |file| file.read }.strip
30
+ end
31
+
32
+ def exist? filename
33
+ File.exist? filename
34
+ end
27
35
  end
28
36
  end
29
37
  end
data/lib/minke/tasks/fetch.rb CHANGED
@@ -9,11 +9,10 @@ module Minke
9
9
  rvm = "#{ENV['HOME']}/.rvm/scripts/rvm"
10
10
  rvm_root = '/usr/local/rvm/scripts/rvm'
11
11
 
12
- rvm_installed = File.exist?(rvm)
13
- rvm_root_installed = File.exist?(rvm_root)
12
+ rvm_installed = @shell_helper.exist?(rvm)
13
+ rvm_root_installed = @shell_helper.exist?(rvm_root)
14
14
 
15
- gemset = File.open('.ruby-gemset', 'rb') { |file| file.read }
16
- gemset = gemset.strip
15
+ gemset = @shell_helper.read_file '.ruby-gemset'
17
16
 
18
17
  puts "Using gemset #{gemset}"
19
18
 
data/lib/minke/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Minke
2
- VERSION = "1.11.8"
2
+ VERSION = "1.11.9"
3
3
  end
metadata CHANGED
@@ -1,195 +1,195 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: minke
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.11.8
4
+ version: 1.11.9
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-07-18 00:00:00.000000000 Z
11
+ date: 2016-07-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
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
@@ -265,17 +265,17 @@ require_paths:
265
265
  - lib
266
266
  required_ruby_version: !ruby/object:Gem::Requirement
267
267
  requirements:
268
- - - ">="
268
+ - - ! '>='
269
269
  - !ruby/object:Gem::Version
270
270
  version: '0'
271
271
  required_rubygems_version: !ruby/object:Gem::Requirement
272
272
  requirements:
273
- - - ">="
273
+ - - ! '>='
274
274
  - !ruby/object:Gem::Version
275
275
  version: '0'
276
276
  requirements: []
277
277
  rubyforge_project:
278
- rubygems_version: 2.6.4
278
+ rubygems_version: 2.4.5
279
279
  signing_key:
280
280
  specification_version: 4
281
281
  summary: Minke is a suite of rake tasks for building and testing microservices with