a2zdeploy 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656504962b735898ba85ed8e1c715431329f537c
-  data.tar.gz: fc4fc73779d3e03b67c83b02689127fca55aac53
+  metadata.gz: 3f05346bc3f5cea73f05b1649fa634d19abed1ae
+  data.tar.gz: 535e19fb386f8a297144c6a0dbe3c7247c318297
 SHA512:
-  metadata.gz: 5ce920980c295dc247a08c17ea188755f0bfa516457ca7299bb3dfdf9d53d23d13c1befcb4f956bff70e867636d1bbaada258e456d4685e9b529905a5e1aa234
-  data.tar.gz: 85e8d160e622b48a0ba863c0d2c6ba2b819996fd863539f192fe8fe1f6da5f3bbfaf9a322dcc999faca860c78ba03a84de4ff3c129f8a4861b738771f53b7f11
+  metadata.gz: 3badb1ab50f242f7197975f4caef07829e2ca3d1ad41831ec494e4c1af8662bc3fc3690256fd6f9b6da7313b9fac8fe8e5e834a2dd6818f334f336b931619d8c
+  data.tar.gz: 6fa9b29b513dad46ca02f61f5cbd29ba99442c7bd71a43a8caea4c9c5563b4ed426c48eedf66337b4fa34f11761146e3956705c93b456c9f6eca845c14e07ea5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    a2zdeploy (1.0.11)
+    a2zdeploy (1.0.12)
 
 GEM
   remote: http://rubygems.org/

data/a2zdeploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'a2zdeploy'
-  s.version     = '1.0.12'
+  s.version     = '1.0.13'
   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

@@ -26,93 +26,101 @@ class InputValidator
       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
+    @node_name = 'manifest'
+    yield @simple_validator.method_exists manifest, 'version_source'
+    yield @simple_validator.method_value_not_nil manifest, 'version_source'
+    yield @simple_validator.method_exists manifest.version_source, 'repo_url'
+    yield @simple_validator.method_value_not_nil_or_empty manifest.version_source, 'repo_url'
+    yield @simple_validator.method_exists manifest.version_source, 'branch'
+    yield @simple_validator.method_value_not_nil_or_empty manifest.version_source, 'branch'
+    yield @simple_validator.method_exists manifest, 'projects'
+    yield @simple_validator.method_value_not_nil manifest, 'projects'
   end
 
   def validate_project_node project
 
-    node_name = '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
+    # ensure is_root value's boolean only if the key exists
+    msg = @simple_validator.method_exists project, 'is_root'
+    if msg.nil?
+      msg = @simple_validator.method_value_not_nil_or_empty project, 'is_root'
+      project.metadata.is_root = project.metadata.is_root.downcase == 'y' if msg.nil?
+    else
+      yield msg
+    end
 
-    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
+    # previous and next keys are required, their values are not
+    yield @simple_validator.method_exists project, 'next'
+    yield @simple_validator.method_exists project, 'previous'
 
-    yield @simple_validator.method_exists project.metadata, 'branch', node_name
-    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'branch', node_name
+    @node_name = 'project.metadata'
+    yield @simple_validator.method_exists project.metadata, 'repo_url'
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'repo_url'
 
-    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, 'branch'
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'branch'
 
-    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_upgrade'
+    msg = @simple_validator.method_value_not_nil_or_empty project.metadata, 'should_upgrade'
+    project.metadata.should_upgrade = project.metadata.should_upgrade.downcase == 'y' if msg.nil?
+    yield msg
 
-    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, 'should_publish_nuget'
+    msg = @simple_validator.method_value_not_nil_or_empty project.metadata, 'should_publish_nuget'
+    project.metadata.should_publish_nuget = project.metadata.should_publish_nuget.downcase == 'y' if msg.nil?
+    yield msg
 
-    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, 'env_vars'
+    yield @simple_validator.method_value_not_nil project.metadata, 'env_vars'
 
-    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, 'status'
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata, 'status'
 
-    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
+    yield @simple_validator.method_exists project.metadata, 'build_configuration_id'
+    yield @simple_validator.method_exists project.metadata, 'build_wait_time_in_secs'
 
-    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
+    @node_name = 'project.metadata.env_vars'
+    yield @simple_validator.method_exists project.metadata.env_vars, 'env'
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'env'
 
-    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
+    yield @simple_validator.method_exists project.metadata.env_vars, 'service_name'
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'service_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, 'AI_InstrumentationKey'
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'AI_InstrumentationKey'
 
-      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, 'AppClientId'
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'AppClientId'
 
-      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, 'RuntimePath'
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'RuntimePath'
 
-      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, 'SettingsAccount'
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'SettingsAccount'
 
-      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, 'SettingsAccountKey'
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'SettingsAccountKey'
 
-      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, 'unitestconnectionString'
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'unitestconnectionString'
 
-      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
+      yield @simple_validator.method_exists project.metadata.env_vars, 'should_update_settings_connstr'
+      yield @simple_validator.method_value_not_nil_or_empty project.metadata.env_vars, 'should_update_settings_connstr'
     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
