a2zdeploy 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d26ef64a5e56fba85aad32a6716bc11d04edd861
-  data.tar.gz: c846d6a9030f00ab41d8ba47cbf606a3c04bbec5
+  metadata.gz: 7ed53192adb1971f268124fc20fb11510ee31e06
+  data.tar.gz: b49b25d81f158ae3ad8420761aa5559fd6d2c2bf
 SHA512:
-  metadata.gz: 5d5e93a79e70af4176b95434edfcc1fb5d83df3c9f8a8b6060a8f32065780f6461e79c551880f6b0a909aca305fb8a8616b1bc940c1e7acb2fecad1a487ed4fb
-  data.tar.gz: 3c95f5c78ed0915dbfe811b57f316d0a87dee466e2e197d810756edbfe9e5e2e7380c5e22a0052a1ed32a0d0d7cebbbff39a037debed93cd2f4c01fa256cacbb
+  metadata.gz: cc2e1fdf5f6d4681709a6c9b6c3d34b4e137708acd381b4317ba168609379c5ad41a1379a0604060644924d73491503258aafe29ef487c56bf804088712550a1
+  data.tar.gz: f83acdd75516f2c3c373b8c5bb26c8cd74bb51a8f2ffdb903c84bb2a55de864d87c97a4a081fe8af86c373796f85634aa7ef6964f4884d5fb5fb90223cfa3adb

data/a2zdeploy.gemspec

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

data/lib/a2zdeploy.rb

@@ -1,5 +1,5 @@
 require_relative 'dependency_tree'
-require_relative 'globalconstants'
+require_relative 'global_constants'
 require_relative 'proget_api.rb'
 require_relative 'teamcity_api.rb'
 require_relative 'github_api.rb'
@@ -7,15 +7,15 @@ require_relative 'upgrade.rb'
 require_relative 'upgradeall.rb'
 require_relative 'github_api'
 require_relative 'version_map'
+require_relative 'hash_extensions'
+require_relative 'input_validator'
 
 require 'addressable/uri'
-require 'pathname'
+require 'azdeploy'
+require 'builder'
 require 'fileutils'
+require 'json'
 require 'net/http'
-
 require 'nokogiri'
-require 'net/http'
-require 'builder'
-require 'json'
-require 'azdeploy'
+require 'pathname'
 require 'semver'

data/lib/dependency_tree.rb

@@ -1,16 +1,16 @@
 =begin
     Defines a simple dependency tree in a has map and allows accessing top and GlobalConstants::NEXT item in the tree.
