a2zdeploy 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed53192adb1971f268124fc20fb11510ee31e06
-  data.tar.gz: b49b25d81f158ae3ad8420761aa5559fd6d2c2bf
+  metadata.gz: 71b4475b48254171a7f88017f9dd1a66631c77c2
+  data.tar.gz: 5c2a54aabb1f19b8fc3c1f8ac9b06b58b38a83e8
 SHA512:
-  metadata.gz: cc2e1fdf5f6d4681709a6c9b6c3d34b4e137708acd381b4317ba168609379c5ad41a1379a0604060644924d73491503258aafe29ef487c56bf804088712550a1
-  data.tar.gz: f83acdd75516f2c3c373b8c5bb26c8cd74bb51a8f2ffdb903c84bb2a55de864d87c97a4a081fe8af86c373796f85634aa7ef6964f4884d5fb5fb90223cfa3adb
+  metadata.gz: a1976a841d9bab7db8db8e0d686bf168bcdce832f42e7f8d3e5588188cd7985e80d02aaa44a62295c249e128af12be442ad51f10f5eab6895ce60756b8691bb5
+  data.tar.gz: d743465fd4489912e8448244b7182475fd369374c3de8007ee7d810f530d970550bcfb56d0e1d1690160341069aa821a37a65a768a8aa1e46e8f74cd7c3eb38d

data/a2zdeploy.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = 'a2zdeploy'
-  s.version     = '1.0.3'
-  s.date        = '2016-01-19'
+  s.version     = '1.0.4'
+  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'
   s.authors     = ['Suresh Batta']
   s.email       = 'subatta@hotmail.com'
-  s.files       = Dir['{test,lib,rakefile.rb}/**/*'] + ['a2zdeploy.gemspec', 'ReadMe.md']
+  s.files       = Dir['{lib}/**/*'] + ['a2zdeploy.gemspec', 'ReadMe.md']
   s.homepage    = 'http://rubygems.org/gems/a2zdeploy'
   s.license     = 'MIT'
 end

data/lib/a2zdeploy.rb

@@ -9,7 +9,9 @@ require_relative 'github_api'
 require_relative 'version_map'
 require_relative 'hash_extensions'
 require_relative 'input_validator'
+require_relative 'rollback'
 
+require 'rake'
 require 'addressable/uri'
 require 'azdeploy'
 require 'builder'

data/lib/dependency_tree.rb

@@ -44,9 +44,7 @@ class DependencyTree
     if @dependency_map[current].has_key? GlobalConstants::NEXT
       next_node = @dependency_map[current][GlobalConstants::NEXT]
       next_node = @dependency_map[next_node]
-      if !next_node.nil?
-        next_node = Hashit.new next_node
-      end
+      next_node = Hashit.new next_node if !next_node.nil?
     end
   end
 

data/lib/github_api.rb

@@ -6,6 +6,11 @@
 
 module GithubApi
 
+  def GithubApi.CreateNewBranch new_branch, branch
+    puts "Creating new branch #{new_branch} from #{branch}..."
+    `git branch #{new_branch} #{branch}`
+  end
+
   def GithubApi.CheckoutNewBranch branch
     puts "Checking out new branch #{branch}..."
     `git checkout -b #{branch}`
@@ -37,7 +42,49 @@ module GithubApi
     `git checkout #{branch}`
   end
 
