cps-property-generator 0.3.3 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aad999a530e887f24055f48e8481d342c2c9513a
-  data.tar.gz: 581fa068ac84ebb424ef6bd5bfe7d8e2eb3bb555
+SHA256:
+  metadata.gz: c9136a28b0b22964cfe78116a5baa2355f0d582336624a05ec0b1c37e1c96887
+  data.tar.gz: 1960f53fb08fd4911045072be3d85f7be78932b57fb6eb8593a0882c1fc70d8b
 SHA512:
-  metadata.gz: a1bad9217c2f69cd37ae6d92ec2a3d7473b3d5372b114c681ef5c06dc5761d1a0f9e7bf074852ac10d760a14c9a13031e6ca2e735ce35db41d7b55265d02bd63
-  data.tar.gz: 4ba83409ee857e560b09ab8047c22265d56cf95ecfec19199001f7c39eea5ea137a60c0b310a53786c449e35ee793eb62051ff36a52991da87b9f7975773e00f
+  metadata.gz: 8b1f580b49c991ad93efc8fd64e60c8762cb5446d0566edeccb5f3916839db5f8db43219f46054056731287cc74f6b31607d535752812380f3569b892827bdf4
+  data.tar.gz: f863f63f20700d9767143d4a935ddf005a9547bff1d33cb31f2b0007b0871b6769dad6571d43708bd0b5e16378ca7b67a8750d220603953f72d4a7477cc416e5

data/lib/generator/globals.rb

@@ -73,6 +73,25 @@ module PropertyGenerator
         end
       end
 
+      # If there are no environmental globals and there are account globals we have to merge them in
+      if condensed.empty? && !account_globals.empty?
+        # assemble the account to env mapping
+        mapping = {}
+
+        @environment_configs.each do |env, vals|
+          account = vals["account"]
+          next if account.nil?
+
+          mapping[account] = Array(mapping[account]).push(env)
+        end
+
+        account_globals.each do |account, env_account|
+          mapping[account].each do |env|
+            condensed[env] = env_account
+          end
+        end
+      end
+
       unless main_global.empty?
         # All environments need the main global definitions
         @environments.each do |env|

data/lib/linter/linter.rb

@@ -7,7 +7,7 @@ module PropertyGenerator
     attr_accessor :ignored_tests, :services_linter, :globals_linter, :config_linter, :report
 
     def initialize(path)
-      ignore_list = %w[README.md .cpsignore Jenkinsfile]
+      ignore_list = %w[README.md .cpsignore Jenkinsfile Gemfile Gemfile.lock]
       invalid_paths = PropertyGenerator.invalid_paths(path, ignore_list)
       begin
         @ignored_tests = YAML.load_file("#{path}/.cpsignore")

data/spec/lib/global_spec.rb

@@ -23,6 +23,9 @@ module PropertyGenerator
       expect(global.get_account_globals).to eq({
                                                  123456789012 => {
                                                    'my_account' => 123456789012
+                                                 },
+                                                 987654321098 => {
+                                                   'my_account' => 987654321098
                                                  }
                                                })
     end

data/spec/resources/globals/accounts/987654321098/987654321098.yml

@@ -0,0 +1 @@
+my_account: 987654321098

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cps-property-generator
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.7
 platform: ruby
 authors:
 - Bryan Call
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.117.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.117.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - spec/resources/config/config.yml
 - spec/resources/globals/accounts/123456789012/123456789012.yml
 - spec/resources/globals/accounts/123456789012/environments/my-test-env1.yml
+- spec/resources/globals/accounts/987654321098/987654321098.yml
 - spec/resources/globals/globals.yml
 - spec/resources/services/my-microservice-1.yml
 - spec/spec_helper.rb
@@ -184,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Centralized Property Service json file generator