-    - The keys 'GlobalConstants::ROOT, GlobalConstants::NEXT, GlobalConstants::PREVIOUS and GlobalConstants::PROJECT' are self-descriptive and symbols
+    - The keys 'GlobalConstants::ROOT, GlobalConstants::NEXT, GlobalConstants::PREVIOUS and GlobalConstants::PROJECTNAME_NAME' are self-descriptive and symbols
     - GlobalConstants::ROOT's GlobalConstants::PREVIOUS is always nil, so are all leaf node GlobalConstants::NEXT
     {
         "GlobalConstants::ROOT" => {
-            "GlobalConstants::PROJECT" => "Ontology", 
+            "GlobalConstants::PROJECTNAME" => "Ontology", 
             "GlobalConstants::NEXT" => "FhirWalker", 
             "GlobalConstants::PREVIOUS" => nil, 
             "metadata" => "[json or another hash]" 
         },
         "FhirWalker" => {
-            "GlobalConstants::PROJECT" => "Portal", 
+            "GlobalConstants::PROJECTNAME" => "Portal", 
             "GlobalConstants::NEXT" => "EventTracking", 
             "GlobalConstants::PREVIOUS" => "Ontology", 
             "metadata" => "[json or another hash]" 
@@ -26,40 +26,59 @@ class DependencyTree
   end
 
   def root
-    return nil if (@dependency_map.nil? || @dependency_map.class.to_s != GlobalConstants::HASH)
+    return nil if @dependency_map.nil? || @dependency_map.class.to_s != GlobalConstants::HASH || @dependency_map.empty?
 
     if @dependency_map.has_key?(GlobalConstants::ROOT)
-      if @dependency_map[GlobalConstants::ROOT].has_key? GlobalConstants::PROJECT
-        @dependency_map[GlobalConstants::ROOT][GlobalConstants::PROJECT]
+      if @dependency_map[GlobalConstants::ROOT].has_key? GlobalConstants::PROJECTNAME
+        root_node = Hashit.new @dependency_map[GlobalConstants::ROOT]
+        root_node
       end
     end
   end
 
   def next_node current
     return nil if current.to_s.strip.length == 0
-    return nil if @dependency_map.nil? || @dependency_map.class.to_s != GlobalConstants::HASH
-    return nil if @dependency_map[current] == nil
+    return nil if @dependency_map.nil? || @dependency_map.class.to_s != GlobalConstants::HASH || @dependency_map.empty?
 
+    current = GlobalConstants::ROOT  if @dependency_map[GlobalConstants::ROOT][GlobalConstants::PROJECTNAME] == current
     if @dependency_map[current].has_key? GlobalConstants::NEXT
-      @dependency_map[current][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
     end
   end
 
   def previous_node current
     return nil if current.to_s.strip.length == 0
-    return nil if (@dependency_map.nil? || @dependency_map.class.to_s != GlobalConstants::HASH)
+    return nil if @dependency_map.nil? || @dependency_map.class.to_s != GlobalConstants::HASH || @dependency_map.empty?
 
     if @dependency_map[current].has_key? GlobalConstants::PREVIOUS
-      @dependency_map[current][GlobalConstants::PREVIOUS]
+      prev_node = @dependency_map[current][GlobalConstants::PREVIOUS]
+      if @dependency_map[GlobalConstants::ROOT][GlobalConstants::PROJECTNAME] == prev_node
+        prev_node = @dependency_map[GlobalConstants::ROOT]
+      else
+        prev_node = @dependency_map[prev_node]
+      end
+      return nil if prev_node.nil?
+      return Hashit.new prev_node
     end
   end
 
   def traverse
     current = GlobalConstants::ROOT
-    yield @dependency_map[current][GlobalConstants::PROJECT] if @dependency_map.has_key?(current) && @dependency_map[current].has_key?(GlobalConstants::PROJECT)
+    current = @dependency_map[current]
+    current = Hashit.new current
+    yield current
     while current != nil
-      current = next_node(current)
-      yield @dependency_map[current][GlobalConstants::PROJECT] if @dependency_map.has_key?(current) && @dependency_map[current].has_key?(GlobalConstants::PROJECT)
+      begin
+        current = next_node current.project_name
+      rescue
+        #puts $!
+        current = nil
+      end
+      yield current if !current.nil?
     end
   end
 

data/lib/github_api.rb

@@ -59,18 +59,20 @@ module GithubApi
     `git pull --rebase #{@repo_url} #{@branch}`
   end
 
-  def GithubApi.CommitChanges comment, git_status
-    val = git_status.split("\n")
-    val.each { |x| 
-        value = x.split(' M ').last
+  def GithubApi.CommitChanges comment, git_status = ''
+    if git_status != GlobalConstants::EMPTY
+      val = git_status.split("\n")
+      val.each { |x|
+        value = x.split(' M ').last || x.split('?? ').last
         if (/.csproj/.match(value) || /packages.config/.match(value))
-            status = `git add #{value}`
-            if status != GlobalConstants::EMPTY
-                return false
-            end
+          status = `git add #{value}`
+          if status != GlobalConstants::EMPTY
+            return false
+          end
         end
-    }    
-    
+      }
+    end
+
     status = `git commit -m "#{comment}"`
     return status != GlobalConstants::EMPTY
   end
@@ -114,6 +116,7 @@ module GithubApi
     begin
       uri = Addressable::URI.parse repo_url
     rescue
+      puts $!
       puts "repo_url: #{repo_url} parse failed"
       return repo
     end

data/lib/global_constants.rb

@@ -0,0 +1,22 @@
+module GlobalConstants
+
+  HASH = 'Hash'
+
+  SPEC = 'spec'
+
+  ROOT = 'root'
+  PREVIOUS = 'previous'
+  NEXT = 'next'
+  PROJECTNAME = 'project_name'
+  DPREPO = 'http://ndhaxpgit01.mckesson.com/Carnegie/RelayHealth.DataPlatform.git'
+
+  UNPROCESSED = 'unprocessed'
+  FAILED = 'failed'
+  SUCCESS = 'success'
+  UPGRADE_PROGRESS = '***Upgrade progress: '
+
+  EMPTY = ''
+  PARENTDIR = '..'
+  DOT = '.'
+
+end

data/lib/hash_extensions.rb

@@ -0,0 +1,9 @@
+class Hashit
+  def initialize(hash)
+    hash.each do |k,v|
+      self.instance_variable_set("@#{k}", v.is_a?(Hash) ? Hashit.new(v) : v)
+      self.class.send(:define_method, k, proc{self.instance_variable_get("@#{k}")})
+      self.class.send(:define_method, "#{k}=", proc{|v| self.instance_variable_set("@#{k}", v)})
+    end
+  end
+end

data/lib/input_validator.rb

@@ -0,0 +1,159 @@
+class InputValidator
+
+  def initialize
+    @simple_validator = SimpleValidator.new
+  end
+
+  def test_mode
+    @test_mode = true
+  end
+
+  # We should do more specific test of which environment variables are we expecting or which metatdata are we expecting
+  #if project publishes nuget we need to check if major /minor/patch incrmeented but not all 3
+
+  def validate_version_map version_map
+    if version_map.nil? || version_map.class.to_s != GlobalConstants::HASH
+      yield 'Version map must be a non-empty ' + GlobalConstants::HASH
+    end
+  end
+
+  def validate_manifest m
+
+    manifest = Hashit.new m
+    puts 'Validating upgrade manifest...'
+
+    if manifest.nil? || manifest.class.to_s != 'Hashit'
+      yield 'Config map must be a non-nil class of type Hashit'
+    end
+
+    node_name = 'manifest'
+    yield @simple_validator.method_exists manifest, 'version_source', node_name
+    yield @simple_validator.method_value_not_nil manifest, 'version_source', node_name
+    yield @simple_validator.method_exists manifest.version_source, 'repo_url', node_name
+    yield @simple_validator.method_value_not_nil_or_empty manifest.version_source, 'repo_url', node_name
+    yield @simple_validator.method_exists manifest.version_source, 'branch', node_name
+    yield @simple_validator.method_value_not_nil_or_empty manifest.version_source, 'branch', node_name
+    yield @simple_validator.method_exists manifest, 'projects', node_name
+    yield @simple_validator.method_value_not_nil manifest, 'projects', node_name
+  end
+
+  def validate_project_node project
+
+    node_name = 'project'
+
+    yield @simple_validator.method_exists project, 'next', node_name
+    #yield @simple_validator.method_value_not_nil_or_empty project, 'next', node_name
+
+    yield @simple_validator.method_exists project, 'previous', node_name
+    #yield @simple_validator.method_value_not_nil_or_empty project, 'previous', node_name
+
+    node_name = 'project.metadata'
+    yield @simple_validator.method_exists project.metadata, 'repo_url', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'repo_url', node_name
+
+    yield @simple_validator.method_exists project.metadata, 'branch', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'branch', node_name
+
+    yield @simple_validator.method_exists project.metadata, 'should_upgrade', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'should_upgrade', node_name
+
+    yield @simple_validator.method_exists project.metadata, 'is_package_builder', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'is_package_builder', node_name
+
+    yield @simple_validator.method_exists project.metadata, 'should_publish_nuget', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'should_publish_nuget', node_name
+
+    yield @simple_validator.method_exists project.metadata, 'env_vars', node_name
+    yield @simple_validator.method_value_not_nil project.metadata, 'env_vars', node_name
+
+    yield @simple_validator.method_exists project.metadata, 'status', node_name
+    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
+
+    node_name = 'project.metadata.env_vars'
+    yield @simple_validator.method_exists project.metadata.env_vars, 'env', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'env', node_name
+
+    yield @simple_validator.method_exists project.metadata.env_vars, 'service_name', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'service_name', node_name
+
+    if !@test_mode
+      yield @simple_validator.method_exists project.metadata.env_vars, 'AI_InstrumentationKey', node_name
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'AI_InstrumentationKey', node_name
+
+      yield @simple_validator.method_exists project.metadata.env_vars, 'AppClientId', node_name
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'AppClientId', node_name
+
+      yield @simple_validator.method_exists project.metadata.env_vars, 'RuntimePath', node_name
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'RuntimePath', node_name
+
+      yield @simple_validator.method_exists project.metadata.env_vars, 'SettingsAccount', node_name
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'SettingsAccount', node_name
+
+      yield @simple_validator.method_exists project.metadata.env_vars, 'SettingsAccountKey', node_name
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'SettingsAccountKey', node_name
+
+      yield @simple_validator.method_exists project.metadata.env_vars, 'unitestconnectionString', node_name
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'unitestconnectionString', node_name
+
+      yield @simple_validator.method_exists project.metadata.env_vars, 'should_update_settings_connstr', node_name
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'should_update_settings_connstr', node_name
+    end
+
+    node_name = 'project.metadata.semver'
+    yield @simple_validator.method_exists project.metadata, 'semver', node_name
+    yield @simple_validator.method_value_not_nil project.metadata, 'semver', node_name
+    yield @simple_validator.method_exists project.metadata.semver, 'file', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata.semver, 'file', node_name
+
+    yield @simple_validator.method_exists project.metadata.semver, 'dimension', node_name
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata.semver, 'dimension', node_name
+
+    yield @simple_validator.method_exists project.metadata.semver, 'location', node_name
+    #yield @simple_validator.method_value_not_nil_or_empty project.metadata.semver, 'location', node_name
+
+  end
+
+end
+
+
+
+# nil return is treated as no error
+class SimpleValidator
+
+  CANNOT_CONTINUE = '. Cannot continue!'
+  IS_MISSING = ' is missing'
+
+  def method_exists object, method, name
+    begin
+      if !object.respond_to? method
+        "#{name}\'s method: *#{method}*" + IS_MISSING
+      end
+    rescue
+      nil
+    end
+  end
+
+  def method_value_not_nil_or_empty object, method, name
+    begin
+      value = object.send method
+      if value == nil || value.to_s.strip.length == 0
+        "#{name}\'s *#{method}* value is empty or" + IS_MISSING
+      end
+    rescue
+      nil
+    end
+  end
+
+  def method_value_not_nil object, method, name
+    begin
+      value = object.send method
+      if value == nil
+        "#{name}\'s *#{method}* value" + IS_MISSING
+      end
+    rescue
+      nil
+    end
+  end
+end

data/lib/teamcity_api.rb

@@ -19,7 +19,6 @@ module TeamCityApi
     http.request request
   end
 
-
   def TeamCityApi.create_build_trigger_config buildConfigurationId
     xml = Builder::XmlMarkup.new :indent => 2
     xml.build{
@@ -27,24 +26,24 @@ module TeamCityApi
       xml.buildType "id" => "#{buildConfigurationId}"
     }
   end
-  
+
   #Project Get/Create API
   def TeamCityApi.get_project_by_id projectId, username, password
     uri = URI.parse "http://teamcity.relayhealth.com"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Get.new "/app/rest/projects/id:#{projectId}", {'Accept' => 'application/json'}
     request.basic_auth username, password
-	response = http.request request
-	# File handling will be removed and instead use Tempfile for better security
-	target = open("../spec/ProjectConfigByProjectId", 'w')
+    response = http.request request
+    # File handling will be removed and instead use Tempfile for better security
+    target = open("../spec/ProjectConfigByProjectId", 'w')
     target.truncate(0)
     target.write(response.body)
     target.close
   end
-  
+
   def TeamCityApi.create_new_project inputFile, username, password
     file = File.open("../spec/#{inputFile}", "r")
-    requestContent = file.read  
+    requestContent = file.read
     uri = URI.parse "http://localhost:9999/"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Post.new "/httpAuth/app/rest/projects", {'Accept' => 'application/json'}
@@ -52,26 +51,26 @@ module TeamCityApi
     request.content_type = 'application/json'
     request.basic_auth username, password
     response = http.request request
-	puts response.body
+    puts response.body
   end
-  
+
   #VCS-Root Get/Create API
   def TeamCityApi.get_vcs_roots_by_id vcsRootId, username, password
     uri = URI.parse "http://teamcity.relayhealth.com"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Get.new "/httpAuth/app/rest/vcs-roots/id:#{vcsRootId}", {'Accept' => 'application/json'}
     request.basic_auth username, password
-	response = http.request request
-	# File handling will be removed and instead use Tempfile for better security
-	target = open("../spec/VcsRootConfigByVcsRootId", 'w')
+    response = http.request request
+    # File handling will be removed and instead use Tempfile for better security
+    target = open("../spec/VcsRootConfigByVcsRootId", 'w')
     target.truncate(0)
     target.write(response.body)
     target.close
   end
-  
+
   def TeamCityApi.create_new_vcs_root inputFile, username, password
     file = File.open("../spec/#{inputFile}", "r")
-    requestContent = file.read  
+    requestContent = file.read
     uri = URI.parse "http://localhost:9999/"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Post.new "/httpAuth/app/rest/vcs-roots", {'Accept' => 'application/json'}
@@ -79,43 +78,39 @@ module TeamCityApi
     request.content_type = 'application/json'
     request.basic_auth username, password
     response = http.request request
-	puts response.body
+    puts response.body
   end
-  
+
   #Build Config Get/Create API
-  def TeamCityApi.get_build_configs_by_projectId projectId, username, password 
+  def TeamCityApi.get_build_configs_by_projectId projectId, username, password
     uri = URI.parse "http://teamcity.relayhealth.com"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Get.new "/app/rest/projects/id:#{projectId}/buildTypes", {'Accept' => 'application/json'}
     request.basic_auth username, password
-	response = http.request request
-	# File handling will be removed and instead use Tempfile for better security
-	target = open("../spec/BuildConfigsByProjectId", 'w')
+    response = http.request request
+    # File handling will be removed and instead use Tempfile for better security
+    target = open("../spec/BuildConfigsByProjectId", 'w')
     target.truncate(0)
     target.write(response.body)
     target.close
   end
-  
+
   def TeamCityApi.get_build_configs_by_projectId_and_build_configurationId projectId, buildConfigurationId, username, password
     uri = URI.parse "http://teamcity.relayhealth.com"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Get.new "/app/rest/projects/id:#{projectId}/buildTypes/id:#{buildConfigurationId}", {'Accept' => 'application/json'}
     request.basic_auth username, password
-	response = http.request request
-	# File handling will be removed and instead use Tempfile for better security
+    response = http.request request
+    # File handling will be removed and instead use Tempfile for better security
     target = open("../spec/BuildConfigByProjectAndBuildConfigurationId", 'w')
     target.truncate(0)
     target.write(response.body)
     target.close
   end
 
-
-
-
-  
   def TeamCityApi.create_new_build_configuration projectId, inputFile, username, password
     file = File.open("../spec/#{inputFile}", "r")
-    requestContent = file.read  
+    requestContent = file.read
     uri = URI.parse "http://localhost:9999/"
     http = Net::HTTP.new uri.host, uri.port
 
@@ -125,13 +120,13 @@ module TeamCityApi
     request.content_type = 'application/json'
     request.basic_auth username, password
     response = http.request request
-	# File handling will be removed and instead use Tempfile for better security
+    # File handling will be removed and instead use Tempfile for better security
     target = open("../spec/CreateNewBuildConfigurationResponse", 'w')
     target.truncate(0)
     target.write(response.body)
     target.close
   end
-  
+
   # Setup build configuration settings
   def TeamCityApi.set_build_configuration_setting buildConfigurationId, settingName, settingValue, username, password
     uri = URI.parse "http://localhost:9999/"
@@ -142,7 +137,7 @@ module TeamCityApi
     request.basic_auth username, password
     response = http.request request
   end
-  
+
   # Setup build configuration parameters
   def TeamCityApi.set_build_configuration_parameter buildConfigurationId, parameterName, parameterValue, username, password
     uri = URI.parse "http://localhost:9999/"
@@ -153,74 +148,65 @@ module TeamCityApi
     request.basic_auth username, password
     response = http.request request
   end
-  
+
   # Setup build configuration Vcs-Root
   def TeamCityApi.set_build_configuration_vcs_root buildConfigurationId, vcsRootId, username, password
-	uri = URI.parse "http://localhost:9999/"
+    uri = URI.parse "http://localhost:9999/"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Post.new "/httpAuth/app/rest/buildTypes/id:#{buildConfigurationId}/vcs-root-entries/"
-	request.body = create_build_config_vcs_root_config vcsRootId
+    request.body = create_build_config_vcs_root_config vcsRootId
     request.content_type = 'application/xml'
     request.basic_auth username, password
 
     response = http.request request
   end
 
-
-
-  
   def TeamCityApi.create_build_config_vcs_root_config vcsRootId
     xml = Builder::XmlMarkup.new :indent => 2
-
-
-
     xml.tag!("vcs-root-entry"){
       xml.tag!("vcs-root", "id" => "#{vcsRootId}")
     }
   end
-  
-
 
   # Setup build configuration step
   def TeamCityApi.set_build_configuration_build_step buildConfigurationId, inputFile, username, password
     file = File.open("../spec/#{inputFile}", "r")
-    requestContent = file.read   
+    requestContent = file.read
     uri = URI.parse "http://localhost:9999/"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Post.new "/httpAuth/app/rest/buildTypes/id:#{buildConfigurationId}/steps/"
-	request.body = requestContent
+    request.body = requestContent
     request.content_type = 'application/xml'
     request.basic_auth username, password
     response = http.request request
   end
-  
 
   # Setup build feature step
   def TeamCityApi.set_build_configuration_feature buildConfigurationId, inputFile, username, password
     file = File.open("../spec/#{inputFile}", "r")
-    requestContent = file.read   
+    requestContent = file.read
     uri = URI.parse "http://localhost:9999/"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Post.new "/httpAuth/app/rest/buildTypes/id:#{buildConfigurationId}/features/"
-	request.body = requestContent
+    request.body = requestContent
     request.content_type = 'application/xml'
     request.basic_auth username, password
     response = http.request request
   end
-  
+
   # Setup build trigger step
   def TeamCityApi.set_build_configuration_trigger buildConfigurationId, inputFile, username, password
     file = File.open("../spec/#{inputFile}", "r")
-    requestContent = file.read   
+    requestContent = file.read
     uri = URI.parse "http://localhost:9999/"
     http = Net::HTTP.new uri.host, uri.port
     request = Net::HTTP::Post.new "/httpAuth/app/rest/buildTypes/id:#{buildConfigurationId}/triggers/"
-	request.body = requestContent
+    request.body = requestContent
     request.content_type = 'application/xml'
     request.basic_auth username, password
     response = http.request request
   end
-  
+
 end
 
 
@@ -242,4 +228,4 @@ end
 #TeamCityApi.set_build_configuration_build_step "DataPlatform_DataPlatformOntology_DevelopBuild", "RakeBuildStep", "username", "password"
 #TeamCityApi.set_build_configuration_feature "DataPlatform_DataPlatformOntology_DevelopBuild", "BuildConfigurationFeature", "username", "password"
 #TeamCityApi.set_build_configuration_feature "DataPlatform_DataPlatformOntology_DevelopBuild", "BuildConfigurationFeatureForFailureCondition", "username", "password"
-#TeamCityApi.set_build_configuration_trigger "DataPlatform_DataPlatformOntology_DevelopBuild", "SetupTriggerForBuildStep", "username", "password"
+#TeamCityApi.set_build_configuration_trigger "DataPlatform_DataPlatformOntology_DevelopBuild", "SetupTriggerForBuildStep", "username", "password"

data/lib/upgrade.rb

@@ -1,68 +1,20 @@
 =begin
 
-Processes upgrade for a repository that is deployed as a cloud service.
-
-Inputs:
-    1. Project Manifest that describes repo/project to be processed
-        a. repo name, repo url, branch name
-        b. 
-    2. Change Manifest that describes what references have been upgraded due to framework upgrade. 
-        Can be as simple as dictionary<string, string> of 'Package:[new version]'
-        example: When TestService is upgraded, we'll know what references have changed.
-                    These can be used to replace packages.config and project references
-=end
-
-require 'nokogiri'
-require 'json'
-require 'azdeploy'
+Processes upgrade for a C# code repositoryy
 
-require_relative 'github_api'
-require_relative 'globalconstants'
+=end
 
 class UpgradePackages
 
   UPGRADE_BRANCH = 'upgrade'
 
-  # versions need to be passed in as they are based on a repo_url and branch that's source, likely DP solution
-  def initialize repo_url, branch, versions, config_map
-    @repo_url = repo_url
-    @branch = branch
+  def initialize versions
     @versions = versions
-    @config_map = config_map
-  end
-
-  def validate_inputs
-    return false if @repo_url.to_s.strip.length == 0
-    return false if @branch.to_s.strip.length == 0
-    if (@versions.nil? || @versions.class.to_s != GlobalConstants::HASH)
-      puts 'Version map must be a ' + GlobalConstants::HASH
-      return false
-    end
-    if (@config_map.nil? || @config_map.class.to_s != GlobalConstants::HASH)
-      puts 'Config map must be a ' + GlobalConstants::HASH
-      return false
-    end
-
-    # fail if env vars were not supplied
-    if (!@config_map.has_key? 'env_vars')
-      puts 'Environment variables not supplied. Cannot continue!'
-      return false
-    end
-
-    # fail if metadata was not supplied
-    if (!@config_map.has_key? 'metadata')
-      puts 'Metadata variables not supplied. Cannot continue!'
-      return false
-    end
-
-    # We should do more specific test of which environment variables are we expecting or which metatdata are we expecting
-    #if project publishes nuget we need to check if major /minor/patch incrmeented but not all 3
-    return true
   end
 
   def checkout_upgrade_branch
+
     # obtain an upgrade branch
-    puts 'Getting upgrade branch...'
     if (GithubApi.DoesBranchExist('origin', UPGRADE_BRANCH) != GlobalConstants::EMPTY)
       puts 'Checking out existing upgrade branch...'
       return false if !GithubApi.CheckoutExistingBranch(UPGRADE_BRANCH) == GlobalConstants::EMPTY
@@ -74,54 +26,99 @@ class UpgradePackages
     return true
   end
 
-  def Do
-    return false if !validate_inputs
+  def Do config_map, nuget_targets, is_local_run=false
+
+    @config_map = config_map
+    @repo_url = @config_map.metadata.repo_url
+    @branch = @config_map.metadata.branch
 
     # checkout repo and branch
     return false if !GithubApi.CheckoutRepoAfresh @repo_url, @branch
 
+    # make upgrade branch
     return false if !checkout_upgrade_branch
 
+    # use local nuget path for restore if provided
+    set_local_nuget_target nuget_targets if is_local_run
+
     # replace versions in package config files
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Replacing package versions...'
     pkg_files = Dir.glob '**/packages.config'
-    if (replace_package_versions(pkg_files) == false)
-      puts "Package version replacement failed."
+    if !replace_package_versions(pkg_files)
+      puts GlobalConstants::UPGRADE_PROGRESS + 'Package version replacement failed.'
       return false
     end
 
     # replace versions in project references
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Replacing project versions...'
     proj_files = Dir.glob '**/*.csproj'
-    if (replace_project_versions(proj_files) == false)
-      puts "Project version replacement failed."
+    if !replace_project_versions(proj_files)
+      puts GlobalConstants::UPGRADE_PROGRESS + 'Project version replacement failed.'
       return false
     end
 
     # Check in manifest if project publish nuget? If yes, increment .semver
     # QUESTION: Should this method increment semver even if there is no nuget published?
-    increment_semver_if_publish
+    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
 
     # do rake build to test for compilation errors. This needs ENV vars set, passed in via config
-    set_project_env_vars @config_map['env_vars']
+    set_project_env_vars @config_map.metadata.env_vars
     output = system 'rake'
-    
-    commit_msg = 'Versions updated'
     if output.to_s == 'false'
-        puts '~~/\~~\/~~ Rake Error: There were errors during rake run. ~~\/~~/\~~'
-        # save state
-        commit_msg = 'Versions updated, build failed'      
+      puts GlobalConstants::UPGRADE_PROGRESS + ' Rake Error: There were errors during rake run.'
+      # save state
+      GithubApi.CommitChanges( 'Versions updated, build failed')
+
+      return false
+    end
+
+    # update version map with nuget versions after build success
+    if semver_inc_done
+      update_version_map
+      puts GlobalConstants::UPGRADE_PROGRESS + 'Semver upgraded. Version map updated.'
     end
 
+    if is_local_run
+      puts GlobalConstants::UPGRADE_PROGRESS + 'Local run. No branch update or teamcity build triggered'
+    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
+    end
+
+    true
+  end
+
+  def set_local_nuget_target nuget_targets
+    num_paths = 1;
+    nuget_targets.each { |target|
+      nuget_targets_file = Dir.pwd + '/src/.nuget/Nuget.Config'
+      doc = Nokogiri::XML(File.read nuget_targets_file)
+      node_parent = doc.at_css 'packageSources'
+      node = Nokogiri::XML::Node.new('add', doc)
+      node['key'] = "local_nuget_source#{num_paths}"
+      node['value'] = target
+      node_parent.add_child node
+      File.write nuget_targets_file, doc.to_xml
+      num_paths  += 1
+    }
+  end
+
+  def update_branch
+
     # see if any files changed and commit
     git_status = GithubApi.HaveLocalChanges
-    if (git_status != nil || git_status != GlobalConstants::EMPTY)
-        puts 'Local version changes have been committed'
-        return false if !GithubApi.CommitChanges  commit_msg, git_status
-    else
-        puts 'No local changes exist. Nothing to commit'
+    if git_status != nil || git_status != GlobalConstants::EMPTY
+      puts GlobalConstants::UPGRADE_PROGRESS + 'Local version changes have been committed'
+      return false if !GithubApi.CommitChanges( 'Versions updated')
     end
 
     # rebase and push the branch
-    puts 'Rebasing and pushing...'
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Rebasing and pushing update branch...'
     GithubApi.CheckoutLocal @branch
     GithubApi.RebaseLocal UPGRADE_BRANCH
 
@@ -130,11 +127,11 @@ class UpgradePackages
     # Build failure email will inform concerned team
     git_status = GithubApi.PushBranch(@repo_url, @branch) == GlobalConstants::EMPTY
     if git_status
-      puts "Version upgrade changes have been rebased with #{@repo_url}/#{@branch} and pushed"
+      puts GlobalConstants::UPGRADE_PROGRESS + "Version upgrade changes have been rebased with #{@repo_url}/#{@branch} and pushed"
     else
       GithubApi.PullWithRebase @repo_url, @branch
       GithubApi.PushBranch @repo_url, @branch
-      puts "Push after version upgrade failed for #{@repo_url}/#{@branch}. Pull with rebase done and pushed"
+      puts GlobalConstants::UPGRADE_PROGRESS + "Push after version upgrade failed for #{@repo_url}/#{@branch}. Pull with rebase done and pushed"
       return false
     end
 
@@ -142,12 +139,11 @@ class UpgradePackages
     GithubApi.DeleteLocalBranch UPGRADE_BRANCH
     GithubApi.DeleteRemoteBranch @repo_url, UPGRADE_BRANCH
 
-    # handle configuration changes. The settings file, update hash or TeamCity Params list is passed in through Ctor
-
     true
   end
 
   def replace_package_versions pkg_files
+
     begin
       # iterate each package file, replace version numbers and save
       pkg_files.each{ |file|
@@ -155,19 +151,17 @@ class UpgradePackages
         doc = Nokogiri::XML File.read(file)
         nodes = doc.xpath "//*[@id]"
         nodes.each { |node|
-          if (@versions.has_key?(node['id']))
-            node['version'] = @versions[node['id']]
-            #puts "#{node['id']} #{node['version']}  -- #{@versions[node['id']]}"
-          end
+          node['version'] = @versions[node['id']] if (@versions.has_key?(node['id']))
         }
-
         File.write file, doc.to_xml
       }
     rescue
       puts $!
       return false
     end
+
     return true
+
   end
 
 =begin
@@ -184,6 +178,7 @@ class UpgradePackages
     </Reference>
 =end
   def replace_project_versions proj_files
+
     begin
       # iterate each package file, replace version numbers and save
       proj_files.each{ |file|
@@ -206,7 +201,7 @@ class UpgradePackages
             hint_path_id = id_from_hint_path hint_path_value
             if @versions.has_key? hint_path_id
               hint_path_parts = hint_path_value.split '\\'
-              hint_path_parts[2] = hint_path_id + '.' + @versions[hint_path_id]
+              hint_path_parts[2] = hint_path_id + GlobalConstants::DOT + @versions[hint_path_id]
               hint_path[0].children = hint_path_parts.join '\\'
             end
           end
@@ -217,42 +212,68 @@ class UpgradePackages
       puts $!
       return false
     end
+
     return true
+
   end
 
   def id_from_hint_path path
-    name = path.split('\\')[2].split '.'
+    name = path.split('\\')[2].split GlobalConstants::DOT
     name_without_ver = GlobalConstants::EMPTY
     name.all? {|i|
       if i.to_i == 0
-        name_without_ver += i.to_s + '.'
+        name_without_ver += i.to_s + GlobalConstants::DOT
       end
     }
-    name_without_ver.chomp '.'
+    name_without_ver.chomp GlobalConstants::DOT
   end
 
   def set_project_env_vars envs
-    envs.keys.each { | key |
-      ENV[key] = envs[key]
-    }
+    ENV['AI_InstrumentationKey'] = envs.AI_InstrumentationKey if envs.respond_to? 'AI_InstrumentationKey'
+    ENV['AppClientId'] = envs.AppClientId if envs.respond_to? 'AppClientId'
+    ENV['ConfigSettingsTable'] = envs.ConfigSettingsTable if envs.respond_to? 'ConfigSettingsTable'
+    ENV['env'] = envs.env if envs.respond_to? 'env'
+    ENV['RuntimePath'] = envs.RuntimePath if envs.respond_to? 'RuntimePath'
+    ENV['ServiceName'] = envs.ServiceName if envs.respond_to? 'ServiceName'
+    ENV['SettingsAccount'] = envs.SettingsAccount if envs.respond_to? 'SettingsAccount'
+    ENV['SettingsAccountKey'] = envs.SettingsAccountKey if envs.respond_to? 'SettingsAccountKey'
+    ENV['should_update_settings_connstr'] = envs.should_update_settings_connstr if envs.respond_to? 'should_update_settings_connstr'
+    ENV['unitestconnectionString'] = envs.unitestconnectionString if envs.respond_to? 'unitestconnectionString'
   end
 
-  def increment_semver_if_publish
-    if !is_team_city_run
-      # local run
-      auto_update_local_semver
+  def increment_semver_if_publish is_local_run
+
+    if is_local_run
+      auto_update_semver @config_map.project_name, @config_map.metadata.semver.location, @config_map.metadata.semver.file, @config_map.metadata.semver.dimension
+      return true
     else
-      should_publish_nuget = @config_map['metadata']['ShouldPublishNuget'].downcase
+      should_publish_nuget = @config_map.metadata.should_publish_nuget.downcase
       if should_publish_nuget.eql? 'y'
-        semver_file = @config_map['metadata']['SemverFile']
+        semver_file = @config_map.metadata.semver.file
         if (semver_file != nil && semver_file != GlobalConstants::EMPTY)
           semver_file.capitalize
         end
-        semver_dimension = @config_map['metadata']['SemverDimension']
-        auto_update_semver @config_map['project'], @config_map['metadata']['SemverLocation'], semver_file, semver_dimension
+        auto_update_semver @config_map.project_name, @config_map.metadata.semver.location, semver_file, @config_map.metadata.semver.dimension
+        return true
       else
-        puts '******** Project does not publish nuget.**********'
+        puts GlobalConstants::UPGRADE_PROGRESS + 'Project does not publish nuget.'
       end
     end
+
+    false
+  end
+
+  def update_version_map
+    path = File.join(Dir.pwd, '/build_artifacts/*.nupkg')
+    nugets = Dir.glob path
+    nugets.each { |nuget|
+      full_name = File.basename nuget
+      full_name = full_name.sub! '.nupkg', ''
+      full_name = full_name.sub! '.symbols', '' if full_name.include? '.symbols'
+      dot_pos = full_name.index GlobalConstants::DOT
+      nuget_name = full_name[0..dot_pos-1]
+      nuget_version = full_name[dot_pos+1..full_name.length]
+      @versions[nuget_name] = nuget_version
+    }
   end
 end

data/lib/upgradeall.rb

@@ -12,11 +12,21 @@ class UpgradeAll
   MANIFEST_FILE = 'manifest.json'
 
   # repo_url is where the last known version map and manifest are checked-in
-  def initialize repo_url, branch
+  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
@@ -24,44 +34,99 @@ class UpgradeAll
     return if !GithubApi.CheckoutRepoAfresh @repo_url, @branch
 
     # JSON files converted to hash
-    if File.exist? VERSION_MAP_FILE
-      @remote_version_map = JSON.parse File.read(VERSION_MAP_FILE)
-    end
-
-    if File.exist? MANIFEST_FILE
-      @manifest = JSON.parse File.read(MANIFEST_FILE)
-    end
+    @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 Do
+  def Do input_validator, is_local_run=false
+
+    puts "\n"
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Upgrade 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?
 
     #find version diff. If no changes exist, kick off deploy cycle only
-    puts 'Calculating version diff...'
+    puts GlobalConstants::UPGRADE_PROGRESS + 'Calculating version diff...'
     versions_to_update = version_diff
 
+    # nothing to update
+    if versions_to_update.nil? || versions_to_update.length == 0
+      puts 'No version diff, nothing to upgrade!'
+      return false
+    end
+
+    # 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 = []
+    upgrader = UpgradePackages.new versions_to_update
+
     # if changes exist, cycle through dependency tree and kick off upgrades
-    projects = @manifest['projects']
-    projects.each { | proj |
-      p proj
-      if proj['ShouldUpgrade'].downcase != 'n'
-        p proj
-        puts "================="
+    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} 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
+
+      else
+        puts "#{GlobalConstants::UPGRADE_PROGRESS} Skipping upgrade for project #{node.project_name}..."
       end
-    }
+    end
 
-    # either cycle was unterrupted, a step in upgrade failed or full cycle successfully completed
+    # upgrade completed successfully, update status as unprocessed and save version map and manifest, push
+    reset_status_unprocessed
 
-    # save the version map and manifest
 
     true
   end
 
+  def save version_manifest
+
+  end
+
   def version_diff
 
     # create version map afresh to compare
@@ -77,15 +142,24 @@ class UpgradeAll
       return hash
     end
 
-    #p @remote_version_map
-    #p versions
-
     # compare current and remote versions, obtain changeset
     hash = Hash[*(versions.to_a - @remote_version_map.to_a).flatten]
 
     # return changeset hash
     hash
+  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/version_map.rb

@@ -33,7 +33,7 @@ class VersionMap
 
     # load old versions
     old_versions = {}
-    if (File.exists? VERSIONMAPFILE)
+    if File.exists? VERSIONMAPFILE
       old_versions = JSON.parse File.read(VERSIONMAPFILE)
     end
 
@@ -41,24 +41,25 @@ class VersionMap
     versions = {}
     pkg_files = Dir.glob '**/packages.config'
     pkg_files.each{ |file|
-      puts "Finding packages in: #{file}"
+      #puts "Finding packages in: #{file}"
       doc = Nokogiri::XML File.read(file)
       nodes = doc.xpath "//*[@id]"
       nodes.each { |node|
-        if (!versions[node['id']].nil? && node['version'] != versions[node['id']]['version'])
+
+        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
         versions[node['id']] = node['version']
       }
     }
-    
+
     if Dir.exist?('versioning')
-        update_platform_multiple_semver_package_versions versions
-    else 
-        update_platform_single_semver_package_versions versions
-    end   
+      update_platform_multiple_semver_package_versions versions
+    else
+      update_platform_single_semver_package_versions versions
+    end
 
-    Dir.chdir '..'
+    Dir.chdir GlobalConstants::PARENTDIR
     File.write VERSIONMAPFILE, versions.to_json
 
     versions
@@ -81,7 +82,7 @@ class VersionMap
 
     versions
   end
-  
+
   def update_platform_multiple_semver_package_versions versions
     versions['RelayHealth.DataPlatform.Contracts'] = get_semver 'Contracts.semver'
     versions['RelayHealth.DataPlatform.Framework'] = get_semver 'Framework.semver'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a2zdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies: []
 description: Automated Upgrades Gem. Provides version upgrades, build and deployment
   configuration management
@@ -20,7 +20,9 @@ files:
 - lib/a2zdeploy.rb
 - lib/dependency_tree.rb
 - lib/github_api.rb
-- lib/globalconstants.rb
+- lib/global_constants.rb
+- lib/hash_extensions.rb
+- lib/input_validator.rb
 - lib/proget_api.rb
 - lib/teamcity_api.rb
 - lib/upgrade.rb

data/lib/globalconstants.rb

@@ -1,9 +0,0 @@
-module GlobalConstants
-  HASH = 'Hash'
-  EMPTY = ''
-  SPEC = 'spec'
-  ROOT = 'root'
-  PREVIOUS = 'previous'
-  NEXT = 'next'
-  PROJECT = 'project'
-end