azdeploy 1.0.34 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1beff9f62ec0352e00e8bc9f0ad80643a4185a1a
-  data.tar.gz: a4f306fe91651c07c602b04f54a32bf06bd0a888
+  metadata.gz: 378e7e404c9f2c5a67fd250789ac6df3ef308571
+  data.tar.gz: 6bbf09de06cc89a0cfaf3502ff6f37b3bd819182
 SHA512:
-  metadata.gz: ab63394183836b8b8b33f13153e28653b10fb8837f5fa7e86532a4c169540eb46018f15f213edbe2e2fee0aa7342d80597b7193a6a8d0b3c9a589c2910777520
-  data.tar.gz: 0549199f30a9f99a9f76a738cdd4e4937a1ba70f3a8d81acdb19b13e7e0857748c8dacf7574aea788f2092538fa4f5a95500c8d214039a2cc93a2e395f387026
+  metadata.gz: 3cfbeac330de7f8a33023562ff3a3865f80e24b15286c443fb2bf3d88fd2852585287f569b2d685c4fc9303ef52123bf51c2fe73b07663f96e619a60fe92cb99
+  data.tar.gz: 6d0ea7140fd9dc78ecbcf15d594aba5e70fcf141ff4afc0dc2040727478e0135c14b0d59a284372001cdf7d4110b8707db2116f9b9baa504ed58788ac186c220

data/azdeploy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.34'
-  s.date        = '2015-12-23'
+  s.version     = '1.0.35'
+  s.date        = '2016-01-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'
   s.authors     = ['Suresh Batta']

data/lib/build.rb

@@ -1,13 +1,14 @@
 $versionMap = {}
+VERSIONING = 'versioning'
 
-def copy_output_files(fromDir, filePattern, outDir)
+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)
   }
 end
 
-def project_outputs(props)
+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) }
@@ -47,7 +48,7 @@ def commit_data
   [commit, commit_date]
 end
 
-def waitfor(&block)
+def waitfor &block
   checks = 0
 
   until block.call || checks >10
@@ -58,7 +59,7 @@ def waitfor(&block)
   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)
+def cleantask props
 
   if props.has_key?(:output) && File.directory?(props[:output])
     FileUtils.rm_rf props[:output]
@@ -78,12 +79,12 @@ def cleantask(props)
   end
 end
 
-def restore_nuget(nuget_exe)
+def restore_nuget nuget_exe
   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)
+def restore_project_pkgs proj
   msbuild :nuget_restore do |msb|
     msb.use :net4
     msb.targets :RestorePackages
@@ -91,7 +92,7 @@ def restore_project_pkgs(proj)
   end
 end
 
-def clean_build(msb, solution)
+def clean_build msb, solution
   msb.properties :Configuration => 'Release',
     :Platform => 'Any CPU',
     :VisualStudioVersion => '12.0'
@@ -100,7 +101,7 @@ def clean_build(msb, solution)
 end
 
 def versioning project=nil, file=nil
-  if (!project.nil? && !file.nil?)
+  if !project.nil? && !file.nil?
     v = SemVer.new
     path = File.join VERSIONING, file
     v.load path
@@ -110,7 +111,7 @@ def versioning project=nil, file=nil
     ENV["#{project}_NUGET_VERSION"] = ver.format('%M.%m.%p%s')
 
     # extensible number w/ git hash
-    ENV["#{project}_BUILD_VERSION"] =  ver.format('%M.%m.%p%s') + ".#{commitData[0]}"    
+    ENV["#{project}_BUILD_VERSION"] =  ver.format('%M.%m.%p%s') + ".#{commitData[0]}"
 
     # purely M.m.p format
     sem =  SemVer.new(ver.major, ver.minor,  ver.patch).format '%M.%m.%p'
@@ -120,7 +121,7 @@ def versioning project=nil, file=nil
     ver = SemVer.find
 
     commitData = commit_data()
-    
+
     build_counter = (ENV['BUILD_COUNTER'] || '0').to_i
 
     # extensible number w/ git hash
@@ -134,7 +135,7 @@ def versioning project=nil, file=nil
     ENV['PLATFORM_BUILD_VERSION'] = $versionMap[:platform_build_version] = Time.new.strftime('%y.%-m.%-d') + ".#{commitData[0]}"
 
     sem =  SemVer.new(ver.major, ver.minor,  ver.patch).format '%M.%m.%p'
-    
+
     ENV['FORMAL_VERSION'] = $versionMap[:formal_version] = "#{sem}.#{build_counter}"
 
     teamcity_build_number
@@ -147,15 +148,15 @@ def teamcity_build_number
   puts "##teamcity[buildNumber '#{platform_version}']"
 end
 
-def set_framework_version(asm)
+def set_framework_version asm
   set_version asm, $versionMap[:formal_version], $versionMap[:formal_version], $versionMap[:build_version], 'Framework'
 end
 
