a2zdeploy 1.0.0 → 1.0.2

data/lib/upgrade.rb

@@ -14,9 +14,10 @@ Inputs:
 
 require 'nokogiri'
 require 'json'
+require 'azdeploy'
+
 require_relative 'github_api'
 require_relative 'globalconstants'
-require_relative 'version'
 
 class UpgradePackages
 
@@ -47,7 +48,7 @@ class UpgradePackages
       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!'
@@ -64,10 +65,10 @@ class UpgradePackages
     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
+      return false if !GithubApi.CheckoutExistingBranch(UPGRADE_BRANCH) == GlobalConstants::EMPTY
     else
       puts 'Checking out new upgrade branch...'
-      return false if !GithubApi.CheckoutNewBranch UPGRADE_BRANCH == GlobalConstants::EMPTY
+      return false if !GithubApi.CheckoutNewBranch(UPGRADE_BRANCH) == GlobalConstants::EMPTY
     end
 
     return true
@@ -94,26 +95,29 @@ class UpgradePackages
       puts "Project version replacement failed."
       return false
     end
-    
-    # Check in manifest if project publish nuget? If yes, increment .semver    
+
+    # 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
-    
+
     # 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']
     output = system 'rake'
+    
+    commit_msg = 'Versions updated'
     if output.to_s == 'false'
-      puts '~~/\~~\/~~ Rake Error: There were errors during rake run. ~~\/~~/\~~'
-      # save state
-      GithubApi.CommitChanges( 'Versions updated, build failed')
-
-      return false
+        puts '~~/\~~\/~~ Rake Error: There were errors during rake run. ~~\/~~/\~~'
+        # save state
+        commit_msg = 'Versions updated, build failed'      
     end
 
     # 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( 'Versions updated')
+        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'
     end
 
     # rebase and push the branch
@@ -232,23 +236,23 @@ class UpgradePackages
       ENV[key] = envs[key]
     }
   end
-  
+
   def increment_semver_if_publish
     if !is_team_city_run
-        # local run
-        auto_update_local_semver
+      # local run
+      auto_update_local_semver
     else
-        should_publish_nuget = @config_map['metadata']['ShouldPublishNuget'].downcase
-        if should_publish_nuget.eql? 'y'
-            semver_file = @config_map['metadata']['SemverFile']
-            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
-        else
-            puts '******** Project does not publish nuget.**********'
+      should_publish_nuget = @config_map['metadata']['ShouldPublishNuget'].downcase
+      if should_publish_nuget.eql? 'y'
+        semver_file = @config_map['metadata']['SemverFile']
+        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
+      else
+        puts '******** Project does not publish nuget.**********'
+      end
     end
   end
 end

data/lib/upgradeall.rb

@@ -5,17 +5,12 @@ code repository level framework upgrade and service deployments
 
 =end
 
-require_relative 'github_api'
-require 'json'
-
 class UpgradeAll
 
   VERSION_MAP_FILE = 'versionmap.json'
+  # todo: remove the up one level path
   MANIFEST_FILE = 'manifest.json'
 
-  # JSON files converted to hash
-  attr_accessor :version_map, :manifest
-
   # repo_url is where the last known version map and manifest are checked-in
   def initialize repo_url, branch
 
@@ -28,9 +23,11 @@ class UpgradeAll
 
     return if !GithubApi.CheckoutRepoAfresh @repo_url, @branch
 
+    # JSON files converted to hash
     if File.exist? VERSION_MAP_FILE
-      @version_map = JSON.parse File.read(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
@@ -39,33 +36,56 @@ class UpgradeAll
 
   def Do
 
-    return if @version_map.nil || @manifest.nil
-
     # retrieve version map and upgrade manifest
     retrieve_artifacts
 
-    # if no changes exist, kick off deploy cycle only
+    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...'
+    versions_to_update = version_diff
 
     # 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 "================="
+      end
+    }
 
     # either cycle was unterrupted, a step in upgrade failed or full cycle successfully completed
+
     # save the version map and manifest
 
+    true
   end
 
   def version_diff
 
     # create version map afresh to compare
     vm = VersionMap.new
