Bugfix: Account globals are ignored if there are no env globals (#48)

.gitignore

@@ -1,2 +1,4 @@
 .idea/
 cps-property-generator-*.gem
+out/
+

lib/generator/globals.rb

@@ -73,6 +73,25 @@ def condense_globals
         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|

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

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

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