azdeploy 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36315dba9576c9a045abc3af9bb4c734a0a97457
-  data.tar.gz: b0cae8d5e21af9379ca721ffc3ab88bf7e5490c0
+  metadata.gz: f1d3c94443746e97569ab92d434a0d096b57f812
+  data.tar.gz: aa32f296e32aab7255870c88d937a7a2a8fe016d
 SHA512:
-  metadata.gz: 4cdfff50622d7ec50a8d77ca19570b23437d2113a7763728402669596ea8a876fb499daf93cdb665e6a728c73847a4513f7c62e318c93389a44b3ab1a3c7eb7a
-  data.tar.gz: 68bbdc3ddd3e7b00af3750cd64d2e328b404a06ae885294432d85ec8152c75762f32425395ab5082b245a3f1282ada029631f029e470e5dd40df190d89700a94
+  metadata.gz: 01d3c8acb8b9eb34f76a9d152ced9bec42ca7997f835a99058efdb20baa8ada1386365fd8f83dea8e246aec792e0587b0a2a167d93bad90f5cd0ac2f5696ed76
+  data.tar.gz: 72422a1db7de52191fd89a705ea213371f0bf0d06dbc0ece486c2a055e40819976f7ce570f14d453780b0efe8f61d3150987020af5fc2e855d4803beb8e9a020

data/azdeploy.gemspec

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

@@ -6,11 +6,15 @@ class Transform
     attr_accessor :settings
     attr_accessor :config_files
     
-    NO = 'no'
+    NO_VALUE = 'no'
     ROWKEY = 'RowKey'
     SETTING = 'setting'
     VALUE = 'value'
     APPID = 'AppId'
+    EMPTY_STR = ''
+    STORAGEACCOUNT = 'StorageAccount'
+    STORAGEACCOUNTKEY = "#{STORAGEACCOUNT}Key"
+    CONNECTIONSTRING = 'connectionString'
     
     def get(key)
         begin
@@ -41,7 +45,7 @@ class Transform
         if (@settings.nil?)
             return
         end