-    repo_url = @manifest['version_source']
-    versions = vm.version_map repo_url, 'master'
+    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 @version_map.nil
+    if @remote_version_map.nil?
+      File.write VERSIONMAPFILE, versions.to_json
+      GithubApi.PushBranch @repo_url, @branch
 
+      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
 
 end

data/lib/version_map.rb

@@ -21,12 +21,6 @@
     3. Uniquefy list to a hash map and return
 =end
 
-require 'json'
-require 'nokogiri'
-require 'semver'
-require_relative 'github_api'
-require_relative 'version'
-
 class VersionMap
 
   VERSIONMAPFILE = 'versionmap.json'
@@ -52,13 +46,17 @@ class VersionMap
       nodes = doc.xpath "//*[@id]"
       nodes.each { |node|
         if (!versions[node['id']].nil? && node['version'] != versions[node['id']]['version'])
-          puts "======Error: Package #{node['id']} with version #{node['version']} has a different pre-exisiting version: #{versions[node['id']]['version']} in #{versions[node['id']]['file']}"
+          puts "======Error: Package #{node['id']} with version #{node['version']} has a different pre-exisiting version: #{versions[node['id']]}"
         end
         versions[node['id']] = node['version']
       }
     }
-
-    update_platform_package_versions versions
+    
+    if Dir.exist?('versioning')
+        update_platform_multiple_semver_package_versions versions
+    else 
+        update_platform_single_semver_package_versions versions
+    end   
 
     Dir.chdir '..'
     File.write VERSIONMAPFILE, versions.to_json
@@ -67,8 +65,24 @@ class VersionMap
 
   end
 
-  # these versions will need to be replaced with project specific semvers
-  def update_platform_package_versions versions
+  def update_platform_single_semver_package_versions versions
+    ver = load_semver '.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
+    version = v
+    versions['RelayHealth.DataPlatform.Contracts'] = version
+    versions['RelayHealth.DataPlatform.Framework'] = version
+    versions['RelayHealth.DataPlatform.Framework.Messaging'] = version
+    versions['RelayHealth.DataPlatform.Framework.Web'] = version
+    versions['RelayHealth.DataPlatform.Identity'] = version
+    versions['RelayHealth.DataPlatform.Management'] = version
+    versions['RelayHealth.DataPlatform.Management.Tools'] = version
+    versions['RelayHealth.DataPlatform.Test'] = version
+    versions['RelayHealth.DataPlatform.Test.Messaging'] = version
+
+    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'
     versions['RelayHealth.DataPlatform.Framework.Messaging'] = get_semver 'Framework.Messaging.semver'
@@ -84,12 +98,19 @@ class VersionMap
 
     versions
   end
-end
 
-def get_semver semver
+  def load_semver path
+    v = SemVer.new
+    v.load path
+    v
+  end
+
+  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
     v
+  end
+
 end
 
 #puts "test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a2zdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies: []
 description: Automated Upgrades Gem. Provides version upgrades, build and deployment
   configuration management
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/a2zdeploy.rb
 - lib/dependency_tree.rb
 - lib/github_api.rb
 - lib/globalconstants.rb
@@ -24,17 +25,9 @@ files:
 - lib/teamcity_api.rb
 - lib/upgrade.rb
 - lib/upgradeall.rb
-- lib/version.rb
 - lib/version_map.rb
-- spec/dependency_tree_spec.rb
-- spec/github_api_spec.rb
-- spec/packages.config
-- spec/proj.csproj
-- spec/upgradeall_spec.rb
-- spec/upgrade_spec.rb
-- spec/version_map_spec.rb
 - a2zdeploy.gemspec
-- rakefile.rb
+- ReadMe.md
 homepage: http://rubygems.org/gems/a2zdeploy
 licenses:
 - MIT

data/lib/version.rb