+  # Reverts commits from commit_hashes, expected order is newest to oldest
+  def GithubApi.RevertLocal branch, commit_hashes
+    puts "Reverting commits on local branch: #{branch}..."
+    `git checkout #{branch}`
+    recent_hash = commit_hashes[0]
+    past_hash = commit_hashes[-1]
+    `git --no-edit revert #{past_hash}^..#{recent_hash}`
+  end
+
+  def GithubApi.TagLocal commit_hash, tag_name, message
+    puts "Tagging commit hash: #{commit_hash} with #{tag_name}..."
+    `git tag -a #{tag_name} #{commit_hash} -m #{message}`
+  end
+
+  def GithubApi.GetRecentCommitHash branch
+    git_log_raw = `git log -1 #{branch}`
+    return GithubApi.GetCommitHashesFromLog(git_log_raw).first
+  end
+
+  def GithubApi.ShowCommitInfoLocal commit_hash
+    `git show --name-only #{commit_hash}`
+  end
+
+  def GithubApi.ForcePushBranch remote, branch
+    # use url substituted with un/pwd
+    #remote_url = GithubApi.InsertCredsInRemote remote
+    puts "Force Pushing #{branch} to #{remote}..."
+    `git push #{remote} #{branch} -f`
+  end
+
+  def GithubApi.InsertCredsInRemote remote_name
+    url = `git config --get remote.#{remote_name}.url`
+    url = GithubApi.InsertCredsInUrl(url) if !url.include? '@'
+    url
+  end
+
+  def GithubApi.InsertCredsInUrl url
+    url = url.sub('http://', "http://#{ENV['un']}:#{ENV['pwd']}@")
+    url
+  end
+
   def GithubApi.PushBranch remote, branch
+    #remote_url = GithubApi.InsertCredsInRemote remote
     puts "Pushing #{branch} to #{remote}..."
     `git push #{remote} #{branch}`
   end
@@ -59,8 +106,22 @@ module GithubApi
     `git pull --rebase #{@repo_url} #{@branch}`
   end
 
+  def GithubApi.CommitAllLocalAndPush comment
+
+    `git add .`
+
+    status = `git commit -m "#{comment}"`
+    return false if status != GlobalConstants::EMPTY
+
+    #todo: ensure push defaults are set up
+    status = `git push`
+    return status != GlobalConstants::EMPTY
+
+  end
+
   def GithubApi.CommitChanges comment, git_status = ''
     if git_status != GlobalConstants::EMPTY
