azdeploy 1.0.31 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 674516fefe82d0733e648702a2ec69fa968a7b8e
-  data.tar.gz: 30a2c43e9661a78c24ab4162ce1594ed05e50d4e
+  metadata.gz: 7a8147ddcc47320a4d4f85e5af9b0665805afa14
+  data.tar.gz: 4ddce1a21bb9acb5b17607f7f1f740a1f3cf00ae
 SHA512:
-  metadata.gz: e78e962ec74558b18003e56e1f10db172fc88b25e06f77214126d9765c698f02e3372142285f31bbf291ae836e7b669998ef00db75529fa6f993989c0367af4e
-  data.tar.gz: 1fc74904ea5c665d5925916554803ad89e4035685a4c486625f1081e07988d21be4a33b8296104de957f9e81589fc2210b3878037abb099bfd398193539c9a9b
+  metadata.gz: 2611a5fb86cdc4725627ced19aabaf091260830d575ced18bd4185c77e4e3619fd49740561e1f6006da73c793e8d7b4d624f3037b84c930870ea5c9641e97b59
+  data.tar.gz: ecc037759a214e79a45209fe33ef3076ce119fb2b8deb8a01b29aebf485b7bdfcbd6caca8e463c28cbc0a59fd1bed7e566725128d0b783dfe1b98b797a4200fa

data/azdeploy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.31'
-  s.date        = '2015-12-16'
+  s.version     = '1.0.32'
+  s.date        = '2015-12-17'
   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
+  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]
+  [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)
@@ -79,8 +79,8 @@ def cleantask(props)
 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"
+  sh 'powershell', '-Command', "& { Invoke-RestMethod https://www.nuget.org/nuget.exe -OutFile '#{Dir.pwd}/#{nuget_exe}' }"
+  sh "#{Dir.pwd}/#{nuget_exe}", 'restore', "src/#{PRODUCT}.sln"
 end
 
 def restore_project_pkgs(proj)
@@ -100,49 +100,49 @@ def clean_build(msb, solution)
 end
 
 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
+  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
 
 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}']" 
+  platform_version  = Time.new.strftime('%y.%-m.%-d') + ".#{(ENV['BUILD_NUMBER'] || '0')}"
+  puts "##teamcity[buildNumber '#{platform_version}']"
 end
 
 def set_framework_version(asm)
@@ -160,8 +160,8 @@ def set_version(asm, version, file_version, assembly_version, output_file, outpu
   asm.version = version
   asm.file_version = file_version
   asm.custom_attributes :AssemblyInformationalVersion => assembly_version,
-  :ComVisibleAttribute => false,
-  :CLSCompliantAttribute => true
+    :ComVisibleAttribute => false,
+    :CLSCompliantAttribute => true
   asm.copyright = COPYRIGHT
   asm.output_file = "#{output_file_src}/#{output_file}.Version.cs"
   asm.namespaces 'System', 'System.Reflection', 'System.Runtime.InteropServices'
@@ -212,7 +212,7 @@ def copy_runtime_artifacts(package)
     end
   }
   puts config_version
-  
+
   # copy artifacts
   source = "#{ENV['RuntimePath']}/#{config_version}"
   dest = File.join(File.expand_path('.'), 'RuntimeService')
@@ -223,14 +223,14 @@ 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
+  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

@@ -1,13 +1,13 @@
 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
+  @Dependencies = Array.new
+
+  each_package_dependency(project) do |package|
+    @Dependencies << package
+  end
+
+  @Dependencies.each do |dep|
+    nuspec.dependency dep.Name, dep.Version
+  end
 end
 
 
@@ -26,18 +26,18 @@ def each_package(packages_config)
   doc = REXML::Document.new xml
   doc.elements.each 'packages/package' do |package|
     if block_given?
-        yield package.attributes['id'], package.attributes['version']
+      yield package.attributes['id'], package.attributes['version']
     else
-        "no package block"
+      "no package block"
     end
   end
 end
 
 class Dependency
-    attr_accessor :Name, :Version
-    
-    def initialize(name, version)
-        @Name = name
-        @Version = version
-    end
-end
+  attr_accessor :Name, :Version
+
+  def initialize(name, version)
+    @Name = name
+    @Version = version
+  end
+end

data/lib/semantic_versioning.rb

