a2zdeploy 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edab4c51044637b609ff7db1584caa6b6b1bc4f2
-  data.tar.gz: ea01503bc8ce736a0a80d9f5a92877685dfef052
+  metadata.gz: 7f35c9a4c04ea9b55dcd935dd480aaf891e2609e
+  data.tar.gz: 33bb2061a5763d24eaa2bf8f6aa7991245316a26
 SHA512:
-  metadata.gz: 03baf61d9457ad7647d5db1db0f4bb75fa08844d8b9cab264a6f3f5070616f8a51f904a8dae7ee82d4a67e3d9bef740f3f27320cc9311f87935ce884aa608617
-  data.tar.gz: aacb8a92c90f4df953da316a291fe1c8e61da388a574ee7053fb6b6e4f88ff337bec93b3386b2733650cbf970e0c85f7817aafca3682cb408191b7a71c7f313e
+  metadata.gz: a9bbf20ec080cee4eaed2f27f94e5899c9daeef58f53af215dfb263648c98a4e4c632e89dcd939765e81678ce193b1941cf5569817528f589548e0e8af07b215
+  data.tar.gz: 08f54fdeef25bdc998ca04abdf4c879e2284a0c337421bf0569acd661f12ddbd01d43e9b759dd5a8b0363955c7149173574a2f2b0f8054d757ccee50eae3e804

data/a2zdeploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'a2zdeploy'
-  s.version     = '1.0.8'
+  s.version     = '1.0.9'
   s.date        = '2016-02-08'
   s.summary     = 'Given a project dependency chain, updates versions, builds, tests, manages service and cloud settings as well as build environment configuration'
   s.description = 'Automated Upgrades Gem. Provides version upgrades, build and deployment configuration management'

data/lib/input_validator.rb

@@ -70,6 +70,7 @@ class InputValidator
     yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'status', node_name
 
     yield @simple_validator.method_exists project.metadata, 'build_configuration_id', node_name
+    yield @simple_validator.method_exists project.metadata, 'build_wait_time_in_secs', node_name
 
     node_name = 'project.metadata.env_vars'
     yield @simple_validator.method_exists project.metadata.env_vars, 'env', node_name

data/lib/teamcity_api.rb

@@ -21,7 +21,7 @@ module TeamCityApi
 
   #Build trigger API
   def TeamCityApi.trigger_build buildConfigurationId, username, password
-
+    puts "Triggering build configuration: #{buildConfigurationId} for #{username}..."
     configContent = create_build_trigger_config buildConfigurationId
     uri = URI.parse 'http://teamcity.relayhealth.com'
     http = Net::HTTP.new uri.host, uri.port

data/lib/upgrade.rb

@@ -127,7 +127,7 @@ class UpgradePackages
       return false if !update_branch
       # kick off teamcity build
       puts GlobalConstants::UPGRADE_PROGRESS + 'Teamcity Project being triggered...'
-      TeamCityApi.trigger_build @config_map.build_configuration_id, ENV['tc_un'], ENV['tc_pwd']
+      TeamCityApi.trigger_build @config_map.metadata.build_configuration_id, ENV['tc_un'], ENV['tc_pwd']
     end
 
     true
@@ -159,7 +159,7 @@ class UpgradePackages
       puts GlobalConstants::UPGRADE_PROGRESS + 'Local version changes are being committed'
       return false if !GithubApi.CommitChanges('Versions updated')
     end
-
+    
     # rebase and push the branch
     puts GlobalConstants::UPGRADE_PROGRESS + 'Rebasing and pushing update branch...'
     GithubApi.CheckoutLocal @branch

data/lib/upgradeall.rb

@@ -10,7 +10,6 @@ class UpgradeAll
   VERSION_MAP_FILE = 'versionmap.json'
   # todo: remove the up one level path
   MANIFEST_FILE = 'manifest.json'
-  MAX_CHECKS = 12
 
   # repo_url is where the last known version map and manifest are checked-in
   def initialize repo_url, branch, manifest_path = MANIFEST_FILE
@@ -106,7 +105,7 @@ class UpgradeAll
         Dir.chdir GlobalConstants::PARENTDIR
 
         # if publishing nuget package, wait for a minute for publish to finish
-        waitfor if node.should_publish_nuget
+        waitfor node.metadata.build_wait_time_in_secs if node.should_publish_nuget
       else
         # either cycle was unterrupted, a step in upgrade failed or full cycle successfully completed
         # save the version map and manifest
@@ -195,16 +194,16 @@ class UpgradeAll
     "One or more validation errors have occurred: #{validation_errors.join(' ')}"
   end
 
-  def waitfor
+  def waitfor build_wait_time_in_secs
     checks = 0
 
-    until checks > MAX_CHECKS
+    until checks > build_wait_time_in_secs
       sleep 5
-      checks += 1
+      checks += 5
       puts GlobalConstants::UPGRADE_PROGRESS + 'Waiting for 5 seconds...'
     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 > MAX_CHECKS
+    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 > build_wait_time_in_secs
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a2zdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Suresh Batta