gaptool-server 0.4.10 → 0.4.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +5 -13
  2. data/VERSION +1 -1
  3. data/gaptool-server.gemspec +1 -1
  4. data/lib/helpers/gaptool-base.rb +4 -4
  5. data/lib/routes/main.rb +2 -1
  6. metadata +34 -34
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- OTcxODg0NzgxNWE0MDZhYjI0M2Q1MTk4MWIwNzZmYTRkMjBjOTUxNw==
5
- data.tar.gz: !binary |-
6
- MGFkOTgxZmJhNmMzOTU3MjkyNDRkZGMzODNiNTliNzY3YjUwMzRlNg==
2
+ SHA1:
3
+ metadata.gz: 73580bf5be536cfbc940998372be1cdec0bf0f98
4
+ data.tar.gz: 0e16e18b18ca8c9bee946c004c569dce1b7a5d22
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ODE3Yzk0YjUzZjYwYTBiOGZlNDM4MTlhNzFhYmNmMTQ1MDM0NTRkMDVhYTAw
10
- MTVhNDM5YTg1ZWI2NTA5NzlkOGQzNzZiYjdlYzQ3NmM5YWNkNWY4ODIzMWZk
11
- YjA5OGVjODJjZTg5ZWRlODU2NzRhNjUyODA0MThkNjkzMTcyYWQ=
12
- data.tar.gz: !binary |-
13
- ODhhZGU1NjA5ZDllMGU1NjI1NGE0Mjc3YTM2M2E1NGMzNTllYWRhM2JmNWRl
14
- YmM1M2QxZTYwNjM4ZjU1ZTEyNTgxN2RmMDIzOTBhYjc2OTVkMDEwNDMyYWNh
15
- ZDk4NmRhMTYwZjZjNzhmNDMyOWQ5YjEyYTgwZGJiMjg1NmMxMjU=
6
+ metadata.gz: 4d97074fd6cd875aa1dc2d31d09bfbba36a330b244266246919ca0311148d6dfab7ae57d1039d9a0da9dd581d4846d0a3a310cd3e1583fc8208e32cc831ac811
7
+ data.tar.gz: 1f96d959fb7b246afd441a06ab4e99c2e2b8f7ff68ba09dd4493e14f3510f14e8a359f49500d39b9afa435f063f5e6cb6da186393a3a0dce0a0789f677d0cfe5
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.10
1
+ 0.4.11
data/gaptool-server.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "gaptool-server"
8
- s.version = "0.4.10"
8
+ s.version = "0.4.11"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Matt Bailey", "Francesco Laurita"]
data/lib/helpers/gaptool-base.rb CHANGED
@@ -31,18 +31,18 @@ module GaptoolBaseHelpers
31
31
  return @key.to_pem
32
32
  end
33
33
 
34
- def gt_securitygroup(role, environment, zone)
34
+ def gt_securitygroup(role, environment, zone, groupname=nil)
35
35
  AWS.config(:access_key_id => $redis.hget('config', 'aws_id'), :secret_access_key => $redis.hget('config', 'aws_secret'), :ec2_endpoint => "ec2.#{zone.chop}.amazonaws.com")
36
36
  @ec2 = AWS::EC2.new
37
- groupname = "#{role}-#{environment}"
37
+ groupname = groupname || "#{role}-#{environment}"
38
38
  default_list = [ 22 ]
39
39
  @ec2.security_groups.each do |group|
40
- if group.name == "#{role}-#{environment}"
40
+ if group.name == groupname
41
41
  return group.id
42
42
  end
43
43
  end
44
44
  internet = ['0.0.0.0/0']
45
- sg = @ec2.security_groups.create("#{role}-#{environment}")
45
+ sg = @ec2.security_groups.create(groupname)
46
46
  sg.authorize_ingress :tcp, 22, *internet
47
47
  return sg.id
48
48
  end
data/lib/routes/main.rb CHANGED
@@ -34,7 +34,8 @@ class GaptoolServer < Sinatra::Application
34
34
  # create shared secret to reference in /register
35
35
  @secret = (0...8).map{65.+(rand(26)).chr}.join
36
36
  data.merge!("secret" => @secret)
37
- sgid = gt_securitygroup(data['role'], data['environment'], data['zone'])
37
+ security_group = data['security_group'] || $redis.hget("role:#{data['role']}", "security_group")
38
+ sgid = gt_securitygroup(data['role'], data['environment'], data['zone'], security_group)
38
39
  image_id = $redis.hget("amis:#{data['role']}", data['zone'].chop) || $redis.hget("amis", data['zone'].chop)
39
40
  if data['mirror']