@@ -2,6 +2,7 @@ class SemverVersioning
 
   # url template of file to check for version info with repo, branch and file path to replace
   URLTEMPLATE ||= "%s/raw/%s/%s"
+  SEMVER = 'semver'
 
   def open url
     Net::HTTP.get(URI.parse url)
@@ -38,15 +39,15 @@ class SemverVersioning
     version_remote = ''
     version_local = ''
 
-    semvers = get_file_list VERSIONING, 'semver'
-    if(semvers.empty?)
+    semvers = get_file_list VERSIONING, SEMVER
+    if semvers.empty?
       raise "************Error - no semver files found at #{VERSIONING}********"
     end
 
     semvers.each { |semver|
       v1 = get_repo_version semver
       v2 = get_current_version VERSIONING, semver.gsub("#{VERSIONING}/", '')
-      if (!same_versions(v1, v2))
+      if (!same_versions v1, v2)
         puts "#{semver} version changed"
         semver_file = semver
         version_remote = v1
@@ -119,31 +120,31 @@ class SemverVersioning
     remote_name = get_remote_name
     branch_name = get_branch_name
     url = URLTEMPLATE % [remote_name, branch_name, semver]
-    page_content = open(url)
-    repo_version = get_semver_version(page_content)
+    page_content = open url
+    repo_version = get_semver_version page_content
     repo_version
   end
 
   def get_current_version path, semver
     location = File.join path, semver
-    content = File.read(location)
-    current_version = get_semver_version(content)
+    content = File.read location
+    current_version = get_semver_version content
     current_version
   end
 
-  def get_semver_version(content)
+  def get_semver_version content
     s = content.split("\n")
     val = ''
     s.each{ |i|
-      if (i.start_with?(':'))
+      if i.start_with?(':')
         x = i.split(': ')[1].strip
-        x.gsub!("'", '')
-        if (x.length != 0)
+        x.gsub! "'", ''
+        if x.length != 0
           val = val + x.to_s + '.'
         end
       end
     }
-    val.chomp('.')
+    val.chomp '.'
   end
 
   def same_versions version1, version2
@@ -153,8 +154,8 @@ class SemverVersioning
   # Method to be used from the upgrade project, to update single or multiple semvers on team city
   def auto_update_semver project_name, semver_location, semver_file, semver_dimension
     Dir.chdir project_name if File.basename(Dir.pwd) != project_name
-    if(semver_file.nil? || semver_file.strip == '' || semver_file == '.semver')
-      increment_version '.semver', semver_dimension
+    if(semver_file.nil? || semver_file.strip == '' || semver_file == '.' + SEMVER)
+      increment_version '.' + SEMVER, semver_dimension
     else
       increment_version File.join(semver_location, semver_file), semver_dimension
       update_dependent_semvers project_name, semver_location, semver_file, semver_dimension
@@ -163,7 +164,7 @@ class SemverVersioning
 
   # Method invoked to update multiple semvers locally. This will not update single semver. That has to be done manually
   def auto_update_local_semver
-    if(!Dir.exist?(VERSIONING) || File.exist?('.semver'))
+    if(!Dir.exist?(VERSIONING) || File.exist?('.' + SEMVER))
       raise 'Error - local upgrade process only applies to projects with multiple semvers. If you have one semver at root level, please update it manually if needed. Do not invoke auto_update_local_semver task.'
     end
     updated_semver_with_version_state = fetch_updated_semver
@@ -186,10 +187,10 @@ class SemverVersioning
   def create_semver_project_map product, semver_location
     semver_project_map = Hash.new
 
-    rake_list = get_file_list semver_location, 'semver'
+    rake_list = get_file_list semver_location, SEMVER
     rake_list.each{ |rakefile|
       rake = rakefile.gsub "#{semver_location}/", ''
-      project_name = rake.gsub '.semver', ''
+      project_name = rake.gsub '.' + SEMVER, ''
       semver_project_map[rake] = "#{product}.#{project_name}.csproj"
     }
     semver_project_map

data/lib/transform.rb

@@ -275,7 +275,8 @@ class Transform
 
       # log level
       node = doc.at_css 'log4net/root/level'
-      node['value'] = ENV['loglevel'] if !node.nil?
+      loglevel = ENV['loglevel'] || NO_VALUE
+      node['value'] = ENV['loglevel'] if (!node.nil? && loglevel != NO_VALUE)
 
       File.write file, doc.to_xml
     }

metadata

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