+    @node_name = 'project.metadata.semver'
+    yield @simple_validator.method_exists project.metadata, 'semver'
+    yield @simple_validator.method_value_not_nil project.metadata, 'semver'
+    yield @simple_validator.method_exists project.metadata.semver, 'file'
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata.semver, 'file'
 
-    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, 'dimension'
+    yield @simple_validator.method_value_not_nil_or_empty project.metadata.semver, 'dimension'
 
-    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
+    # location key required not value
+    yield @simple_validator.method_exists project.metadata.semver, 'location'
 
   end
 
@@ -126,35 +134,36 @@ class SimpleValidator
   CANNOT_CONTINUE = '. Cannot continue!'
   IS_MISSING = ' is missing'
 
-  def method_exists object, method, name
+  def method_exists object, method
     begin
       if !object.respond_to? method
-        "#{name}\'s method: *#{method}*" + IS_MISSING
+        "#{@node_name}\'s method: *#{method}*" + IS_MISSING
       end
     rescue
       nil
     end
   end
 
-  def method_value_not_nil_or_empty object, method, name
+  def method_value_not_nil_or_empty object, method
     begin
       value = object.send method
-      if value == nil || value.to_s.strip.length == 0
-        "#{name}\'s *#{method}* value is empty or" + IS_MISSING
+      if value.nil? || value.to_s.strip.length == 0
+        "#{@node_name}\'s *#{method}* value is empty or" + IS_MISSING
       end
     rescue
       nil
     end
   end
 
-  def method_value_not_nil object, method, name
+  def method_value_not_nil object, method
     begin
       value = object.send method
-      if value == nil
-        "#{name}\'s *#{method}* value" + IS_MISSING
+      if value.nil?
+        "#{@node_name}\'s *#{method}* value" + IS_MISSING
       end
     rescue
       nil
     end
   end
+  
 end

data/lib/proget_api.rb

@@ -1,28 +1,28 @@
 
-def is_package_published packageName, packageVersion, timeout
-  packageLocationUri = "http://nuget2.relayhealth.com/nuget/Carnegie/Packages(Id='#{packageName}',Version='#{packageVersion}')"
-  counter = timeout
-  i = 0
-  found = false;
+class ProgetApi
+  def is_package_published packageName, packageVersion, timeout
+    packageLocationUri = "http://nuget2.relayhealth.com/nuget/Carnegie/Packages(Id='#{packageName}',Version='#{packageVersion}')"
+    counter = timeout
+    i = 0
+    found = false;
 
-  while i < counter
-    response = Net::HTTP.get_response(URI packageLocationUri)
-    xmldoc = Nokogiri::XML response.body
-    entry = xmldoc.css "entry id"
-    if entry.to_s.include? packageLocationUri
-      puts "Found #{packageName}-#{packageVersion}"
-      found = true
-      break
+    while i < counter
+      response = Net::HTTP.get_response(URI packageLocationUri)
+      xmldoc = Nokogiri::XML response.body
+      entry = xmldoc.css "entry id"
+      if entry.to_s.include? packageLocationUri
+        puts "Found #{packageName}-#{packageVersion}"
+        found = true
+        break
+      end
+      sleep 1
+      i += 1
     end
-    sleep 1
-    i += 1
-  end
 
-  if found == false
-    puts "Not found #{packageName}-#{packageVersion}"
-  end
+    puts "Not found #{packageName}-#{packageVersion}" if !found
 
-  return found
+    found
+  end
 end
 
 # Sample Usage

data/lib/rollback.rb

@@ -31,7 +31,7 @@ class RollbackUpgrade
   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
+    if @config_map.metadata.should_publish_nuget && 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}"
@@ -50,7 +50,7 @@ class RollbackUpgrade
     end
 
     # check hashes for version upgrade commit message
-    if !commit_hashes.any?{ |c_hash| GithubApi.ShowCommitInfoLocal(c_hash).include? UpgradePackages::VERSION_UPGRADE_COMMIT }
+    if !commit_hashes.any?{ |c_hash| GithubApi.ShowCommitInfoLocal(c_hash).include? Upgrade::VERSION_UPGRADE_COMMIT }
       puts `No version upgrade commit detected to roll back, aborting rollback.`
       return false
     end

data/lib/rollbackall.rb

@@ -88,14 +88,14 @@ class RollbackAll
       puts 'IsRollback not set in manifest, aborting rollback.'
       return false
     end
-    upgrader = UpgradePackages.new versions_to_update, rollback
+    upgrader = Upgrade.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'
+      if node.metadata.should_upgrade
         puts "#{GlobalConstants::UPGRADE_PROGRESS} Processing project #{node.project_name}..."
 
         # validate project node

data/lib/upgrade.rb

@@ -4,7 +4,7 @@ Processes upgrade for a C# code repositoryy
 
 =end
 
