azdeploy 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be51d4ad7c2ac549479d84e949106a09a9869f1
-  data.tar.gz: 05f513a4f62f30601fb170bbb1da31a99c69b83c
+  metadata.gz: b8e16b3c1bc5ed7c3cfc80754240cb1b103e84fe
+  data.tar.gz: 5b155e7da4b288d32fb718e05cda47b45fc1aa1c
 SHA512:
-  metadata.gz: 59b43e29fbbd278f85567e51d58fef7a1d9f7d2d29217d577eb3ee1f9b33dd7b57e5340f9a385be01c64ff4e36678002c53a3c093b5eb9c71aad40c7e2283f11
-  data.tar.gz: 90733f5f75711d7a7de41f40f99e9d72ee0f5af60f605681dcf200fb18c660fb58be793ec3f4efadaab1ee36152d52f59cfc5d21dcaa89b8f6fb3368c36973d1
+  metadata.gz: 0e59d0597681743a899c8827aae9c6a65b2e34d1f14835b443449c91f5d9fde241349ac4f8288ac19392680636915bffd044a70f19d3348d236f4b1a95d814d3
+  data.tar.gz: 4151d85bb31c515ae1a11be5a50ab553509392144615a21a53050560a1e122069c88e10ad19f2ee429e18939328e0d13aee6aeca74cbefe802c04e63bee3670a

data/azdeploy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.17'
-  s.date        = '2015-05-18'
+  s.version     = '1.0.18'
+  s.date        = '2015-08-04'
   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/build.rb

@@ -1,28 +1,28 @@
 $versionMap = {}
 
 def copy_output_files(fromDir, filePattern, outDir)
-	FileUtils.mkdir_p outDir unless exists?(outDir)
-	Dir.glob(File.join(fromDir, filePattern)){|file|
-		copy(file, outDir) if File.file?(file)
-	}
+    FileUtils.mkdir_p outDir unless exists?(outDir)
+    Dir.glob(File.join(fromDir, filePattern)){|file|
+        copy(file, outDir) if File.file?(file)
+    }
 end
 
 def project_outputs(props)
-	props[:projects].map{ |p| "src/#{p}/bin/#{BUILD_CONFIG}/#{p}.dll" }.
-		concat( props[:projects].map{ |p| "src/#{p}/bin/#{BUILD_CONFIG}/#{p}.exe" } ).
-		find_all{ |path| exists?(path) }
+    props[:projects].map{ |p| "src/#{p}/bin/#{BUILD_CONFIG}/#{p}.dll" }.
+        concat( props[:projects].map{ |p| "src/#{p}/bin/#{BUILD_CONFIG}/#{p}.exe" } ).
+        find_all{ |path| exists?(path) }
 end
 
 def get_commit_hash_and_date
-	begin
-		commit = `git log -1 --pretty=format:%H`
-		git_date = `git log -1 --date=iso --pretty=format:%ad`
-		commit_date = DateTime.parse( git_date ).strftime("%Y-%m-%d %H%M%S")
-	rescue
-		commit = "git unavailable"
-	end
-
-	[commit, commit_date]
+    begin
+        commit = `git log -1 --pretty=format:%H`
+        git_date = `git log -1 --date=iso --pretty=format:%ad`
+        commit_date = DateTime.parse( git_date ).strftime("%Y-%m-%d %H%M%S")
+    rescue
+        commit = "git unavailable"
+    end
+
+    [commit, commit_date]
 end
 
 def add_files stage, what_dlls, nuspec, folder='lib'
@@ -48,14 +48,14 @@ def commit_data
 end
 
 def waitfor(&block)
-	checks = 0
+    checks = 0
 
-	until block.call || checks >10
-		sleep 0.5
-		checks += 1
-	end
+    until block.call || checks >10
+        sleep 0.5
+        checks += 1
+    end
 
-	raise 'Waitfor timeout expired. Make sure that you aren\'t running something from the build output folders, or that you have browsed to it through Explorer.' if checks > 10
+    raise 'Waitfor timeout expired. Make sure that you aren\'t running something from the build output folders, or that you have browsed to it through Explorer.' if checks > 10
 end
 
 def cleantask(props)
@@ -78,6 +78,11 @@ def cleantask(props)
   end
 end
 
+def restore_nuget(nuget_exe)
+    sh 'powershell', '-Command', "& { Invoke-RestMethod https://www.nuget.org/nuget.exe -OutFile '#{nuget_exe}' }"
+    sh nuget_exe, 'restore', "src/#{PRODUCT}.sln"
+end
+
 def restore_project_pkgs(proj)
   msbuild :nuget_restore do |msb|
     msb.use :net4
@@ -88,8 +93,8 @@ end
 
 def clean_build(msb, solution)
   msb.properties :Configuration => 'Release',
-  	:Platform => 'Any CPU',
-  	:VisualStudioVersion => '12.0'
+    :Platform => 'Any CPU',
+    :VisualStudioVersion => '12.0'
   msb.use :net4
   msb.solution = solution
 end

data/lib/transform.rb

@@ -5,7 +5,12 @@ class Transform
     attr_accessor :table
     attr_accessor :settings
     attr_accessor :config_files