+      #gotcha: line breaks need to be in double-quotes
       val = git_status.split("\n")
       val.each { |x|
         value = x.split(' M ').last || x.split('?? ').last
@@ -77,8 +138,27 @@ module GithubApi
     return status != GlobalConstants::EMPTY
   end
 
+  # Returns commits in order of newest to oldest
+  def GithubApi.BranchCommitDiff base_branch, derived_branch
+    puts "Getting commit diff from #{base_branch} to #{derived_branch}"
+    commit_diff_raw = `git log  #{base_branch}..#{derived_branch}`
+    puts commit_diff_raw
+
+    return GithubApi.GetCommitHashesFromLog commit_diff_raw
+  end
+
+  # Returns commits in order of newest to oldest
+  def GithubApi.GetCommitHashesFromLog git_log
+    matches = git_log.scan /^commit [a-zA-Z0-9]*$/
+    commit_len = 'commit '.length
+    commit_hashes = matches.map { |v| v[commit_len, v.length-1] }
+    return commit_hashes
+  end
+
+
   # we do NOT want to switch to parent folder but stay in current repo dir when we exit this method
   def GithubApi.CheckoutRepoAfresh repo_url, branch
+
     repo = GithubApi.ProjectNameFromRepo repo_url
     return false if repo == GlobalConstants::EMPTY
 
@@ -88,6 +168,7 @@ module GithubApi
       FileUtils.rm_rf repo
     end
 
+    #repo_url = GithubApi.InsertCredsInUrl repo_url
     # clone to local
     puts 'Cloning repo to local...'
     begin
@@ -137,4 +218,8 @@ module GithubApi
 
     repo
   end
+
+  def GithubApi.SetPushDefaultSimple
+    `git config --global push.default simple`
+  end
 end

data/lib/global_constants.rb

@@ -2,7 +2,7 @@ module GlobalConstants
 
   HASH = 'Hash'
 
-  SPEC = 'spec'
+  SPEC = Dir.pwd + '\src\spec'
 
   ROOT = 'root'
   PREVIOUS = 'previous'

data/lib/rollback.rb

@@ -0,0 +1,63 @@
+=begin
+  rollback flow:
+
+  check rollback command 
+  avoid replacing backup branch 
+
+  commit diff on backup vs current 
+  at least one commit should be version upgrade 
+  create revert commits on commit diff 
+
+  tag commit with nuget version if it publishes nuget
+  tag commit with timestamp if it is a service 
+  
+  replace backup branch   
+=end
+
+
+
+class RollbackUpgrade
+
+  DATE_FORMAT = 'date_%m-%d-%Y_time_%H.%M.%S'
+
+  def initialize repo_url, remote, current_branch, rollback_branch, metadata
+    @repo_url = repo_url
+    @remote = remote
+    @current_branch = current_branch
+    @rollback_branch = rollback_branch
+    @metadata = metadata
+  end
+
+  def create_rollback_tag
+    versioning = SemverVersioning.new
+    semver_file = @config_map.metadata.semver.file
+    if @config_map.metadata.should_publish_nuget.downcase == 'y' && semver_file != nil && semver_file != GlobalConstants::EMPTY
+      semver_file.capitalize
+      ver_tag = versioning.get_current_version @config_map.metadata.semver.location, semver_file
+      return "rollback-#{ver_tag}"
+    else
+      utc_now = DateTime.now.utc
+      date_tag = utc_now.strftime(DATE_FORMAT) 
+      return "rollback-#{date_tag}"
+    end
+  end
+
+  def Do
+    commit_hashes = GithubApi.BranchCommitDiff(@rollback_branch, @current_branch)
+    if commit_hashes.length == 0
+      puts `No difference between branches #{current_branch} and #{rollback_branch}, aborting rollback.`
+      return false
+    end
+
+    # check hashes for version upgrade commit message
+    if !commit_hashes.any?{ |c_hash| GithubApi.ShowCommitInfoLocal(c_hash).include? UpgradePackages::VERSION_UPGRADE_COMMIT }
+      puts `No version upgrade commit detected to roll back, aborting rollback.`
+      return false
+    end
+
+    GithubApi.RevertLocal(@current_branch, commit_hashes)
+
+    puts `@<--- Rollback branch revert completed. @<---`
+    return true
+  end
+end

data/lib/rollbackall.rb

@@ -0,0 +1,163 @@
+=begin
+
+Uses project dependency map and configuration to process a DataPlatform Service's 
+code repository level framework upgrade and service deployments
+
+=end
+
+class RollbackAll
+
+  VERSION_MAP_FILE = 'versionmap.json'
+  # todo: remove the up one level path
+  MANIFEST_FILE = 'manifest.json'
+
+  # repo_url is where the last known version map and manifest are checked-in
+  def initialize repo_url, branch, manifest_path = MANIFEST_FILE
+
+    @repo_url = repo_url
+    @branch = branch
+    @manifest_path = manifest_path
+
+    @manifest = JSON.parse File.read(@manifest_path) if File.exist? @manifest_path
+  end
+
+  def manifest
+    @manifest
+  end
+
+  def version_map
+    @remote_version_map
+  end
+
+  def retrieve_artifacts
+
+    return if !GithubApi.CheckoutRepoAfresh @repo_url, @branch
+
+    # JSON files converted to hash
+    @remote_version_map = JSON.parse File.read(VERSION_MAP_FILE) if File.exist? VERSION_MAP_FILE
+    @manifest = JSON.parse File.read(@manifest_path) if File.exist? @manifest_path
+
+    Dir.chdir GlobalConstants::PARENTDIR
+  end
+
+  def version_exists
+
+    # create version map afresh to compare
+    vm = VersionMap.new
+    version_repo_url = @manifest['version_source']['repo_url']
+    versions = vm.version_map version_repo_url, @manifest['version_source']['branch']
+
+    # If remote version doesn't exist, save it
+    if @remote_version_map.nil?
+      File.write VERSIONMAPFILE, versions.to_json
+      GithubApi.PushBranch @repo_url, @branch
+
+      return hash
+    end
+  end
+
+  def Do input_validator, is_local_run=false
+
+    puts "\n"
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Rollback All has begun..'
+
+    # retrieve version map and upgrade manifest
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Retrieving artifacts...'
+    retrieve_artifacts
+
+    return false if @remote_version_map.nil? || @manifest.nil?
+
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Ensuring version map exists...'
+    version_exists
+
+
+    # validate manifest
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Validating manifest...'
+    validation_errors = []
+    input_validator.validate_manifest(@manifest) do |error|
+      validation_errors << error if !error.nil?
+    end
+    raise StandardError, validation_error_message(validation_errors) if validation_errors.length > 0
+
+    nuget_targets = []
+
+    # TODO: This validation could probably go in an input validator specifically for rollback
+    rollback_config = @manifest['projects']['root']['metadata'].IsRollback
+    rollback = !rollback_config.nil? and rollback_config.downcase == 'y'
+    if !rollback
+      puts 'IsRollback not set in manifest, aborting rollback.'
+      return false
+    end
+    upgrader = UpgradePackages.new versions_to_update, rollback
+
+    # if changes exist, cycle through dependency tree and kick off upgrades
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Navigating projects...'
+    dep_tree = DependencyTree.new(@manifest['projects'])
+    dep_tree.traverse do |node|
+
+      if node.metadata.should_upgrade.downcase == 'y'
+        puts "#{GlobalConstants::UPGRADE_PROGRESS} Processing project #{node.project_name}..."
+
+        # validate project node
+        puts GlobalConstants::UPGRADE_PROGRESS + 'Validating project node...'
+        input_validator.validate_project_node(node) do |error|
+          validation_errors << error if !error.nil?
+        end
+        raise StandardError, validation_error_message(validation_errors) if validation_errors.length > 0
+
+        # the upgrade
+        puts "#{GlobalConstants::UPGRADE_PROGRESS} Rolling back project #{node.project_name}..."
+        upgrade_status = upgrader.Do node, nuget_targets, is_local_run
+
+        # save node name to use for status update
+        node_name = node.project_name
+        if (node.respond_to?('is_root') && node.is_root == 'true')
+          node_name = GlobalConstants::ROOT
+        end
+
+        # project status set in json
+        if upgrade_status
+          puts "#{GlobalConstants::UPGRADE_PROGRESS} Rollback of #{node.project_name} succeeded"
+          @manifest['projects'][node_name]['metadata']['status'] = GlobalConstants::SUCCESS
+          Dir.chdir GlobalConstants::PARENTDIR
+        else
+          # either cycle was unterrupted, a step in upgrade failed or full cycle successfully completed
+          # save the version map and manifest
+          puts "#{GlobalConstants::UPGRADE_PROGRESS} Rollback of #{node.project_name} failed"
+          @manifest['projects'][node_name]['metadata']['status'] = GlobalConstants::FAILED
+          # no more processing after failure
+          return false
+        end
+
+      else
+        puts "#{GlobalConstants::UPGRADE_PROGRESS} Skipping Rollback for project #{node.project_name}..."
+      end
+    end
+
+    # upgrade completed successfully, set rollback to 'n' state, update status as unprocessed and save version map and manifest, push
+    @manifest['projects']['root']['metadata'].IsRollback = 'n'
+    reset_status_unprocessed
+
+
+    true
+  end
+
+  def save version_manifest
+
+  end
+
+
+  def reset_status_unprocessed
+    @manifest['projects'].each { |proj|
+      proj.each { |item|
+        item['metadata']['status'] = GlobalConstants::UNPROCESSED if item.class.to_s != 'String'
+      }
+    }
+    @manifest
+  end
+
+  def validation_error_message validation_errors
+    "One or more validation errors have occurred: #{validation_errors.join(' ')}"
+  end
+
+end

data/lib/teamcity_api.rb

@@ -7,23 +7,37 @@ require 'builder'
 
 module TeamCityApi
 
+  def TeamCityApi.get_teamcity_creds
+    file = File.open(Dir.pwd + '/spec/p.txt', 'r')
+    content = file.read
+    content.gsub!(/\r\n?/, "\n")
+    line_num = 0
+    creds = []
+    content.each_line do |line|
+      creds << line
+    end
+    creds
+  end
+
   #Build trigger API
-  def TeamCityApi.trigger_build buildConfigurationId, username, password
+  def TeamCityApi.trigger_build buildConfigurationId
+
     configContent = create_build_trigger_config buildConfigurationId
-    uri = URI.parse "http://teamcity.relayhealth.com"
+    uri = URI.parse 'http://teamcity.relayhealth.com'
     http = Net::HTTP.new uri.host, uri.port
-    request = Net::HTTP::Post.new "/httpAuth/app/rest/buildQueue"
+    request = Net::HTTP::Post.new '/httpAuth/app/rest/buildQueue'
     request.body = configContent
     request.content_type = 'application/xml'
     request.basic_auth username, password
-    http.request request
+    response = http.request request
+    p response
   end
 
   def TeamCityApi.create_build_trigger_config buildConfigurationId
     xml = Builder::XmlMarkup.new :indent => 2
     xml.build{
-      xml.triggeringOptions "cleanSources" => "true", "rebuildAllDependencies" => "true", "queueAtTop" => "true"
-      xml.buildType "id" => "#{buildConfigurationId}"
+      xml.triggeringOptions 'cleanSources' => 'true', 'rebuildAllDependencies' => 'true', 'queueAtTop' => 'true'
+      xml.buildType 'id' => "#{buildConfigurationId}"
     }
   end
 
@@ -207,9 +221,31 @@ module TeamCityApi
     response = http.request request
   end
 
-end
+  def TeamCityApi.get_build_status projectId
+    # list queued builds per project
+    uri = URI.parse 'http://teamcity.relayhealth.com'
+    http = Net::HTTP.new uri.host, uri.port
+    request = Net::HTTP::Get.new "/app/rest/buildQueue?locator=project:#{projectId}", {'Accept' => 'application/json'}
+    creds = TeamCityApi.get_teamcity_creds
+    request.basic_auth creds[0].delete("\n"), creds[1].delete("\n")
+    response = http.request request
+  end
 
+end
 
+=begin
+    creds = TeamCityApi.get_teamcity_creds
+    configContent = create_build_trigger_config buildConfigurationId
+    uri = URI.parse 'http://teamcity.relayhealth.com'
+    http = Net::HTTP.new uri.host, uri.port
+    request = Net::HTTP::Post.new '/httpAuth/app/rest/buildQueue'
+    request.body = configContent
+    request.content_type = 'application/xml'
+    request.basic_auth creds[0].delete("\n"), creds[1].delete("\n")
+    response = http.request request
+    p response.body
+  end
+=end
 # Sample Usage
 #TeamCityApi.trigger_build("DataPlatform_DataPlatformOntology_ADevelopBuildDataPlatformOntology_2", "username", "password")
 

data/lib/upgrade.rb

@@ -7,9 +7,13 @@ Processes upgrade for a C# code repositoryy
 class UpgradePackages
 
   UPGRADE_BRANCH = 'upgrade'
+  BACKUP_BRANCH = 'upgradeBackupDoNotDelete'
+  VERSION_UPGRADE_COMMIT = 'Versions updated'
+  VERSION_UPGRADE_FAIL_BUILD_COMMIT = 'Versions updated, build failed'
 
-  def initialize versions
+  def initialize versions, rollback=false
     @versions = versions
+    @rollback = rollback
   end
 
   def checkout_upgrade_branch
@@ -26,6 +30,20 @@ class UpgradePackages
     return true
   end
 
+  def create_upgrade_tag
+    versioning = SemverVersioning.new
+    semver_file = @config_map.metadata.semver.file
+    if @config_map.metadata.should_publish_nuget.downcase == 'y' && semver_file != nil && semver_file != GlobalConstants::EMPTY
+      semver_file.capitalize
+      ver_tag = versioning.get_current_version @config_map.metadata.semver.location, semver_file
+      return "upgrade-#{ver_tag}"
+    else
+      utc_now = DateTime.now.utc
+      date_tag = utc_now.strftime(DATE_FORMAT)
+      return "upgrade-#{date_tag}"
+    end
+  end
+
   def Do config_map, nuget_targets, is_local_run=false
 
     @config_map = config_map
@@ -35,6 +53,22 @@ class UpgradePackages
     # checkout repo and branch
     return false if !GithubApi.CheckoutRepoAfresh @repo_url, @branch
 
+    tag_creator = method(:create_upgrade_tag)
+
+    # TODO: Need to check if node has failed before invoking rollback
+    if @rollback
+      puts "Starting Rollback."
+      rollback = new Rollback @repo_url, 'origin', @branch, BACKUP_BRANCH, @config_map.metadata
+      tag_creator = rollback.method(:create_rollback_tag)
+      return false if !rollback.Do
+    end
+
+    # When upgrade branch exists we are coming from some failure state and dont need to backup the branch again
+    if (GithubApi.DoesBranchExist('origin', UPGRADE_BRANCH) == GlobalConstants::EMPTY)
+      GithubApi.CreateNewBranch(BACKUP_BRANCH, @branch)
+      GithubApi.ForcePushBranch('origin', BACKUP_BRANCH)
+    end
+
     # make upgrade branch
     return false if !checkout_upgrade_branch
 
@@ -61,9 +95,13 @@ class UpgradePackages
     # QUESTION: Should this method increment semver even if there is no nuget published?
     puts GlobalConstants::UPGRADE_PROGRESS + 'Upgrading semver...'
     semver_inc_done = increment_semver_if_publish is_local_run
-    if @config_map.metadata.should_publish_nuget.downcase == 'y'
-      nuget_targets << Dir.pwd + '/build_artifacts'
-    end
+    nuget_targets << Dir.pwd + '/build_artifacts' if @config_map.metadata.should_publish_nuget.downcase == 'y'
+
+    # Tag commit
+    recent_commit_hash = GithubApi.GetRecentCommitHash(@branch)
+    #rollback_tag = tag_creator.call()
+
+    #GithubApi.TagLocal(recent_commit_hash, rollback_tag, "Autoupgrade Tag")
 
     # do rake build to test for compilation errors. This needs ENV vars set, passed in via config
     set_project_env_vars @config_map.metadata.env_vars
@@ -71,7 +109,7 @@ class UpgradePackages
     if output.to_s == 'false'
       puts GlobalConstants::UPGRADE_PROGRESS + ' Rake Error: There were errors during rake run.'
       # save state
-      GithubApi.CommitChanges( 'Versions updated, build failed')
+      GithubApi.CommitChanges( VERSION_UPGRADE_FAIL_BUILD_COMMIT)
 
       return false
     end
@@ -87,7 +125,7 @@ class UpgradePackages
     else
       return false if !update_branch
       # kick off teamcity build
-      TeamCityApi.trigger_build @config_map.build_configuration_id, @config_map.tc_un, @config_map.tc_pwd
+      TeamCityApi.trigger_build @config_map.build_configuration_id, ENV['tc_un'], ENV['tc_pwd']
     end
 
     true

data/lib/upgradeall.rb

@@ -10,6 +10,7 @@ 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
@@ -17,8 +18,8 @@ class UpgradeAll
     @repo_url = repo_url
     @branch = branch
     @manifest_path = manifest_path
-
     @manifest = JSON.parse File.read(@manifest_path) if File.exist? @manifest_path
+
   end
 
   def manifest
@@ -26,15 +27,14 @@ class UpgradeAll
   end
 
   def version_map
-    @remote_version_map
+    @version_map
   end
 
   def retrieve_artifacts
-
     return if !GithubApi.CheckoutRepoAfresh @repo_url, @branch
 
     # JSON files converted to hash
-    @remote_version_map = JSON.parse File.read(VERSION_MAP_FILE) if File.exist? VERSION_MAP_FILE
+    @version_map = JSON.parse File.read(VERSION_MAP_FILE) if File.exist? VERSION_MAP_FILE
     @manifest = JSON.parse File.read(@manifest_path) if File.exist? @manifest_path
 
     Dir.chdir GlobalConstants::PARENTDIR
@@ -42,6 +42,8 @@ class UpgradeAll
 
   def Do input_validator, is_local_run=false
 
+    GithubApi.SetPushDefaultSimple
+
     puts "\n"
     puts GlobalConstants::UPGRADE_PROGRESS + 'Upgrade All has begun..'
 
@@ -49,7 +51,7 @@ class UpgradeAll
     puts GlobalConstants::UPGRADE_PROGRESS + 'Retrieving artifacts...'
     retrieve_artifacts
 
-    return false if @remote_version_map.nil? || @manifest.nil?
+    return false if @version_map.nil? || @manifest.nil?
 
     #find version diff. If no changes exist, kick off deploy cycle only
     puts GlobalConstants::UPGRADE_PROGRESS + 'Calculating version diff...'
@@ -77,53 +79,84 @@ class UpgradeAll
     dep_tree = DependencyTree.new(@manifest['projects'])
     dep_tree.traverse do |node|
 
-      if node.metadata.should_upgrade.downcase == 'y'
-        puts "#{GlobalConstants::UPGRADE_PROGRESS} Processing project #{node.project_name}..."
-
-        # validate project node
-        puts GlobalConstants::UPGRADE_PROGRESS + 'Validating project node...'
-        input_validator.validate_project_node(node) do |error|
-          validation_errors << error if !error.nil?
-        end
-        raise StandardError, validation_error_message(validation_errors) if validation_errors.length > 0
-
-        # the upgrade
-        puts "#{GlobalConstants::UPGRADE_PROGRESS} Upgrading project #{node.project_name}..."
-        upgrade_status = upgrader.Do node, nuget_targets, is_local_run
-
-        # save node name to use for status update
-        node_name = node.project_name
-        if (node.respond_to?('is_root') && node.is_root == 'true')
-          node_name = GlobalConstants::ROOT
-        end
-
-        # project status set in json
-        if upgrade_status
-          puts "#{GlobalConstants::UPGRADE_PROGRESS} Upgrade of #{node.project_name} succeeded"
-          @manifest['projects'][node_name]['metadata']['status'] = GlobalConstants::SUCCESS
-          Dir.chdir GlobalConstants::PARENTDIR
-        else
-          # either cycle was unterrupted, a step in upgrade failed or full cycle successfully completed
-          # save the version map and manifest
-          puts "#{GlobalConstants::UPGRADE_PROGRESS} Upgrade of #{node.project_name} failed"
-          @manifest['projects'][node_name]['metadata']['status'] = GlobalConstants::FAILED
-          # no more processing after failure
-          return false
-        end
+      next if !check_should_upgrade node
+      next if check_success_state node
+
+      puts GlobalConstants::UPGRADE_PROGRESS + " Processing project #{node.project_name}..."
+
+      # validate project node
+      puts GlobalConstants::UPGRADE_PROGRESS + 'Validating project node...'
+      input_validator.validate_project_node(node) do |error|
+        validation_errors << error if !error.nil?
+      end
+      raise StandardError, validation_error_message(validation_errors) if validation_errors.length > 0
 
+      # the upgrade
+      puts GlobalConstants::UPGRADE_PROGRESS + " Upgrading project #{node.project_name}..."
+      upgrade_status = upgrader.Do node, nuget_targets, is_local_run
+
+      # save node name to use for status update
+      node_name = node.project_name
+      node_name = GlobalConstants::ROOT if (node.respond_to?('is_root') && node.is_root == 'true')
+
+      # project status set in json
+      if upgrade_status
+        puts GlobalConstants::UPGRADE_PROGRESS + " Upgrade of #{node.project_name} succeeded"
+        @manifest['projects'][node_name]['metadata']['status'] = GlobalConstants::SUCCESS
+        Dir.chdir GlobalConstants::PARENTDIR
+
+        # if publishing nuget package, wait for a minute for publish to finish
+        waitfor if node.should_publish_nuget
       else
-        puts "#{GlobalConstants::UPGRADE_PROGRESS} Skipping upgrade for project #{node.project_name}..."
+        # either cycle was unterrupted, a step in upgrade failed or full cycle successfully completed
+        # save the version map and manifest
+        puts GlobalConstants::UPGRADE_PROGRESS + " Upgrade of #{node.project_name} failed"
+        @manifest['projects'][node_name]['metadata']['status'] = GlobalConstants::FAILED
+        # no more processing after failure
+        return false
       end
+
     end
 
     # upgrade completed successfully, update status as unprocessed and save version map and manifest, push
     reset_status_unprocessed
 
+    save_version_manifest versions_to_update if !is_local_run
 
     true
   end
 
-  def save version_manifest
+  def check_should_upgrade node
+    status = node.metadata.should_upgrade.downcase == 'y'
+    puts GlobalConstants::UPGRADE_PROGRESS + " Skipping upgrade for project #{node.project_name}..." if !status
+    status
+  end
+
+  def check_success_state node
+    status = node.metadata.status == GlobalConstants::SUCCESS
+    puts GlobalConstants::UPGRADE_PROGRESS + " Project #{node.project_name} already in #{GlobalConstants::SUCCESS} state. Skipping upgrade..." if status
+    status
+  end
+
+  def save_version_manifest versions_to_update
+
+    # cd to directory where versions/manifest is present
+    repo_folder = GithubApi.ProjectNameFromRepo @repo_url
+    Dir.chdir repo_folder
+
+    # update files
+    File.open(MANIFEST_FILE, 'w') do |f|
+      f.write @manifest.to_json
+    end
+
+    # merge updated versions with known version map
+    @version_map = @version_map.merge versions_to_update
+    File.open(VERSION_MAP_FILE, 'w') do |f|
+      f.write @version_map.to_json
+    end
+
+    # save branch
+    GithubApi.CommitAllLocalAndPush 'Updated manifest and version map'
 
   end
 
@@ -135,15 +168,15 @@ class UpgradeAll
     versions = vm.version_map version_repo_url, @manifest['version_source']['branch']
 
     # If remote version doesn't exist, save it
-    if @remote_version_map.nil?
-      File.write VERSIONMAPFILE, versions.to_json
+    if @version_map.nil?
+      File.write VERSION_MAP_FILE, versions.to_json
       GithubApi.PushBranch @repo_url, @branch
 
       return hash
     end
 
     # compare current and remote versions, obtain changeset
-    hash = Hash[*(versions.to_a - @remote_version_map.to_a).flatten]
+    hash = Hash[*(versions.to_a - @version_map.to_a).flatten]
 
     # return changeset hash
     hash
@@ -162,4 +195,16 @@ class UpgradeAll
     "One or more validation errors have occurred: #{validation_errors.join(' ')}"
   end
 
+  def waitfor
+    checks = 0
+
+    until checks > MAX_CHECKS
+      sleep 5
+      checks += 1
+      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
+  end
+
 end

data/lib/version_map.rb

@@ -45,10 +45,7 @@ class VersionMap
       doc = Nokogiri::XML File.read(file)
       nodes = doc.xpath "//*[@id]"
       nodes.each { |node|
-
-        if (!versions[node['id']].nil? && node['version'] != versions[node['id']])
-          puts "======Error: Package #{node['id']} with version #{node['version']} has a different pre-exisiting version: #{versions[node['id']]}"
-        end
+        puts "======Error: Package #{node['id']} with version #{node['version']} has a different pre-exisiting version: #{versions[node['id']]}" if (!versions[node['id']].nil? && node['version'] != versions[node['id']])
         versions[node['id']] = node['version']
       }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a2zdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies: []
 description: Automated Upgrades Gem. Provides version upgrades, build and deployment
   configuration management
@@ -24,6 +24,8 @@ files:
 - lib/hash_extensions.rb
 - lib/input_validator.rb
 - lib/proget_api.rb
+- lib/rollback.rb
+- lib/rollbackall.rb
 - lib/teamcity_api.rb
 - lib/upgrade.rb
 - lib/upgradeall.rb