@@ -1,266 +0,0 @@
-require 'net/http'
-require 'pathname'
-
-# url template of file to check for version info with repo, branch and file path to replace
-URLTEMPLATE ||= "%s/raw/%s/%s"
-
-def get_file_list path, extension
-    return Dir.glob("#{path}/*.#{extension}")
-end
-
-def get_repo_version semver
-    remote_name = get_remote_name
-    branch_name = get_branch_name
-    url = URLTEMPLATE % [remote_name, branch_name, semver]
-    page_content = open(url)
-    repo_version = get_semver_version(page_content)
-    return repo_version
-end
-
-def get_current_version path, semver
-    location = File.join path, semver
-    content = File.read(location)
-    current_version = get_semver_version(content)
-    return current_version
-end
-
-def open(url)
-  Net::HTTP.get(URI.parse(url))
-end
-
-def get_semver_version(content)
-    s = content.split("\n")
-    val = ''
-    s.each{ |i|
-        if (i.start_with?(':'))
-            x = i.split(': ')[1].strip
-            x.gsub!("'", '')
-            if (x.length != 0)
-                val = val + x.to_s + '.'
-            end
-        end
-    }
-    val.chomp('.')
-end
-
-def same_versions version1, version2
-    return version1 == version2
-end
-
-def is_team_city_run
-    return ENV['BUILD_VCS_NUMBER'] != nil
-end
-
-#desc 'Check that Semver version bump task should not be invoked from teamcity'
-def get_branch_name
-    current_branch = ENV['GIT_BRANCH_NAME']
-    if current_branch.nil?
-        raise '********GIT_BRANCH_NAME environment variable required for local rake run. Cannot continue with build. Exiting..............********'
-    else 
-        return current_branch
-    end
-end
-
-def get_remote_name
-    remote_name = ENV['GIT_REMOTE_NAME']
-    if remote_name.nil?
-        raise '********GIT_REMOTE_NAME environment variable required for local rake run. Cannot continue with build. Exiting..............********'
-    else 
-        @remote = `git remote -v`.split("\n")
-        @remote.each { |val|
-            if val =~ /#{remote_name}/
-                return val.split(" ")[1]
-            end
-        }
-    end    
-end
-
-def fetch_updated_semver 
-    
-    updated_semver = get_update_semver_file_with_versions
-    
-    #for local run user did not increment any semver
-    if updated_semver[3] == 0
-        puts '*********** No semver incremented detected. ***********'
-        return nil
-    end 
-    
-    version_remote = updated_semver[1].split('.')
-    version_local = updated_semver[2].split('.')
-    
-    incremented = is_semver_incremented version_remote, version_local
-    
-    [updated_semver[0].gsub("#{VERSIONING}/", ''), incremented]  
-end
-
-def is_semver_incremented version_remote, version_local
-    is_incremented = [version_local[0].to_i - version_remote[0].to_i > 0, version_local[1].to_i - version_remote[1].to_i > 0, version_local[2].to_i - version_remote[2].to_i > 0]
-    
-    if is_incremented[0]
-        if (version_local[1] != 0 || version_local[2] != 0)
-            raise 'Error - major version is incremented. Minor and Patch should be 0. Cannot continue build. Exiting....'
-        end
-    end
-    
-    if is_incremented[1]
-        if is_incremented[0]
-            raise 'Error - cannot increment both major and minor version. . Exiting....'
-        end
-    end
-    
-    if is_incremented[2]
-        if(is_incremented[0] || is_incremented[1])
-            raise 'Error - cannot increment major, minor and patch together. . Exiting....'
-        end
-    end 
-    
-    if is_incremented[0]
-        return 'major'
-    elsif is_incremented[1]
-        return 'minor'
-    elsif is_incremented[2]
-        return 'patch'
-    end
-end
-
-def get_update_semver_file_with_versions
-    count = 0
-    semver_file = ''
-    version_remote = ''
-    version_local = ''
-    
-    semvers = get_file_list VERSIONING, 'semver'
-    if(semvers.empty?)
-        raise "************Error - no semver files found at #{VERSIONING}********"
-    end
-    
-    semvers.each { |semver|
-        v1 = get_repo_version semver        
-        v2 = get_current_version VERSIONING, semver.gsub("#{VERSIONING}/", '')
-        
-        if (!same_versions(v1, v2))
-            puts "#{semver} version changed"
-            semver_file = semver
-            version_remote = v1
-            version_local = v2
-            count = count + 1
-        end
-    } 
-    if count > 1
-        raise '*********** Error - Version increment is expected in a single semver file and can be only one of major|minor|patch ************'
-        return
-    end    
-    
-    [semver_file, version_remote, version_local, count]
-end
-
-
-def get_project_dependencies csproj
-    proj_files = Dir.glob '**/*.csproj'
-    @unique_list = Array.new
-    proj_files.each{ |file|
-        doc = Nokogiri::XML File.read file
-        nodes = doc.search 'ProjectReference'
-        nodes.each { |node|            
-            ref_val = node['Include']
-            id = ref_val.split('\\')[2]
-            if id.eql? csproj
-                @unique_list << file.split('/')[2]
-            end
-        }
-    }
-    @unique_list.uniq       
-end
-
-def get_project_dependencies_semver_files projects_dependencies, semver_project_map
-    project_semver_map = semver_project_map.invert
-    @values  = Array.new
-    projects_dependencies.each { |dependency|
-        if semver_project_map.value?(dependency)
-            @values << project_semver_map[dependency]
-        end
-    }
-    @values
-end
-
-def load_semver path
-    v = SemVer.new
-    v.load path
-    return v
-end
-
-# Increment the major, minor, or patch of the .semver file.
-def increment_version semver_file, dimension
-    if dimension.nil?
-        raise 'The parameter dimension is required to be one of : major | minor | patch'
-    end
-    semver = load_semver semver_file
-        
-    case dimension
-        when 'major'
-            semver.major += 1
-            semver.minor =  0
-            semver.patch =  0
-        when 'minor'
-            semver.minor += 1
-            semver.patch =  0
-        when 'patch'
-            semver.patch += 1
-        else
-            raise "The parameter #{dimension} is invalid: major | minor | patch"
-    end
-    
-    hash = "---\n:major: %s\n:minor: %s\n:patch: %s\n:special: '%s'\n:metadata: '%s'"
-    value = hash % [semver.major, semver.minor, semver.patch, semver.special, semver.metadata]
-    File.write semver_file, value
-end
-
-def create_semver_project_map product, semver_location
-    semver_project_map = Hash.new
-    
-    rake_list = get_file_list semver_location, 'semver'
-    rake_list.each{ |rakefile|
-        rake = rakefile.gsub("#{semver_location}/", '')
-        project_name = rake.gsub('.semver', '')
-        semver_project_map[rake] = "#{product}.#{project_name}.csproj"
-    }    
-    semver_project_map
-end
-
-def display_local_changes_to_user
-    git_status = `git status -s`
-    if (git_status != nil || git_status != GlobalConstants::EMPTY)
-      puts '********** Local semver/s updated. Please commit the change.'
-    end
-end
-
-def update_dependent_semvers product, semver_location, semver_file, dimension
-    semver_project_map = create_semver_project_map product, semver_location
-    projects_dependencies =  get_project_dependencies semver_project_map[semver_file]
-    semver_files = get_project_dependencies_semver_files projects_dependencies, semver_project_map
-    semver_files.each { |semver|        
-        increment_version File.join(semver_location, semver), dimension
-    }
-end
-
-def auto_update_semver project_name, semver_location, semver_file, semver_dimension   
-    Dir.chdir project_name if File.basename(Dir.pwd) != project_name
-    if(semver_file.nil? || semver_file.strip == '' || semver_file == '.semver')
-        increment_version '.semver', semver_dimension    
-    else
-        increment_version File.join(semver_location, semver_file), semver_dimension
-        update_dependent_semvers project_name, semver_location, semver_file, semver_dimension
-    end
-end
-
-def auto_update_local_semver 
-    if(!Dir.exist?(VERSIONING) || File.exist?('.semver'))
-        raise 'Error - local upgrade process only applies to projects with multiple semvers. If you have one semver at root level, please update it manually if needed. Do not invoke auto_update_local_semver task.'
-    end
-    updated_semver_with_version_state = fetch_updated_semver
-    if updated_semver_with_version_state != nil
-        update_dependent_semvers PRODUCT, VERSIONING, updated_semver_with_version_state[0], updated_semver_with_version_state[1]
-    end  
-    
-    display_local_changes_to_user
-end