a2zdeploy 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff9f5db9e1c4b5abf2950f59f8ec2f039d89005
-  data.tar.gz: 77c0358fd6d2078746340339eab6af166e13be03
+  metadata.gz: 38ba98ff95182928338ffcb4f056e71a50ed626b
+  data.tar.gz: 7f8566f7bd6ee26798b77ae943025d9eceeab4bd
 SHA512:
-  metadata.gz: 472b463c92a969a930be9e6a37c811af4494e4e3ceb654f2583b257bb3bbe6495b58f746e6839d93fd0485aafad2723a2cf1c7d3fa8a60df360d5c3f61438274
-  data.tar.gz: 4edf184f609ae730e85bb82b5a95d7bcc57d2f7379a77fa8d1d0bc1b53e7163eb07e7c661b88b871d0799508c347b3c0e41122a4199624bb0aad6c1fd6c0cf01
+  metadata.gz: d4d3bac9fdbe431212d12e029c06f6e59e49ff3130236df90f13ee7484f6818f527c6710d215db530f59efcb3a7602faff5b14184f1d362023f51abb14190bdf
+  data.tar.gz: 0412791305d2ab825f289afd002e1eb1de90db383d90c1a5bfac60ef14958fc1fe5d372be8dd288daa0b0e7dd483e23fb0e0c0b88850a79a2da1709efc935e0f

data/a2zdeploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'a2zdeploy'
-  s.version     = '1.0.18'
+  s.version     = '1.0.19'
   s.date        = '2016-02-15'
   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/dependency_tree.rb

@@ -1,10 +1,11 @@
 =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::PROJECTNAME_NAME' are self-descriptive and symbols
-    - GlobalConstants::ROOT's GlobalConstants::PREVIOUS is always nil, so are all leaf node GlobalConstants::NEXT
+    - The keys 'GlobalConstants::NEXT, GlobalConstants::PREVIOUS and GlobalConstants::PROJECTNAME_NAME' are self-descriptive and symbols
+    - GlobalConstants::IS_ROOT's project GlobalConstants::PREVIOUS is always nil, so are all leaf node GlobalConstants::NEXT
     {
-        "GlobalConstants::ROOT" => {
+        "Ontology" => {
             "GlobalConstants::PROJECTNAME" => "Ontology", 
+            "GlobalConstants::IS_ROOT" => "y", 
             "GlobalConstants::NEXT" => "FhirWalker", 
             "GlobalConstants::PREVIOUS" => nil, 
             "metadata" => "[json or another hash]" 
@@ -23,55 +24,52 @@ class DependencyTree
 
   def initialize dependency_map
     @dependency_map = dependency_map
+    @root_node = nil
   end
 
   def root
-    return nil if @dependency_map.nil? || @dependency_map.class.to_s != GlobalConstants::HASH || @dependency_map.empty?
+    return nil if @dependency_map.nil? || !@dependency_map.is_a?(GlobalConstants::HASH) || @dependency_map.empty?
+    return @root_node if !@root_node.nil?
 
-    if @dependency_map.has_key?(GlobalConstants::ROOT)
-      if @dependency_map[GlobalConstants::ROOT].has_key? GlobalConstants::PROJECTNAME
-        root_node = Hashit.new @dependency_map[GlobalConstants::ROOT]
-        root_node
+    @dependency_map.each do |k,v| 
+      if v.has_key?(GlobalConstants::IS_ROOT) && v[GlobalConstants::IS_ROOT].downcase == 'y'
+        root_node = Hashit.new v, k
+        @root_node = root_node
+        return @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 || @dependency_map.empty?
+    return nil if @dependency_map.nil? || !@dependency_map.is_a?(GlobalConstants::HASH) || @dependency_map.empty?
 
-    current = GlobalConstants::ROOT  if @dependency_map[GlobalConstants::ROOT][GlobalConstants::PROJECTNAME] == current
     if @dependency_map[current].has_key? GlobalConstants::NEXT
-      next_node = @dependency_map[current][GlobalConstants::NEXT]
-      next_node = @dependency_map[next_node]
-      next_node = Hashit.new next_node if !next_node.nil?
+      next_node_name = @dependency_map[current][GlobalConstants::NEXT]
+      next_node = @dependency_map[next_node_name]
+      return nil if next_node.nil?
+      return Hashit.new next_node, next_node_name
     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 || @dependency_map.empty?
+    return nil if @dependency_map.nil? || !@dependency_map.is_a?(GlobalConstants::HASH) || @dependency_map.empty?
 
     if @dependency_map[current].has_key? 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
+      prev_node_name = @dependency_map[current][GlobalConstants::PREVIOUS]
+      prev_node = @dependency_map[prev_node_name]
       return nil if prev_node.nil?
-      return Hashit.new prev_node
+      return Hashit.new prev_node, prev_node_name
     end
   end
 
   def traverse
-    current = GlobalConstants::ROOT
-    current = @dependency_map[current]
-    current = Hashit.new current
+    current = root
     yield current
     while current != nil
       begin
-        current = next_node current.project_name
+        current = next_node current._node_name
       rescue
         #puts $!
         current = nil

data/lib/global_constants.rb

@@ -1,10 +1,10 @@
 module GlobalConstants
 
-  HASH = 'Hash'
+  HASH = Hash
 
   SPEC = Dir.pwd + '\src\spec'
 
-  ROOT = 'root'
+  IS_ROOT = 'is_root'
   PREVIOUS = 'previous'
   NEXT = 'next'
   PROJECTNAME = 'project_name'

data/lib/hash_extensions.rb

@@ -1,9 +1,14 @@
 class Hashit
-  def initialize(hash)
+  def initialize(hash, node_name=nil)
+    if !node_name.nil?
+      self.instance_variable_set("@_node_name", node_name)
+      self.class.send(:define_method, "_node_name", proc{self.instance_variable_get("@_node_name")}) if !self.respond_to?("_node_name")
+      self.class.send(:define_method, "_node_name=", proc{|node_name| self.instance_variable_set("@_node_name", node_name)}) if !self.respond_to?("_node_name=")
+    end
     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)})
