azdeploy 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 577e6b70f95834a7d24aa816fa7ed7141e7a0806
-  data.tar.gz: 506256fdb43fd91ed937053d497785f4411d8ac8
+  metadata.gz: 6cfe21fedf88697a8d17753b2367be79579268ee
+  data.tar.gz: f0f40c6f91d5c357dd11882fe9deb0cc51a65644
 SHA512:
-  metadata.gz: c8017ab9b4213b17ff6079edaf61a064f49845e4a3fbb08a47439915060bc8ad587e850123d049429c903d035766928272912e93e3fb06abb2060c61b2c5e6a7
-  data.tar.gz: c149f2975f1b0ac28b4312bc819ab98b9f9b0bb88c3d5481b816327f5d806b722e740bc0bc6d65301fa3b90ca4aa2c07737be62c7355b8f84afa684c52a5d340
+  metadata.gz: 082eb1b7b1dea05ffa673c76fa0598fd32d2dbf8ffce50907a2e3dd00549dc26192349d515f7073ddbb4ae8bb21f907141fe33b7fb66999c0da20f51a5d26806
+  data.tar.gz: 8a77396d729b53ce2bacd24b0aa083afad51b48d2b6cabaf8a9f692de8230f6057d3794df0f965d45133c1acb5f6b95935612fb5b963f2299383521b2409b540

data/azdeploy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.29'
-  s.date        = '2015-09-29'
+  s.version     = '1.0.30'
+  s.date        = '2015-10-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/azdeploy.rb

@@ -1,6 +1,7 @@
 require_relative 'install.rb'
 require_relative 'transform.rb'
 require_relative 'build.rb'
+require_relative 'dependency.rb'
 
 # installation
 installers = [

data/lib/build.rb

@@ -99,26 +99,50 @@ def clean_build(msb, solution)
   msb.solution = solution
 end
 
-def versioning
-  ver = SemVer.find
-  revision = (ENV['BUILD_NUMBER'] || ver.patch).to_i
-  var = SemVer.new(ver.major, ver.minor, revision, ver.special)
-
-  commitData = commit_data()
-
-  # extensible number w/ git hash
-  ENV['BUILD_VERSION'] = $versionMap[:build_version] = ver.format('%M.%m.%p%s') + ".#{commitData[0]}"
-  
-  # nuget (not full semver 2.0.0-rc.1 support) see http://nuget.codeplex.com/workitem/1796
-  ENV['NUGET_VERSION'] = $versionMap[:nuget_version] = ver.format('%M.%m.%p%s')
-
-  ENV['PLATFORM_VERSION'] = $versionMap[:platform_version] = Time.new.strftime('%y.%-m.%-d') + ".#{(ENV['BUILD_NUMBER'] || '0')}"
+def versioning project=nil, file=nil
+    if (!project.nil? && !file.nil?)      
+      v = SemVer.new
+      path = File.join VERSIONING, file
+      v.load path
+      ver = v      
+      commitData = commit_data()      
+      # nuget (not full semver 2.0.0-rc.1 support) see http://nuget.codeplex.com/workitem/1796
+      ENV["#{project}_NUGET_VERSION"] = ver.format('%M.%m.%p%s')
+
+      revision = (ENV['BUILD_NUMBER'] || ver.patch).to_i
+
+      # extensible number w/ git hash
+      ENV["#{project}_BUILD_VERSION"] =  ver.format('%M.%m.%p%s') + ".#{commitData[0]}"
+
+      # purely M.m.p format
+      ENV["#{project}_FORMAL_VERSION"] = "#{ SemVer.new(ver.major, ver.minor, revision).format '%M.%m.%p'}"
+    else
+      ver = SemVer.find
+      revision = (ENV['BUILD_NUMBER'] || ver.patch).to_i
+      var = SemVer.new(ver.major, ver.minor, revision, ver.special)
+
+      commitData = commit_data()
+
+      # extensible number w/ git hash
+      ENV['BUILD_VERSION'] = $versionMap[:build_version] = ver.format('%M.%m.%p%s') + ".#{commitData[0]}"
+      
+      # nuget (not full semver 2.0.0-rc.1 support) see http://nuget.codeplex.com/workitem/1796
+      ENV['NUGET_VERSION'] = $versionMap[:nuget_version] = ver.format('%M.%m.%p%s')
+
+      ENV['PLATFORM_VERSION'] = $versionMap[:platform_version] = Time.new.strftime('%y.%-m.%-d') + ".#{(ENV['BUILD_NUMBER'] || '0')}"
+
+      ENV['PLATFORM_BUILD_VERSION'] = $versionMap[:platform_build_version] = Time.new.strftime('%y.%-m.%-d') + ".#{commitData[0]}"
+            
+      ENV['FORMAL_VERSION'] = $versionMap[:formal_version] = "#{ SemVer.new(ver.major, ver.minor, revision).format '%M.%m.%p'}"
+      
+      teamcity_build_number
+    end
+end
 
-  ENV['PLATFORM_BUILD_VERSION'] = $versionMap[:platform_build_version] = Time.new.strftime('%y.%-m.%-d') + ".#{commitData[0]}"
-  
-  # purely M.m.p format
-  ENV['FORMAL_VERSION'] = $versionMap[:formal_version] = "#{ SemVer.new(ver.major, ver.minor, revision).format '%M.%m.%p'}"
-  puts "##teamcity[buildNumber '#{$versionMap[:platform_version]}']" # tell teamcity our decision
+desc 'Tell teamcity our decision to set the build.number environment variable'
+def teamcity_build_number
+   platform_version  = Time.new.strftime('%y.%-m.%-d') + ".#{(ENV['BUILD_NUMBER'] || '0')}"
+   puts "##teamcity[buildNumber '#{platform_version}']" 
 end
 
 def set_framework_version(asm)
@@ -129,7 +153,7 @@ def set_solution_version(asm)
   set_version asm, $versionMap[:platform_version], $versionMap[:platform_version], $versionMap[:platform_build_version], 'Solution'
 end
 
-def set_version(asm, version, file_version, assembly_version, output_file)
+def set_version(asm, version, file_version, assembly_version, output_file, output_file_src='src')
   # Assembly file config
   asm.product_name = PRODUCT
   asm.description = PRODUCT_DESCRIPTION
@@ -139,7 +163,7 @@ def set_version(asm, version, file_version, assembly_version, output_file)
   :ComVisibleAttribute => false,
   :CLSCompliantAttribute => true
   asm.copyright = COPYRIGHT
-  asm.output_file = "src/#{output_file}Version.cs"
+  asm.output_file = "#{output_file_src}/#{output_file}.Version.cs"
   asm.namespaces 'System', 'System.Reflection', 'System.Runtime.InteropServices'
 end
 
@@ -195,4 +219,18 @@ def copy_runtime_artifacts(package)
   puts source
   puts dest
   copy_output_files source, "*.*", dest
+end
+
+desc 'Gathers all rake files and runs the task list'
+def package rake_files_path, task_list
+    if(task_list.nil?)
+        puts "No task to execute"
+    else
+        Dir.glob("#{rake_files_path}/*.rb").each { 
+            |r| load r
+        }
+        task_list.each { |eachtask|
+            Rake::Task["#{eachtask}"].invoke
+        }
+    end    
 end

data/lib/dependency.rb

@@ -0,0 +1,43 @@
+def auto_add_dependencies(project, nuspec)
+     @Dependencies = Array.new 
+
+     each_package_dependency(project) do |package|
+        @Dependencies << package
+     end
+     
+    @Dependencies.each do |dep|
+        nuspec.dependency dep.Name, dep.Version
+    end
+end
+
+
+def each_package_dependency(project)
+  packages_config = File.join File.dirname(project), 'packages.config'
+  return [] unless File.exists? packages_config
+
+  each_package packages_config do |id, version|
+    yield Dependency.new id, version
+  end
+end
+
+
+def each_package(packages_config)
+  xml = File.read packages_config
+  doc = REXML::Document.new xml
+  doc.elements.each 'packages/package' do |package|
+    if block_given?
+        yield package.attributes['id'], package.attributes['version']
+    else
+        "no package block"
+    end
+  end
+end
+
+class Dependency
+    attr_accessor :Name, :Version
+    
+    def initialize(name, version)
+        @Name = name
+        @Version = version
+    end
+end

data/lib/transform.rb

@@ -254,7 +254,33 @@ class Transform
             File.write(file, doc.to_xml)
         }
     end