-        value = ''
+        value = EMPTY_STR
         @settings.each { |i|
             if i.properties[ROWKEY] == key
                 value = i.properties[SETTING]
@@ -52,27 +56,19 @@ class Transform
         value
     end
     
-    def transform_appsettings(key = '', value = '')
+    def transform_appsettings(key = EMPTY_STR, value = EMPTY_STR)
         # go to each file and replace value of matching appSettings key
         @config_files.each{|file|
             doc = Nokogiri::XML(File.read(file))
             puts "Processing file: #{file}"
-            if (@settings.nil?)
-                if (key.to_s == '')
-                    k = NO
-                else
-                    k = key
-                end
-                if (value.to_s == '')
-                    v = NO
-                else
-                    v = value
-                end
+            if (key.to_s != EMPTY_STR && value.to_s != EMPTY_STR)
+                k = key
+                v = value
                 update_appsetting(k, v, doc, file)
             else
                 @settings.each { |i|
-                    k = i.properties[ROWKEY] || NO
-                    v = i.properties[SETTING] || NO
+                    k = i.properties[ROWKEY] || NO_VALUE
+                    v = i.properties[SETTING] || NO_VALUE
                     update_appsetting(k, v, doc, file)
                 }
             end
@@ -80,7 +76,7 @@ class Transform
     end
 
     def update_appsetting(k, v, doc, file)
-        if (k != NO && v != NO)
+        if (k != NO_VALUE && v != NO_VALUE)
             node = doc.at_css "appSettings/add[@key='#{k}']"
             if !node.nil?
                 #puts "Old value: #{node[VALUE]}"
@@ -187,12 +183,12 @@ class Transform
             node = doc.at_css 'InstrumentationKey'
             if (!node.nil?)
                 val_from_settings = get_value('AI_InstrumentationKey')
-                if (val_from_settings.to_s == '')
-                    aikey =  ENV['AI_InstrumentationKey'] || NO
+                if (val_from_settings.to_s == EMPTY_STR)
+                    aikey =  ENV['AI_InstrumentationKey'] || NO_VALUE
                 else
                     aikey = val_from_settings
                 end
-                if (aikey != NO)
+                if (aikey != NO_VALUE)
                     node.content = aikey
                 end
             end
@@ -206,11 +202,11 @@ class Transform
         csdef.each{ |file|
             doc = Nokogiri::XML(File.read(file))
 
-            node = doc.at_css "PrivateConfig/StorageAccount"
-            node['name'] = get_value('StorageAccount')
-            node['key'] = get_value('StorageAccountKey')
-            node = doc.at_css "StorageAccount"
-            node.content = get_value('StorageAccount')
+            node = doc.at_css "PrivateConfig/#{STORAGEACCOUNT}"
+            node['name'] = get_value(STORAGEACCOUNT)
+            node['key'] = get_value(STORAGEACCOUNTKEY)
+            node = doc.at_css STORAGEACCOUNT
+            node.content = get_value(STORAGEACCOUNT)
             
             File.write(file, doc.to_xml)
         }
@@ -233,8 +229,8 @@ class Transform
     def transform
 
         # --- Get environment invoked
-        @env = ENV['env'] || NO
-        if @env == NO
+        @env = ENV['env'] || NO_VALUE
+        if @env == NO_VALUE
             puts 'Environment name required to transform. No configuration changes will be done...'
             return false
         else
@@ -242,18 +238,18 @@ class Transform
         end
 
         # --- Get Settings Account Name, Key and Table from Environment variables
-        settings_account_name = ENV['SettingsAccount'] || ENV['StorageAccount'] || NO
-        if (settings_account_name == NO)
+        settings_account_name = ENV['SettingsAccount'] || ENV[STORAGEACCOUNT] || NO_VALUE
+        if (settings_account_name == NO_VALUE)
             puts "No settings storage account name found"
             return false
         end
-        settings_access_key = ENV['SettingsAccountKey'] || ENV['StorageAccountKey'] || NO
-        if (settings_access_key == NO)
+        settings_access_key = ENV['SettingsAccountKey'] || ENV[STORAGEACCOUNTKEY] || NO_VALUE
+        if (settings_access_key == NO_VALUE)
             puts "No settings storage account key found"
             return false
         end
-        config_table = ENV['ConfigSettingsTable'] || NO
-        if (config_table == NO)
+        config_table = ENV['ConfigSettingsTable'] || NO_VALUE
+        if (config_table == NO_VALUE)
             puts "No configuration table found"
         end
 
@@ -262,6 +258,8 @@ class Transform
         @config_files = Dir.glob('**/app.config')
         @config_files.concat(Dir.glob('**/appSettings.config'))
         @config_files.concat(Dir.glob('**/web.config'))
+        @config_files.concat(Dir.glob('**/RuntimeWeb/*Web.dll.config'))
+        @config_files.concat(Dir.glob('**/RuntimeService/*.exe.config'))
 
         # --- Load Settings from storage
         # azure table storage account where settings reside
@@ -276,34 +274,34 @@ class Transform
         @settings = get_all
 
         # --- Start Transformations ---
-        puts 'updating settings connection string...'
+        puts "updating settings #{CONNECTIONSTRING}..."
         settings_connstr = "DefaultEndpointsProtocol=https;AccountName=#{settings_account_name};AccountKey=#{settings_access_key}"
-        should_update_settings_connstr = ENV['should_update_settings_connstr'] || NO
-        if should_update_settings_connstr == NO
-            puts 'Flag for Setttings Connection String Update not set.'
+        should_update_settings_connstr = ENV['should_update_settings_connstr'] || NO_VALUE
+        if should_update_settings_connstr == NO_VALUE
+            puts "Flag for Setttings #{CONNECTIONSTRING} Update not set."
         else
-            transform_appsettings('connectionString', settings_connstr)
+            transform_appsettings(CONNECTIONSTRING, settings_connstr)
         end
 
-        puts 'updating unit test connection string...'
-        unitest_connstr = ENV['unitestconnectionString'] || NO
-        if unitest_connstr == NO
-            puts 'No unit test connection string found.'
+        puts "updating unit test #{CONNECTIONSTRING}..."
+        unitest_connstr = ENV["unitest#{CONNECTIONSTRING}"] || NO_VALUE
+        if unitest_connstr == NO_VALUE
+            puts "No unit test #{CONNECTIONSTRING} found."
         else
-            transform_appsettings('unitestconnectionString', unitest_connstr)
+            transform_appsettings("unitest#{CONNECTIONSTRING}", unitest_connstr)
         end
 
         puts "updating #{APPID}..."
-        appId = ENV[APPID] || NO
-        if appId == NO
+        appId = ENV[APPID] || NO_VALUE
+        if appId == NO_VALUE
             puts "No #{APPID} found."
         else
             transform_appsettings(APPID, appId)
         end
 
         @service_name = ENV['ServiceName']
-        is_service = @service_name || NO
-        if is_service != NO
+        is_service = @service_name || NO_VALUE
+        if is_service != NO_VALUE
             puts "Transforming config for service: #{@service_name}" 
             
             puts 'Obtaining cloud configuration templates...'
@@ -312,9 +310,6 @@ class Transform
             cscfgTemplate = get_value('ServiceConfigurationTemplate')
             File.write('ServiceConfiguration.cscfg', cscfgTemplate)
 
-            @config_files.concat(Dir.glob('**/RuntimeWeb/*Web.dll.config'))
-            @config_files.concat(Dir.glob('**/RuntimeService/*.exe.config'))
-
             puts 'Transforming csdef...'
             transform_csdef
 

metadata

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