-class UpgradePackages
+class Upgrade
 
   UPGRADE_BRANCH = 'upgrade'
   BACKUP_BRANCH = 'upgradeBackupDoNotDelete'
@@ -33,7 +33,7 @@ class UpgradePackages
   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
+    if @config_map.metadata.should_publish_nuget && 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}"
@@ -95,7 +95,7 @@ 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
-    nuget_targets << Dir.pwd + '/build_artifacts' if @config_map.metadata.should_publish_nuget.downcase == 'y'
+    nuget_targets << Dir.pwd + '/build_artifacts' if @config_map.metadata.should_publish_nuget
 
     # Tag commit
     recent_commit_hash = GithubApi.GetRecentCommitHash(@branch)
@@ -116,7 +116,8 @@ class UpgradePackages
 
     # update version map with nuget versions after build success
     if semver_inc_done
-      update_version_map
+      nuget_versions = update_version_map '/build_artifacts/*.nupkg'
+      @versions.merge! nuget_versions
       puts GlobalConstants::UPGRADE_PROGRESS + 'Semver upgraded. Version map updated.'
     end
 
@@ -290,8 +291,7 @@ class UpgradePackages
       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.should_publish_nuget.downcase
-      if should_publish_nuget.eql? 'y'
+      if @config_map.metadata.should_publish_nuget
         semver_file = @config_map.metadata.semver.file
         if (semver_file != nil && semver_file != GlobalConstants::EMPTY)
           semver_file.capitalize
@@ -306,8 +306,8 @@ class UpgradePackages
     false
   end
 
-  def update_version_map
-    path = File.join(Dir.pwd, '/build_artifacts/*.nupkg')
+  def update_version_map path
+    path = File.join(Dir.pwd, path)
     nugets = Dir.glob path
     nugets.each { |nuget|
       full_name = File.basename nuget
@@ -316,7 +316,8 @@ class UpgradePackages
       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
+      versions[nuget_name] = nuget_version
     }
+    versions
   end
 end

data/lib/upgradeall.rb

@@ -39,7 +39,7 @@ class UpgradeAll
     Dir.chdir GlobalConstants::PARENTDIR
   end
 
-  def Do input_validator, is_local_run=false
+  def Do input_validator, is_local_run = false
 
     GithubApi.SetPushDefaultSimple
 
@@ -70,8 +70,8 @@ class UpgradeAll
     end
     raise StandardError, validation_error_message(validation_errors) if validation_errors.length > 0
 
-    nuget_targets = []
-    upgrader = UpgradePackages.new versions_to_update
+    nuget_targets = nuget_targets_in_env_if_any
+    upgrader = Upgrade.new versions_to_update
 
     # if changes exist, cycle through dependency tree and kick off upgrades
     puts GlobalConstants::UPGRADE_PROGRESS + 'Navigating projects...'
@@ -98,14 +98,14 @@ class UpgradeAll
       node_name = node.project_name
       node_name = GlobalConstants::ROOT if (node.respond_to?('is_root') && node.is_root == 'true')
 
-      # project status set in json
+      # set project status 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 node.metadata.build_wait_time_in_secs if node.metadata.should_publish_nuget.downcase == 'y'
+        waitfor node.metadata.build_wait_time_in_secs if node.metadata.should_publish_nuget
       else
         # either cycle was unterrupted, a step in upgrade failed or full cycle successfully completed
         # save the version map and manifest
@@ -125,8 +125,15 @@ class UpgradeAll
     true
   end
 
+  def nuget_targets_in_env_if_any
+    existing_targets = ENV['nuget_targets'] if !ENV['nuget_targets'] != nil || ENV['nuget_targets'] != GlobalConstants::EMPTY
+    target_list = []
+    target_list = existing_targets.split(',') if existing_targets != nil
+    target_list
+  end
+
   def check_should_upgrade node
-    status = node.metadata.should_upgrade.downcase == 'y'
+    status = node.metadata.should_upgrade
     puts GlobalConstants::UPGRADE_PROGRESS + " Skipping upgrade for project #{node.project_name}..." if !status
     status
   end

data/lib/version_map.rb

@@ -50,7 +50,7 @@ class VersionMap
       }
     }
 
-    if Dir.exist?('versioning')
+    if Dir.exist? 'versioning'
       update_platform_multiple_semver_package_versions versions
     else
       update_platform_single_semver_package_versions versions
@@ -105,13 +105,9 @@ class VersionMap
 
   def get_semver semver
     ver = load_semver File.join('versioning', semver)
-    v = ver.to_s.sub 'v', ''    # removes 'v' at start of string which isn't expected for version spec in .package and .csproj files
+    # remove 'v' at start of string which isn't expected for version spec in .package and .csproj files
+    v = ver.to_s.sub 'v', ''
     v
   end
 
-end
-
-#puts "test"
-#vm = VersionMap.new
-#versions = vm.version_map "http://", "master"
-#version_map("http://ndhaxpgit01.mckesson.com/Carnegie/RelayHealth.DataPlatform.git", "master")
+end

metadata

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