azdeploy 1.0.38 → 1.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f25289c9d28c4b62ed25dcf3a8b20ce1dfe2b5
-  data.tar.gz: 30b27699837da80f0d4c25aa0ce73fcf3ecbef7b
+  metadata.gz: e6f3afb51c4b46fe9ebe591615ae3891ff16eb93
+  data.tar.gz: e381b99cd5f18135c9792531bb5f62209b7323f9
 SHA512:
-  metadata.gz: 9c2135b33a88a6b7e855e92f6668a09db70fe72ed7c267d50bfa029769138e12114b454d05c3a2938ea45684bb0ec03a0cdae3dc0e449d18c80248fd721aca29
-  data.tar.gz: 4c0f91a133bdebcb6cac06c9bae2f2984f7d85877c63f0e93a7041e85210082e7dbcadf0d0409c6fea2af6a92b1901e83689f82a8c06d9bb57847475d37bc79c
+  metadata.gz: c24c77a38a31dc11be5c1c3c665dfaedfe660a08d11e222344ecbb94a4aa6438632801274be4074ff5b231230651223dbf031e81a4262ff904da579d99175ba7
+  data.tar.gz: 337e9d570559205ee30b08719caa4d2c7f6c93279b697b0b57065a8823fa30380cfe5290df0d44b451e8fdc213490c321dd81a5309a0238a4c8e11a2dd91881f

data/azdeploy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.38'
-  s.date        = '2016-01-12'
+  s.version     = '1.0.40'
+  s.date        = '2016-01-14'
   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/azdeploy.rb

@@ -6,7 +6,7 @@ require_relative 'semantic_versioning.rb'
 
 # installation
 installers = [
-  'ruby', 'devkit', 'doxygen', 'gems'
+  'ruby', 'devkit', 'gems'
 ]
 
 installers.each { |method|

data/lib/install.rb

@@ -142,12 +142,6 @@ def check_devkit
   return true
 end
 
-# doxygen check
-def check_doxygen
-  # download doxygen
-  return true
-end
-
 # check and install required gems
 def check_gems
   puts 'Checking required gems...'
@@ -155,7 +149,7 @@ def check_gems
     if !gem_exists(key, "=#{value}")
       begin
         puts "Installing missing gem: #{key}"
-        cmd = "gem install #{key} -v #{value}"
+        cmd = "gem install --user-install #{key} -v #{value}"
         cmdoutput = `#{cmd}`
         puts cmdoutput
       rescue

data/lib/transform.rb

@@ -154,11 +154,9 @@ class Transform
 
       node = doc.at_css 'WebRole'
       node['name'] = @service_name if !node.nil?
-      custom_xml_process.call(doc, node) if !custom_xml_process.nil? && !node.nil?
 
       node = doc.at_css 'WorkerRole'
       node['name'] = @service_name if !node.nil?
-      custom_xml_process.call(doc, node) if !custom_xml_process.nil? && !node.nil?
 
       node = doc.at_css 'Certificates'
 
@@ -179,28 +177,82 @@ class Transform
       node = doc.at_css 'LocalResources'
       node.replace(get_value 'LocalResources') if !node.nil?
 
+      custom_xml_process.call(doc) if !custom_xml_process.nil?
+
       File.write file, doc.to_xml
 
     }
   end
 
-  def transform_riverbed doc, xml_node
-    if xml_node.name == 'WebRole' || xml_node.name == 'WorkerRole'
-      task_node = Nokogiri::XML::Node.new 'Task', doc
+  def transform_riverbed doc
+    node = doc.at_css 'WebRole'
+    transform_riverbed_node(node) if !node.nil?
+    node = doc.at_css 'WorkerRole'
+    transform_riverbed_node(node) if !node.nil?
+  end
 
-      task_node['commandLine'] = 'AppInternals\startup.cmd'
-      task_node['executionContext'] = 'elevated'
-      task_node['taskType'] = 'foreground'
+  def transform_riverbed_node xml_node
+    task_node = Nokogiri::XML::Node.new 'Task', doc
 
