azdeploy 1.0.41 → 1.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0c065fd5f26454958eef794494470d24e28156
-  data.tar.gz: 465cec8284f6364ec8748973f2a3eeab41aefa02
+  metadata.gz: 5bc8aaab8bedd1b78512fbc23385bb20004cc432
+  data.tar.gz: 4eff3752cd5f29762be1f5b5534b171617adf750
 SHA512:
-  metadata.gz: d6cc59cd9f8f4d45ffcb06eac4e823d2a8c4fc35dd8f5233b96857ac5210aba66ea6351f9a2ede2a8e3b79e8dc4aa4d46dadaacd9b28c267bcbdcef3028d7172
-  data.tar.gz: ca1b1e542b56961a627feb715a5e0532514a4ba15ab3f2f03ae62e48abb9639bcb0dc0ed84959c30a25ed6ef7696fa55c0db8658dd1b77166fe1bb8cd2310612
+  metadata.gz: b1084dd15d146d28b03b230719720877f76d68e251830f493677fc46fc93f36650938b2e6505e9c08ebc149094b3677131c0afcd81b3272697e476e82aa39d8b
+  data.tar.gz: d6b7eb8ce2e91d9f08fef0b84c54f132fb22aaf93960b13b6100054c86d51877e967fb682c6d62a331ad2642f981d896b721454196baba589ee85a5e965f83b5

data/azdeploy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.41'
-  s.date        = '2016-01-14'
+  s.version     = '1.0.42'
+  s.date        = '2016-01-15'
   s.summary     = 'Setup and scripting support for .Net project builds'
   s.description = 'Azure Deployment Gem. Provides easy setup and deployment scripting support for .Net project builds'
   s.authors     = ['Suresh Batta']

data/lib/transform.rb

@@ -187,7 +187,6 @@ class Transform
   end
 
   def transform_riverbed doc
-    @service_name = ENV[SERVICENAME]
     is_service = @service_name || NO_VALUE
     if is_service != NO_VALUE
       node = doc.at_css 'WebRole'
@@ -217,25 +216,34 @@ class Transform
   end
 
   def transform_newrelic doc
-    @service_name = ENV[SERVICENAME]
     is_service = @service_name || NO_VALUE
     if is_service != NO_VALUE
       node = doc.at_css 'WebRole'
-      transform_newrelic_node(doc, node, @service_name) if !node.nil?
+      transform_newrelic_node(doc, node) if !node.nil?
       node = doc.at_css 'WorkerRole'
-      transform_newrelic_node(doc, node, @service_name) if !node.nil?
+      transform_newrelic_node(doc, node) if !node.nil?
     else
       puts 'Not a service, avoiding transforming the csdef.'
     end
   end
 
-  def transform_newrelic_node doc, xml_node, service_name
+  def transform_newrelic_node doc, xml_node
     task_node = Nokogiri::XML::Node.new 'Task', doc
 
     task_node['commandLine'] = 'newrelic_env.cmd'
     task_node['executionContext'] = 'elevated'
     task_node['taskType'] = 'simple'
 
+    env_node = Nokogiri::XML::Node.new 'Environment', doc
+    var_node = Nokogiri::XML::Node.new 'Variable', doc
+    var_node['name'] = 'EMULATED'
+    val_node = Nokogiri::XML::Node.new 'RoleInstanceValue', doc
+    val_node['xpath'] = '/RoleEnvironment/Deployment/@emulated'
+
+    var_node.add_child(val_node)
+    env_node.add_child(var_node)
+    task_node.add_child(env_node)
+
     existing_start_up_node = xml_node.at_css('Startup')
     if existing_start_up_node.nil?
       start_up_node = Nokogiri::XML::Node.new 'Startup', doc
@@ -247,7 +255,6 @@ class Transform
   end
 
   def transform_appdynamics doc
-    @service_name = ENV[SERVICENAME]
     is_service = @service_name || NO_VALUE
     if is_service != NO_VALUE
       node = doc.at_css 'WebRole'
@@ -262,9 +269,19 @@ class Transform
   def transform_appdynamics_node doc, xml_node
     task_node = Nokogiri::XML::Node.new 'Task', doc
 
-    task_node['commandLine'] = 'AppDynamics\startup.cmd'
+    task_node['commandLine'] = "AppDynamics\\startup_env.cmd \"#{@service_name}\""
     task_node['executionContext'] = 'elevated'
-    task_node['taskType'] = 'foreground'
+    task_node['taskType'] = 'simple'
+
+    env_node = Nokogiri::XML::Node.new 'Environment', doc
+    var_node = Nokogiri::XML::Node.new 'Variable', doc
+    var_node['name'] = 'EMULATED'
+    val_node = Nokogiri::XML::Node.new 'RoleInstanceValue', doc
+    val_node['xpath'] = '/RoleEnvironment/Deployment/@emulated'
+
+    var_node.add_child(val_node)
+    env_node.add_child(var_node)
+    task_node.add_child(env_node)
 
     existing_start_up_node = xml_node.at_css('Startup')
     if existing_start_up_node.nil?
@@ -496,17 +513,20 @@ class Transform
       puts 'Transforming csdef...'
       xml_node_processing = nil
       use_riverbed = ENV['UseRiverbed'] || NO_VALUE
+      use_riverbed = use_riverbed.downcase
       if use_riverbed == "true"
         puts 'Using riverbed...'
         xml_node_processing = method(:transform_riverbed)
       end
       use_newrelic = ENV['UseNewrelic'] || NO_VALUE
+      use_newrelic = use_newrelic.downcase
       if use_newrelic == "true"
         puts 'Using new relic...'
         transform_appsettings NEWRELIC_APPNAME, @service_name
         xml_node_processing = method(:transform_newrelic)
       end
       use_appdynamics = ENV['UseAppdynamics'] || NO_VALUE
+      use_appdynamics = use_appdynamics.downcase
       if use_appdynamics == "true"
         puts 'Using app dynamics...'
         xml_node_processing = method(:transform_appdynamics)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.41
+  version: 1.0.42
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies: []
 description: Azure Deployment Gem. Provides easy setup and deployment scripting support
   for .Net project builds