+      self.instance_variable_set("@#{k}", v.is_a?(Hash) ? Hashit.new(v, k) : v)
+      self.class.send(:define_method, k, proc{self.instance_variable_get("@#{k}")}) if !self.respond_to?("#{k}")
+      self.class.send(:define_method, "#{k}=", proc{|v| self.instance_variable_set("@#{k}", v)}) if !self.respond_to?("#{k}=")
     end
   end
 end

data/lib/input_validator.rb

@@ -12,7 +12,7 @@ class InputValidator
   #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
+    if version_map.nil? || !version_map.is_a?(GlobalConstants::HASH)
       yield 'Version map must be a non-empty ' + GlobalConstants::HASH
     end
   end

data/lib/rollbackall.rb

@@ -82,7 +82,7 @@ class RollbackAll
     nuget_targets = []
 
     # TODO: This validation could probably go in an input validator specifically for rollback
-    rollback_config = @manifest['projects']['root']['metadata'].IsRollback
+    rollback_config = @manifest['is_rollback'].IsRollback
     rollback = !rollback_config.nil? and rollback_config.downcase == 'y'
     if !rollback
       puts 'IsRollback not set in manifest, aborting rollback.'
@@ -110,10 +110,7 @@ class RollbackAll
         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
+        node_name = node._node_name
 
         # project status set in json
         if upgrade_status
@@ -135,7 +132,7 @@ class RollbackAll
     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'
+    @manifest['is_rollback'] = 'n'
     reset_status_unprocessed
 
 

data/lib/upgradeall.rb

@@ -95,8 +95,7 @@ class UpgradeAll
       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)
+      node_name = node._node_name
 
       # set project status in json
       if upgrade_status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a2zdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Suresh Batta
@@ -17,6 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
+- ReadMe.md
+- a2zdeploy.gemspec
 - lib/a2zdeploy.rb
 - lib/dependency_tree.rb
 - lib/github_api.rb
@@ -30,10 +34,6 @@ files:
 - lib/upgrade.rb
 - lib/upgradeall.rb
 - lib/version_map.rb
-- a2zdeploy.gemspec
-- ReadMe.md
-- Gemfile
-- Gemfile.lock
 homepage: http://rubygems.org/gems/a2zdeploy
 licenses:
 - MIT
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Given a project dependency chain, updates versions, builds, tests, manages