-      existing_start_up_node = xml_node.at_css('Startup')
-      if existing_start_up_node.nil?
-        start_up_node = Nokogiri::XML::Node.new 'Startup', doc
-        xml_node.add_child(start_up_node)
-        start_up_node.add_child(task_node)
-      else
-        existing_start_up_node.add_child(task_node)
-      end
-      
+    task_node['commandLine'] = 'AppInternals\startup.cmd'
+    task_node['executionContext'] = 'elevated'
+    task_node['taskType'] = 'foreground'
+
+    existing_start_up_node = xml_node.at_css('Startup')
+    if existing_start_up_node.nil?
+      start_up_node = Nokogiri::XML::Node.new 'Startup', doc
+      xml_node.add_child(start_up_node)
+      start_up_node.add_child(task_node)
+    else
+      existing_start_up_node.add_child(task_node)
+    end
+  end
+
+  def transform_newrelic doc
+    node = doc.at_css 'WebRole'
+    transform_newrelic_node(node) if !node.nil?
+    node = doc.at_css 'WorkerRole'
+    transform_newrelic_node(node) if !node.nil?
+  end
+
+  def transform_newrelic_node xml_node
+    task_node = Nokogiri::XML::Node.new 'Task', doc
+
+    task_node['commandLine'] = 'newrelic_env.cmd'
+    task_node['executionContext'] = 'elevated'
+    task_node['taskType'] = 'foreground'
+
+    existing_start_up_node = xml_node.at_css('Startup')
+    if existing_start_up_node.nil?
+      start_up_node = Nokogiri::XML::Node.new 'Startup', doc
+      xml_node.add_child(start_up_node)
+      start_up_node.add_child(task_node)
+    else
+      existing_start_up_node.add_child(task_node)
+    end
+  end
+
+  def transform_appdynamics doc
+    node = doc.at_css 'WebRole'
+    transform_appdynamics_node(node) if !node.nil?
+    node = doc.at_css 'WorkerRole'
+    transform_appdynamics_node(node) if !node.nil?
+  end
+
+  def transform_appdynamics_node xml_node
+    task_node = Nokogiri::XML::Node.new 'Task', doc
+
+    task_node['commandLine'] = 'AppDynamics\startup.cmd'
+    task_node['executionContext'] = 'elevated'
+    task_node['taskType'] = 'foreground'
+
+    existing_start_up_node = xml_node.at_css('Startup')
+    if existing_start_up_node.nil?
+      start_up_node = Nokogiri::XML::Node.new 'Startup', doc
+      xml_node.add_child(start_up_node)
+      start_up_node.add_child(task_node)
+    else
+      existing_start_up_node.add_child(task_node)
     end
   end
 
@@ -424,10 +476,30 @@ class Transform
       puts 'Transforming csdef...'
       xml_node_processing = nil
       use_riverbed = ENV['UseRiverbed'] || NO_VALUE
-      if use_riverbed == "true" || use_riverbed == "1"
+      if use_riverbed == "true"
         puts 'Using riverbed...'
         xml_node_processing = method(:transform_riverbed)
       end
+      use_newrelic = ENV['UseNewrelic'] || NO_VALUE
+      if use_newrelic == "true"
+        puts 'Using new relic...'
+        xml_node_processing = method(:transform_newrelic)
+      end
+      use_appdynamics = ENV['UseAppdynamics'] || NO_VALUE
+      if use_appdynamics == "true"
+        puts 'Using app dynamics...'
+        xml_node_processing = method(:transform_appdynamics)
+      end
+
+      if !((use_riverbed == "true" and use_newrelic != "true" and use_appdynamics != "true") or
+        (use_riverbed != "true" and use_newrelic == "true" and use_appdynamics != "true") or
+        (use_riverbed != "true" and use_newrelic != "true" and use_appdynamics == "true") or
+        (use_riverbed != "true" and use_newrelic != "true" and use_appdynamics != "true"))
+        puts 'Only one APM tool can be used at one time, aborting.'
+        return false
+      end
+
+
       transform_csdef xml_node_processing
 
       puts 'Transforming cscfg...'

metadata

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