azdeploy 1.0.40 → 1.0.41

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 (4) hide show
  1. checksums.yaml +4 -4
  2. data/azdeploy.gemspec +1 -1
  3. data/lib/transform.rb +39 -18
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e6f3afb51c4b46fe9ebe591615ae3891ff16eb93
4
- data.tar.gz: e381b99cd5f18135c9792531bb5f62209b7323f9
3
+ metadata.gz: 4f0c065fd5f26454958eef794494470d24e28156
4
+ data.tar.gz: 465cec8284f6364ec8748973f2a3eeab41aefa02
5
5
  SHA512:
6
- metadata.gz: c24c77a38a31dc11be5c1c3c665dfaedfe660a08d11e222344ecbb94a4aa6438632801274be4074ff5b231230651223dbf031e81a4262ff904da579d99175ba7
7
- data.tar.gz: 337e9d570559205ee30b08719caa4d2c7f6c93279b697b0b57065a8823fa30380cfe5290df0d44b451e8fdc213490c321dd81a5309a0238a4c8e11a2dd91881f
6
+ metadata.gz: d6cc59cd9f8f4d45ffcb06eac4e823d2a8c4fc35dd8f5233b96857ac5210aba66ea6351f9a2ede2a8e3b79e8dc4aa4d46dadaacd9b28c267bcbdcef3028d7172
7
+ data.tar.gz: ca1b1e542b56961a627feb715a5e0532514a4ba15ab3f2f03ae62e48abb9639bcb0dc0ed84959c30a25ed6ef7696fa55c0db8658dd1b77166fe1bb8cd2310612
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'azdeploy'
3
- s.version = '1.0.40'
3
+ s.version = '1.0.41'
4
4
  s.date = '2016-01-14'
5
5
  s.summary = 'Setup and scripting support for .Net project builds'
6
6
  s.description = 'Azure Deployment Gem. Provides easy setup and deployment scripting support for .Net project builds'
@@ -13,6 +13,8 @@ class Transform
13
13
  VALUE = 'value'
14
14
  APPCLIENTID = 'AppClientId'
15
15
  APPIDURI = 'AppIdUri'
16
+ NEWRELIC_APPNAME = 'NewRelic.AppName'
17
+ SERVICENAME = 'ServiceName'
16
18
  OLDAPPID = 'AppId'
17
19
  EMPTY_STR = ''
18
20
  STORAGEACCOUNT = 'StorageAccount'
@@ -177,7 +179,7 @@ class Transform
177
179
  node = doc.at_css 'LocalResources'
178
180
  node.replace(get_value 'LocalResources') if !node.nil?
179
181
 
180
- custom_xml_process.call(doc) if !custom_xml_process.nil?
182
+ custom_xml_process.call(doc) if !custom_xml_process.nil? and !doc.nil?
181
183
 
182
184
  File.write file, doc.to_xml
183
185
 
@@ -185,13 +187,19 @@ class Transform
185
187
  end
186
188
 
187
189
  def transform_riverbed doc
188
- node = doc.at_css 'WebRole'
189
- transform_riverbed_node(node) if !node.nil?
190
- node = doc.at_css 'WorkerRole'
191
- transform_riverbed_node(node) if !node.nil?
190
+ @service_name = ENV[SERVICENAME]
191
+ is_service = @service_name || NO_VALUE
192
+ if is_service != NO_VALUE
193
+ node = doc.at_css 'WebRole'
194
+ transform_riverbed_node(doc, node) if !node.nil?
195
+ node = doc.at_css 'WorkerRole'
196
+ transform_riverbed_node(doc, node) if !node.nil?
197
+ else
198
+ puts 'Not a service, avoiding transforming the csdef.'
199
+ end
192
200
  end
193
201
 
194
- def transform_riverbed_node xml_node
202
+ def transform_riverbed_node doc, xml_node
195
203
  task_node = Nokogiri::XML::Node.new 'Task', doc
196
204
 
197
205
  task_node['commandLine'] = 'AppInternals\startup.cmd'
@@ -209,18 +217,24 @@ class Transform
209
217
  end
210
218
 
211
219
  def transform_newrelic doc
212
- node = doc.at_css 'WebRole'
213
- transform_newrelic_node(node) if !node.nil?
214
- node = doc.at_css 'WorkerRole'
215
- transform_newrelic_node(node) if !node.nil?
220
+ @service_name = ENV[SERVICENAME]
221
+ is_service = @service_name || NO_VALUE
222
+ if is_service != NO_VALUE
223
+ node = doc.at_css 'WebRole'
224
+ transform_newrelic_node(doc, node, @service_name) if !node.nil?
225
+ node = doc.at_css 'WorkerRole'
226
+ transform_newrelic_node(doc, node, @service_name) if !node.nil?
227
+ else
228
+ puts 'Not a service, avoiding transforming the csdef.'
229
+ end
216
230
  end
217
231
 
218
- def transform_newrelic_node xml_node
232
+ def transform_newrelic_node doc, xml_node, service_name
219
233
  task_node = Nokogiri::XML::Node.new 'Task', doc
220
234
 
221
235
  task_node['commandLine'] = 'newrelic_env.cmd'
222
236
  task_node['executionContext'] = 'elevated'
223
- task_node['taskType'] = 'foreground'
237
+ task_node['taskType'] = 'simple'
224
238
 
225
239
  existing_start_up_node = xml_node.at_css('Startup')
226
240
  if existing_start_up_node.nil?
@@ -233,13 +247,19 @@ class Transform
233
247
  end
234
248
 
235
249
  def transform_appdynamics doc
236
- node = doc.at_css 'WebRole'
237
- transform_appdynamics_node(node) if !node.nil?
238
- node = doc.at_css 'WorkerRole'
239
- transform_appdynamics_node(node) if !node.nil?
250
+ @service_name = ENV[SERVICENAME]
251
+ is_service = @service_name || NO_VALUE
252
+ if is_service != NO_VALUE
253
+ node = doc.at_css 'WebRole'
254
+ transform_appdynamics_node(doc, node) if !node.nil?
255
+ node = doc.at_css 'WorkerRole'
256
+ transform_appdynamics_node(doc, node) if !node.nil?
257
+ else
258
+ puts 'Not a service, avoiding transforming the csdef.'
259
+ end
240
260
  end
241
261
 
242
- def transform_appdynamics_node xml_node
262
+ def transform_appdynamics_node doc, xml_node
243
263
  task_node = Nokogiri::XML::Node.new 'Task', doc
244
264
 
245
265
  task_node['commandLine'] = 'AppDynamics\startup.cmd'
@@ -462,7 +482,7 @@ class Transform
462
482
  transform_appsettings APPIDURI, appIdUri
463
483
  end
464
484
 
465
- @service_name = ENV['ServiceName']
485
+ @service_name = ENV[SERVICENAME]
466
486
  is_service = @service_name || NO_VALUE
467
487
  if is_service != NO_VALUE
468
488
  puts "Transforming config for service: #{@service_name}"
@@ -483,6 +503,7 @@ class Transform
483
503
  use_newrelic = ENV['UseNewrelic'] || NO_VALUE
484
504
  if use_newrelic == "true"
485
505
  puts 'Using new relic...'
506
+ transform_appsettings NEWRELIC_APPNAME, @service_name
486
507
  xml_node_processing = method(:transform_newrelic)
487
508
  end
488
509
  use_appdynamics = ENV['UseAppdynamics'] || NO_VALUE
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: azdeploy
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.40
4
+ version: 1.0.41
5
5
  platform: ruby
6
6
  authors:
7
7
  - Suresh Batta