-def set_solution_version(asm)
+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, output_file_src='src')
+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
@@ -170,11 +171,11 @@ def set_version(asm, version, file_version, assembly_version, output_file, outpu
 end
 
 # checks nuget dependency
-def check_package_version_dependency(package_uri, package, version='IsLatestVersion')
+def check_package_version_dependency package_uri, package, version='IsLatestVersion'
   # retrieve package version info
   response = Net::HTTP.get_response(URI.parse(package_uri.sub('pkg', package))) # get_response takes a URI object
   package_info = response.body
-  xml = Nokogiri::XML(package_info)
+  xml = Nokogiri::XML package_info
   xml.xpath("//m:properties/d:#{version}").each { |e|
     if e.text.to_s == 'true'
       version = e.parent.xpath('d:Version').text
@@ -182,13 +183,13 @@ def check_package_version_dependency(package_uri, package, version='IsLatestVers
   }
 
   # grab all packages.config files
-  config_files = Dir.glob('**/packages.config')
+  config_files = Dir.glob '**/packages.config'
 
   # for each file match version. Return false is check fails
   config_files.each{ |file|
-    doc = Nokogiri::XML(File.read(file))
+    doc = Nokogiri::XML(File.read file)
     node = doc.at_xpath("//*[@id=\"#{package}\"]")
-    if (!node.nil?)
+    if !node.nil?
       config_version = node.attr('version')
       puts "Package: #{package} Latest Version: #{version} File: #{file} File package version: #{config_version}"
       return false unless config_version.to_s == version
@@ -198,17 +199,17 @@ def check_package_version_dependency(package_uri, package, version='IsLatestVers
   return true
 end
 
-def copy_runtime_artifacts(package)
+def copy_runtime_artifacts package
 
   # grab all packages.config files
-  config_files = Dir.glob('**/packages.config')
+  config_files = Dir.glob '**/packages.config'
   config_version = ''
 
   # find package version
   config_files.each{ |file|
-    doc = Nokogiri::XML(File.read(file))
+    doc = Nokogiri::XML(File.read file)
     node = doc.at_xpath("//*[@id=\"#{package}\"]")
-    if (!node.nil?)
+    if !node.nil?
       config_version = node.attr('version').to_s
       break
     end
@@ -225,7 +226,7 @@ end
 
 # Gathers all rake files and runs the task list
 def package rake_files_path, task_list
-  if(task_list.nil?)
+  if task_list.nil?
     puts "No task to execute"
   else
     Dir.glob("#{rake_files_path}/*.rb").each {

data/test/test_azdeploy.rb

@@ -1,4 +1,2 @@
 require 'minitest/autorun'
 require 'azdeploy'
-
-

data/test/test_versioning.rb

@@ -9,7 +9,7 @@ class TestVersioning < Test::Unit::TestCase
   def test_version_multiple_semver_no_build_counter
     versioning 'TEST', 'Test.semver'
     assert_equal ENV['TEST_NUGET_VERSION'] , '1.1.1-develop'
-    assert_equal ENV['TEST_BUILD_VERSION'] , '1.1.1-develop.c84767'
+    assert ENV['TEST_BUILD_VERSION'].start_with?('1.1.1-develop'), 'Matched'
     assert_equal ENV['TEST_FORMAL_VERSION'], '1.1.1.0'
   end
 
@@ -17,17 +17,17 @@ class TestVersioning < Test::Unit::TestCase
     ENV['BUILD_COUNTER'] = '500'
     versioning 'TEST', 'Test.semver'
     assert_equal ENV['TEST_NUGET_VERSION'] , '1.1.1-develop'
-    assert_equal ENV['TEST_BUILD_VERSION'] , '1.1.1-develop.c84767'
+    assert ENV['TEST_BUILD_VERSION'] .start_with?('1.1.1-develop'), 'Matched'
     assert_equal ENV['TEST_FORMAL_VERSION'], '1.1.1.500'
     ENV['BUILD_COUNTER'] = nil
   end
 
   def test_version_single_semver_no_build_counter
     versioning
-    assert_equal ENV['BUILD_VERSION'], '2.4.1-develop.c84767'
+    assert ENV['BUILD_VERSION'].start_with?('2.4.1-develop')
     assert_equal ENV['NUGET_VERSION'], '2.4.1-develop'
     #assert_match ENV['PLATFORM_VERSION'], Time.new.strftime('%y.%-m.%-d')
-    assert_equal ENV['PLATFORM_VERSION'], '15.12.23.0'
+    assert ENV['PLATFORM_VERSION'].start_with?('15.12.'), 'Matched'
     #assert_match ENV['PLATFORM_BUILD_VERSION'], Time.new.strftime('%y.%-m.%-d')
     assert_equal ENV['FORMAL_VERSION'], '2.4.1.0'
   end
@@ -35,10 +35,10 @@ class TestVersioning < Test::Unit::TestCase
   def test_version_single_semver_with_build_counter
     ENV['BUILD_COUNTER'] = '500'
     versioning
-    assert_equal ENV['BUILD_VERSION'], '2.4.1-develop.c84767'
+    assert ENV['BUILD_VERSION'].start_with?('2.4.1-develop')
     assert_equal ENV['NUGET_VERSION'], '2.4.1-develop'
     #assert_match ENV['PLATFORM_VERSION'], Time.new.strftime('%y.%-m.%-d')
-    assert_match ENV['PLATFORM_VERSION'], '15.12.23.500'
+    assert ENV['PLATFORM_VERSION'].start_with?('15.12.'), 'Matched'
     #assert_match ENV['PLATFORM_BUILD_VERSION'], Time.new.strftime('%y.%-m.%-d')
     assert_equal ENV['FORMAL_VERSION'], '2.4.1.500'
     ENV['BUILD_COUNTER'] = nil

metadata

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