azdeploy 1.0.33 → 1.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ecdae0f8ea2256d9052a728e23a1be7485d1630
-  data.tar.gz: 21a71377457ac6a58a4cdb75d4fc12ffbc127add
+  metadata.gz: 1beff9f62ec0352e00e8bc9f0ad80643a4185a1a
+  data.tar.gz: a4f306fe91651c07c602b04f54a32bf06bd0a888
 SHA512:
-  metadata.gz: f49f2270b4705d7f0e6283b1741f0b31fbb08cf7b85ad54cd494216c151e220125d81858157c387559511213f2f13c88c71ae8eed06939039376184cf1b27c68
-  data.tar.gz: 943d2e7bd697a4e59c17ff6c75feb2d762d8f1ee9760d853cc0fb47a3f7fa7f700299568e6add869d1c9864e815c6ac456f84cda048c9e1a6116140c746b830b
+  metadata.gz: ab63394183836b8b8b33f13153e28653b10fb8837f5fa7e86532a4c169540eb46018f15f213edbe2e2fee0aa7342d80597b7193a6a8d0b3c9a589c2910777520
+  data.tar.gz: 0549199f30a9f99a9f76a738cdd4e4937a1ba70f3a8d81acdb19b13e7e0857748c8dacf7574aea788f2092538fa4f5a95500c8d214039a2cc93a2e395f387026

data/azdeploy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.33'
-  s.date        = '2015-12-21'
+  s.version     = '1.0.34'
+  s.date        = '2015-12-23'
   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

@@ -22,3 +22,4 @@ include FileTest
 require 'albacore'
 require 'semver'
 require 'net/http'
+require 'rake'

data/lib/build.rb

@@ -109,19 +109,19 @@ def versioning project=nil, file=nil
     # 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_COUNTER'] || ver.patch).to_i
-
     # 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
-    ENV["#{project}_FORMAL_VERSION"] = "#{ SemVer.new(ver.major, ver.minor, revision).format '%M.%m.%p'}"
+    sem =  SemVer.new(ver.major, ver.minor,  ver.patch).format '%M.%m.%p'
+    build_counter = (ENV['BUILD_COUNTER'] || '0').to_i
+    ENV["#{project}_FORMAL_VERSION"] = "#{sem}.#{build_counter}"
   else
     ver = SemVer.find
-    revision = (ENV['BUILD_COUNTER'] || ver.patch).to_i
-    var = SemVer.new(ver.major, ver.minor, revision, ver.special)
 
     commitData = commit_data()
+    
+    build_counter = (ENV['BUILD_COUNTER'] || '0').to_i
 
     # extensible number w/ git hash
     ENV['BUILD_VERSION'] = $versionMap[:build_version] = ver.format('%M.%m.%p%s') + ".#{commitData[0]}"
@@ -129,11 +129,13 @@ def versioning project=nil, file=nil
     # 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_VERSION'] = $versionMap[:platform_version] = Time.new.strftime('%y.%-m.%-d') + ".#{build_counter}"
 
     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'}"
+    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
   end

data/test/Test.semver

@@ -0,0 +1,6 @@
+---
+:major: 1
+:minor: 1
+:patch: 1
+:special: develop
+:metadata: ''

data/test/test_versioning.rb

@@ -0,0 +1,47 @@
+require_relative '../lib/build'
+require 'semver'
+require 'test/unit'
+
+VERSIONING = 'test'
+
+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_equal ENV['TEST_FORMAL_VERSION'], '1.1.1.0'
+  end
+
+  def test_version_multiple_semver_with_build_counter
+    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_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_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_match ENV['PLATFORM_BUILD_VERSION'], Time.new.strftime('%y.%-m.%-d')
+    assert_equal ENV['FORMAL_VERSION'], '2.4.1.0'
+  end
+
+  def test_version_single_semver_with_build_counter
+    ENV['BUILD_COUNTER'] = '500'
+    versioning
+    assert_equal ENV['BUILD_VERSION'], '2.4.1-develop.c84767'
+    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_match ENV['PLATFORM_BUILD_VERSION'], Time.new.strftime('%y.%-m.%-d')
+    assert_equal ENV['FORMAL_VERSION'], '2.4.1.500'
+    ENV['BUILD_COUNTER'] = nil
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.34
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies: []
 description: Azure Deployment Gem. Provides easy setup and deployment scripting support
   for .Net project builds
@@ -17,7 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- test/Test.semver
 - test/test_azdeploy.rb
+- test/test_versioning.rb
 - lib/azdeploy.rb
 - lib/build.rb
 - lib/dependency.rb