-
+    
+    # log level and azure table appender parameters are transformed
+    def transform_log4net
+        config_files = Dir.glob('**/log4net.config')
+        config_files.each{ |file|
+            doc = Nokogiri::XML(File.read(file))
+            
+            # azure table name is service name
+            node = doc.at_css 'log4net/appender[@name=AzureTableAppender]/param[@name=TableName]'
+            node['value'] = @service_name if (!node.nil?)
+            
+            node = doc.at_css 'log4net/appender[@name=AzureTableAppender]/param[@name=ConnectionString]'
+            log_connstr = ENV["log#{CONNECTIONSTRING}"] || NO_VALUE
+            if log_connstr == NO_VALUE
+                puts "No logging #{CONNECTIONSTRING} found."
+            else
+                node['value'] = log_connstr if (!node.nil?)
+            end
+            
+            # log level
+            node = doc.at_css 'log4net/root/level'
+            node['value'] = ENV['loglevel'] if (!node.nil?)
+            
+            File.write(file, doc.to_xml)
+        }
+    end
+    
     def remove_paths_from_list(paths_to_exclude, source_list)
         paths_to_exclude.each { |path|
             source_list.delete_if { |file| 
@@ -393,7 +419,10 @@ class Transform
         
         puts 'Transforming Application Insights...'
         transform_appinsights(paths_to_exclude)
-        
+
+        puts 'Transforming log4net config...'
+        transform_log4net
+
         return true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies: []
 description: Azure Deployment Gem. Provides easy setup and deployment scripting support
   for .Net project builds
@@ -20,6 +20,7 @@ files:
 - test/test_azdeploy.rb
 - lib/azdeploy.rb
 - lib/build.rb
+- lib/dependency.rb
 - lib/install.rb
 - lib/transform.rb
 - lib/update.rb