-
+    
+    NO = 'no'
+    ROWKEY = 'RowKey'
+    SETTING = 'setting'
+    VALUE = 'value'
+    
     def get(key)
         begin
             result = @svc.get_entity(@table, @env, key)
@@ -34,8 +39,8 @@ class Transform
     def get_value(key)
         value = ''
         @settings.each { |i|
-            if i.properties['RowKey'] == key
-                value = i.properties['setting']
+            if i.properties[ROWKEY] == key
+                value = i.properties[SETTING]
                 break
             end
         }
@@ -43,23 +48,35 @@ class Transform
         value
     end
 
+    def transform_connstring(connstr)    
+        @config_files.each{|file|
+            doc = Nokogiri::XML(File.read(file))
+            puts "Processing file: #{file}"
+            node = doc.at_css "appSettings/add[@key='connectionString']"
+            if !node.nil?
+                node[VALUE] = connstr
+                File.write(file, doc.to_xml)
+            end
+        }
+    end
+    
     def transform_appsettings
         # 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}"
             @settings.each { |i|
-                key = i.properties['RowKey']
+                key = i.properties[ROWKEY]
                 node = doc.at_css "appSettings/add[@key='#{key}']"
                 if !node.nil?
-                    oldVal = node['value']
+                    oldVal = node[VALUE]
                     #puts "Old value: #{oldVal}"
-                    node['value'] = i.properties['setting']
-                    newVal = node['value']
+                    node[VALUE] = i.properties[SETTING]
+                    newVal = node[VALUE]
                     #puts "New value: #{newVal}"
+                    File.write(file, doc.to_xml)
                 end
-            }
-            File.write(file, doc.to_xml)
+            }            
         }
     end
 
@@ -68,13 +85,15 @@ class Transform
             doc = Nokogiri::XML(File.read(file))
             doc.xpath('//system.serviceModel').each do |node|
                 #puts node
-                if file.end_with?('app.config') || file.end_with?('App.config')
-                    node.replace(get_value('system.ServiceModel.Client')) if !node.nil?
-                elsif file.end_with?('Web.config')
-                    node.replace(get_value('system.ServiceModel.Service')) if !node.nil?
+                if !node.nil?
+                    if file.end_with?('app.config') || file.end_with?('App.config')
+                        node.replace(get_value('system.ServiceModel.Client'))
+                    elsif file.end_with?('Web.config')
+                        node.replace(get_value('system.ServiceModel.Service'))
+                    end
+                    File.write(file, doc.to_xml)
                 end
             end
-            File.write(file, doc.to_xml)
         } 
     end
 
@@ -193,23 +212,53 @@ class Transform
     end
     
     def transform
-
+    
+        # find all App.config and web.config files
+        @config_files = Dir.glob('**/app.config')
+        @config_files.concat(Dir.glob('**/appSettings.config'))
+        @config_files.concat(Dir.glob('**/web.config'))
+        
+        settings_account_name = ENV['SettingsAccount'] || NO
+        if (settings_account_name == NO)
+            puts "No settings storage account name found"
+            return false
+        end
+        settings_access_key = ENV['SettingsAccountKey'] || NO
+        if (settings_access_key == NO)
+            puts "No settings storage account key found"
+            return false
+        end
+        config_table = ENV['ConfigSettingsTable'] || NO
+        if (config_table == NO)
+            puts "No configuration table found"
+            return false
+        end
+        
+        puts 'updating settings connection string...'
+        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.'
+        else
+            transform_connstring(settings_connstr)
+        end
+        
         # environment invoked
-        @env = ENV['env'] || 'noenv'
-        if @env == 'noenv'
+        @env = ENV['env'] || NO
+        if @env == NO
             puts 'Environment name required to transform. No configuration changes will be done...'
             return false
         end
-
-        is_service = ENV['ServiceName'] || 'nosvc'
-        puts 'Target to transform is not a service...' if is_service == 'nosvc'
+    
+        is_service = ENV['ServiceName'] || NO
+        puts 'Target to transform is not a service...' if is_service == NO
 
         puts "Transforming config for environment: #{@env} ..."
 
         # azure table storage account where settings reside
-        Azure.config.storage_account_name = ENV['StorageAccount']
-        Azure.config.storage_access_key = ENV['StorageAccountKey']
-        @table = ENV['ConfigSettingsTable']
+        Azure.config.storage_account_name = settings_account_name
+        Azure.config.storage_access_key = settings_access_key
+        @table = config_table
 
         # table service
         @svc = Azure::TableService.new
@@ -217,11 +266,6 @@ class Transform
         # get all settings for environment
         @settings = get_all
 
-        # find all App.config and web.config files
-        @config_files = Dir.glob('**/app.config')
-        @config_files.concat(Dir.glob('**/appSettings.config'))
-        @config_files.concat(Dir.glob('**/web.config'))
-
         if is_service
 
             puts 'Obtaining cloud configuration templates...'
@@ -246,7 +290,7 @@ class Transform
             transform_servicemodelconfig
             
         end
-
+        
         puts 'Replacing app settings...'
         transform_appsettings
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies: []
 description: Azure Deployment Gem. Provides easy setup and deployment scripting support
   for .Net project builds