azdeploy 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f44fe4d7f6c34024cc9807e921bc5e3474bc7404
-  data.tar.gz: fa1d0b6b5f31843d4ae7a9ce625f73e283a7a3ff
+  metadata.gz: 8707d85f73db0211b6caefbfbb4493e2de43b978
+  data.tar.gz: eebb48c2ecf5f7976aa0fe6b00c24c2fc26eb651
 SHA512:
-  metadata.gz: 5740cfe22441487a334a8cfcf1b0c36cf91454f4d27f2aa3b9730a0194ea35014430471496bccdd92f339b0775a419368707da8129d1fc63fdb019d0e494954c
-  data.tar.gz: 54d83b7dbcf8a783584c134c7e936f5201fa4ebb8ccd9b841ce565554831c060f522523b90086042bc33118caa7f03480e5b19c83c71ac84d43bd56d6ca708df
+  metadata.gz: a46411e9673eef5388c04b6c5b746e05a913bfbef3e1d1a787aaa012e0a10454fab9a830b995cbae3d1ff3e0d48ef724fd3a78a4db6073f59c32fbf9d584ac79
+  data.tar.gz: 5c6d2f2673f27c6d7bb2ee521ba1102ce82cf22e3e01a1eabb464aad16b83c1cf96c0b1f84eb2195a0ecd422f0cbc618e0db5d5d8e261694ef85f081145d05ac

data/azdeploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.20'
+  s.version     = '1.0.21'
   s.date        = '2015-08-06'
   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'

data/lib/transform.rb

@@ -67,24 +67,29 @@ class Transform
                 else
                     v = value
                 end
+                update_appsetting(k, v, doc, file)
             else
                 @settings.each { |i|
                     k = i.properties[ROWKEY] || NO
                     v = i.properties[SETTING] || NO
+                    update_appsetting(k, v, doc, file)
                 }
             end
-            if (k != NO && v != NO)
-                node = doc.at_css "appSettings/add[@key='#{k}']"
-                if !node.nil?
-                    #puts "Old value: #{node[VALUE]}"
-                    node[VALUE] = v
-                    #puts "New value: #{v}"
-                    File.write(file, doc.to_xml)
-                end
-            end
         }
     end
 
+    def update_appsetting(k, v, doc, file)
+        if (k != NO && v != NO)
+            node = doc.at_css "appSettings/add[@key='#{k}']"
+            if !node.nil?
+                #puts "Old value: #{node[VALUE]}"
+                node[VALUE] = v
+                #puts "New value: #{v}"
+                File.write(file, doc.to_xml)
+            end
+        end
+    end
+
     def transform_servicemodelconfig
         @config_files.each{|file|
             doc = Nokogiri::XML(File.read(file))
@@ -183,6 +188,8 @@ class Transform
                 val_from_settings = get_value('AI_InstrumentationKey')
                 if (val_from_settings.to_s == '')
                     aikey =  ENV['AI_InstrumentationKey'] || NO
+                else
+                    aikey = val_from_settings
                 end
                 if (aikey != NO)
                     node.content = aikey
@@ -275,7 +282,6 @@ class Transform
         if should_update_settings_connstr == NO
             puts 'Flag for Setttings Connection String Update not set.'
         else
-            puts settings_connstr
             transform_appsettings('connectionString', settings_connstr)
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - Suresh Batta