40
41
  instance = @ec2.instances.create(
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gaptool-server
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.10
4
+ version: 0.4.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Bailey
@@ -15,210 +15,210 @@ dependencies:
15
15
  name: sinatra
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ! '>='
18
+ - - ">="
19
19
  - !ruby/object:Gem::Version
20
20
  version: '0'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ! '>='
25
+ - - ">="
26
26
  - !ruby/object:Gem::Version
27
27
  version: '0'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: thin
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ~>
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
34
  version: 1.5.1
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ~>
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
41
  version: 1.5.1
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: redis
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ! '>='
46
+ - - ">="
47
47
  - !ruby/object:Gem::Version
48
48
  version: '0'
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ! '>='
53
+ - - ">="
54
54
  - !ruby/object:Gem::Version
55
55
  version: '0'
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: aws-sdk
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - ! '>='
60
+ - - ">="
61
61
  - !ruby/object:Gem::Version
62
62
  version: '0'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - ! '>='
67
+ - - ">="
68
68
  - !ruby/object:Gem::Version
69
69
  version: '0'
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: net-ssh
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - ! '>='
74
+ - - ">="
75
75
  - !ruby/object:Gem::Version
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - ! '>='
81
+ - - ">="
82
82
  - !ruby/object:Gem::Version
83
83
  version: '0'
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: peach
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - ! '>='
88
+ - - ">="
89
89
  - !ruby/object:Gem::Version
90
90
  version: '0'
91
91
  type: :runtime
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - ! '>='
95
+ - - ">="
96
96
  - !ruby/object:Gem::Version
97
97
  version: '0'
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: bson_ext
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
- - - ! '>='
102
+ - - ">="
103
103
  - !ruby/object:Gem::Version
104
104
  version: '0'
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - ! '>='
109
+ - - ">="
110
110
  - !ruby/object:Gem::Version
111
111
  version: '0'
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: mongo
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - ! '>='
116
+ - - ">="
117
117
  - !ruby/object:Gem::Version
118
118
  version: '0'
119
119
  type: :runtime
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - ! '>='
123
+ - - ">="
124
124
  - !ruby/object:Gem::Version
125
125
  version: '0'
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: shoulda
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
- - - ! '>='
130
+ - - ">="
131
131
  - !ruby/object:Gem::Version
132
132
  version: '0'
133
133
  type: :development
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - ! '>='
137
+ - - ">="
138
138
  - !ruby/object:Gem::Version
139
139
  version: '0'
140
140
  - !ruby/object:Gem::Dependency
141
141
  name: rdoc
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
- - - ! '>='
144
+ - - ">="
145
145
  - !ruby/object:Gem::Version
146
146
  version: '0'
147
147
  type: :development
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - ! '>='
151
+ - - ">="
152
152
  - !ruby/object:Gem::Version
153
153
  version: '0'
154
154
  - !ruby/object:Gem::Dependency
155
155
  name: bundler
156
156
  requirement: !ruby/object:Gem::Requirement
157
157
  requirements:
158
- - - ! '>='
158
+ - - ">="
159
159
  - !ruby/object:Gem::Version
160
160
  version: '0'
161
161
  type: :development
162
162
  prerelease: false
163
163
  version_requirements: !ruby/object:Gem::Requirement
164
164
  requirements:
165
- - - ! '>='
165
+ - - ">="
166
166
  - !ruby/object:Gem::Version
167
167
  version: '0'
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: jeweler
170
170
  requirement: !ruby/object:Gem::Requirement
171
171
  requirements:
172
- - - ~>
172
+ - - "~>"
173
173
  - !ruby/object:Gem::Version
174
174
  version: 1.8.4
175
175
  type: :development
176
176
  prerelease: false
177
177
  version_requirements: !ruby/object:Gem::Requirement
178
178
  requirements:
179
- - - ~>
179
+ - - "~>"
180
180
  - !ruby/object:Gem::Version
181
181
  version: 1.8.4
182
182
  - !ruby/object:Gem::Dependency
183
183
  name: simplecov
184
184
  requirement: !ruby/object:Gem::Requirement
185
185
  requirements:
186
- - - ! '>='
186
+ - - ">="
187
187
  - !ruby/object:Gem::Version
188
188
  version: '0'
189
189
  type: :development
190
190
  prerelease: false
191
191
  version_requirements: !ruby/object:Gem::Requirement
192
192
  requirements:
193
- - - ! '>='
193
+ - - ">="
194
194
  - !ruby/object:Gem::Version
195
195
  version: '0'
196
196
  - !ruby/object:Gem::Dependency
197
197
  name: shotgun
198
198
  requirement: !ruby/object:Gem::Requirement
199
199
  requirements:
200
- - - ! '>='
200
+ - - ">="
201
201
  - !ruby/object:Gem::Version
202
202
  version: '0'
203
203
  type: :development
204
204
  prerelease: false
205
205
  version_requirements: !ruby/object:Gem::Requirement
206
206
  requirements:
207
- - - ! '>='
207
+ - - ">="
208
208
  - !ruby/object:Gem::Version
209
209
  version: '0'
210
210
  - !ruby/object:Gem::Dependency
211
211
  name: pry
212
212
  requirement: !ruby/object:Gem::Requirement
213
213
  requirements:
214
- - - ! '>='
214
+ - - ">="
215
215
  - !ruby/object:Gem::Version
216
216
  version: '0'
217
217
  type: :development
218
218
  prerelease: false
219
219
  version_requirements: !ruby/object:Gem::Requirement
220
220
  requirements:
221
- - - ! '>='
221
+ - - ">="
222
222
  - !ruby/object:Gem::Version
223
223
  version: '0'
224
224
  description: gaptool-server for managing cloud resources
@@ -230,7 +230,7 @@ extra_rdoc_files:
230
230
  - LICENSE.txt
231
231
  - README.rdoc
232
232
  files:
233
- - .document
233
+ - ".document"
234
234
  - Gemfile
235
235
  - LICENSE.txt
236
236
  - Procfile
@@ -274,12 +274,12 @@ require_paths:
274
274
  - lib
275
275
  required_ruby_version: !ruby/object:Gem::Requirement
276
276
  requirements:
277
- - - ! '>='
277
+ - - ">="
278
278
  - !ruby/object:Gem::Version
279
279
  version: '0'
280
280
  required_rubygems_version: !ruby/object:Gem::Requirement
281
281
  requirements:
282
- - - ! '>='
282
+ - - ">="
283
283
  - !ruby/object:Gem::Version
284
284
  version: '0'
285
285
  requirements: []