terraorg 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46107b71a1eace06c51463513c5b495b9549ec19ebc911103ec0d7f236fec6f8
-  data.tar.gz: b05708c67d359a3040eca8724140603d5c4debd6e2f1a25c87034e8a9b60e7be
+  metadata.gz: 2104b8065449ba79b76d2186b17ba12df520939976a78e89baffdb480003c1a4
+  data.tar.gz: 5fed899d94b706ec33a93355facfa444a37275b0632dd738d96e0da9f3a142bf
 SHA512:
-  metadata.gz: 9f9286df25676340a5e3a36221f5b7de4ed21cce63281850210f18b360474544e453939b8b4559dec6cb58dfa0b9ce5facca21570f03295cb5f9d0b5c56eff57
-  data.tar.gz: 196d63d8df921c54216511ee7604b6ec8f8813241609a1fb0c4fa5480d965c4d2e9f0b2042a0f55a46b1fbaa8cb633f50317608afbf68f71d42b8b00fc877f83
+  metadata.gz: 6abcbaf53d3205dc7e680015e6bf9cb52d727a9cfac507c6b797f47adc704a7b83b6777a2f53b99a8db9abb37666196439b3b20bfad53fee44fb8812fee83156
+  data.tar.gz: 371bd8f5f19db6add483887aeefba418cf67dfcef48ec76a3ee506a168fdf543f439d330d0431c9a38d22a6c0b5ab3826993e2a95919461edd7ca3b1b7991f0f

data/bin/terraorg

@@ -32,6 +32,7 @@ ACTIONS = [
 ].freeze
 
 STRICT_VALIDATION = ENV.fetch('TERRAORG_STRICT_VALIDATION', 'true')
+ALLOW_ORPHANED_ASSOCIATES = ENV.fetch('ALLOW_ORPHANED_ASSOCIATES', 'false')
 SQUADS_FILE = ENV.fetch('TERRAORG_SQUADS', 'squads.json')
 PLATOONS_FILE = ENV.fetch('TERRAORG_PLATOONS', 'platoons.json')
 ORG_FILE = ENV.fetch('TERRAORG_ROOT', 'org.json')
@@ -97,7 +98,8 @@ org_data = File.read(ORG_FILE)
 org = Org.new(JSON.parse(org_data), platoons, squads, people, GSUITE_DOMAIN)
 
 strict = (STRICT_VALIDATION == 'true')
-org.validate!(strict: strict)
+allow_orphaned_associates = (ALLOW_ORPHANED_ASSOCIATES == 'true')
+org.validate!(strict: strict, allow_orphaned_associates)
 
 case action
 when 'generate-squads-md'

data/lib/terraorg/model/org.rb

@@ -1,4 +1,5 @@
 # Copyright 2019-2020 LiveRamp Holdings, Inc.
+# Copyright 2020- Joshua Kwan
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,7 +50,7 @@ class Org
     @squads = squads
   end
 
-  def validate!(strict: true)
+  def validate!(strict: true, allow_orphaned_associates: false)
     failure = false
 
     # Do not allow the JSON files to contain any people who have left.
@@ -133,10 +134,12 @@ class Org
     end
 
     # Validate that any associate is a member of some squad
-    associates_but_not_members = Set.new(all_associates.map(&:id)) - Set.new(all_members.map(&:id)) - exceptions
-    if !associates_but_not_members.empty?
-      $stderr.puts "ERROR: #{associates_but_not_members.map(&:id)} are associates of squads but not members of any squad"
-      failure = true
+    if !allow_orphaned_associates
+      associates_but_not_members = Set.new(all_associates.map(&:id)) - Set.new(all_members.map(&:id)) - exceptions
+      if !associates_but_not_members.empty?
+        $stderr.puts "ERROR: #{associates_but_not_members.to_a} are associates of squads but not members of any squad"
+        failure = true
+      end
     end
 
     raise "CRITICAL: Validation failed due to at least one error above" if failure && strict

data/lib/terraorg/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module Terraorg
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraorg
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Joshua Kwan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries