env_setup 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c41acc02b85485891e7ac909d0711f650200c8cf8848840b78554b558f171d7
-  data.tar.gz: e12dd5cd3edaab85dad74a0c1ca3472ea750c2c7c1a84ca0fd7d37e70d241875
+  metadata.gz: 9eac51205869d1c0692b2e0f646c850ab73d501c4fb5991317f90c9a4bda8841
+  data.tar.gz: 25367896b58d2a8b2f173dd7b6f1a2b044b29c1329e00b1e6b64b45475f36ef1
 SHA512:
-  metadata.gz: 9cf9f31c65b9dbbe098f1a5477f7d8ab4011be7ead7e7020fe8f2e96f1ecea8c83985b2d5bb4bdc2b6a3253238e3a5adf40ff199405866a5e37377652ce7a560
-  data.tar.gz: 7220349ce399a398023b5c4e78fe949d81a4664c36f6cdfc4a641f38de23fe115fd52682433629f122e2217233330f6a9bc9403388b9457a0498a174fdd23081
+  metadata.gz: f8a31297a413089eb778c894904db38a0b8c57821ed14b09ecde3d0cadfb5066e9e3851a73fcb45d9857b91bc8725899d8f0e5ae722d754373ae740756dd31be
+  data.tar.gz: 0e92b90ebf6de86b492d7c6c74c15443a702476fd8a8e673d90dca9cc3fa02fbe47d4c02862483e405aa89032bb5a76181b79f83bc56b98144c7256f9c0742e5

data/lib/env_setup/env_builder.rb

@@ -19,7 +19,7 @@ module EnvSetup
 
     def build_json
       secrets = aws_secrets
-      configuration.template.merge(secrets).each do |key, var_template|
+      secrets.merge(configuration.template).each do |key, var_template|
         vars[key.to_s] = build_var(var_template)
       end
       vars
@@ -34,17 +34,21 @@ module EnvSetup
     private
 
     def var_builder(var_template)
-      builder = [
+      builder = var_builder_class(var_template)
+
+      raise "Invalid var builder: #{var_template.inspect}" unless builder
+
+      builder[:builder].new(var_template, vars.merge(inputs))
+    end
+
+    def var_builder_class(var_template)
+      [
         { builder: EnvSetup::Builder::Pattern, if: -> { var_template['pattern'] } },
         { builder: EnvSetup::Builder::NestedValue, if: -> { var_template['value'] } },
         { builder: EnvSetup::Builder::Input, if: -> { var_template['input'] } },
         { builder: EnvSetup::Builder::Generator, if: -> { var_template['generator'] } },
         { builder: EnvSetup::Builder::Json, if: -> { var_template.is_a?(Hash) } }
       ].find { |option| option[:if].call }
-
-      raise "Invalid var builder: #{var_template.inspect}" unless builder
-
-      builder[:builder].new(var_template, vars.merge(inputs))
     end
 
     def configuration

data/lib/env_setup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EnvSetup
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end

data/spec/env_setup/env_builder_spec.rb

@@ -21,12 +21,16 @@ RSpec.describe EnvSetup::EnvBuilder do
         'APP_PASSWORD' => {
           'generator' => 'salt'
         },
+        'HOST' => { 'pattern' => 'wss://{{APP_NAME}}-community2-cable.{{DOMAIN}}/cable' },
         'INTEGRATION_APP_HOST' => {
           'input' => 'INTEGRATION_APP_HOST'
         },
         'INTEGRATION_APP_URL' => {
           'pattern' => '{{INTEGRATION_APP_HOST}}/api/integrate'
         },
+        'WELCOME_MSG' => {
+          'pattern' => 'Welcome {{USERNAME}}'
+        },
         'DOMAINS' => {
           'APP' => ['abc.com', 'def.com'],
           'ADMIN' => ['abc-admin.com', 'def-admin.com']
@@ -41,14 +45,16 @@ RSpec.describe EnvSetup::EnvBuilder do
       let(:expected_json) do
         {
           'LANG' => 'en_US.UTF-8',
+          'USERNAME' => 'foo',
+          'HOST' => 'wss://pr-123-community2-cable.foobar.com/cable',
           'DOMAIN' => 'foobar.com',
           'APP_NAME' => 'pr-123',
-          'HOST' => 'wss://pr-123-community2-cable.foobar.com/cable',
           'APP_HOST' => 'https://pr-123.foobar.com',
           'APP_SECRET' => secret,
           'APP_PASSWORD' => salt,
           'INTEGRATION_APP_HOST' => inputs['INTEGRATION_APP_HOST'],
           'INTEGRATION_APP_URL' => "#{inputs['INTEGRATION_APP_HOST']}/api/integrate",
+          'WELCOME_MSG' => 'Welcome foo',
           'DOMAINS' => '{"APP"=>["abc.com", "def.com"], "ADMIN"=>["abc-admin.com", "def-admin.com"]}'
         }
       end
@@ -69,7 +75,7 @@ RSpec.describe EnvSetup::EnvBuilder do
         allow_any_instance_of(EnvSetup::EnvBuilder).to receive(:aws_secrets).and_return(
           {
             'LANG' => 'en_US.UTF-8',
-            'HOST' => {"pattern" => "wss://{{APP_NAME}}-community2-cable.{{DOMAIN}}/cable"},
+            'USERNAME' => 'foo'
           }
         )
       end
@@ -81,7 +87,7 @@ RSpec.describe EnvSetup::EnvBuilder do
 
     context 'without aws secrets manager' do
       let(:inputs) do
-        { 'INTEGRATION_APP_HOST' => 'https://integrate.foobar2.com' }
+        { 'INTEGRATION_APP_HOST' => 'https://integrate.foobar2.com', 'USERNAME' => 'foo' }
       end
       let(:expected_json) do
         {
@@ -90,8 +96,10 @@ RSpec.describe EnvSetup::EnvBuilder do
           'APP_HOST' => 'https://pr-123.foobar.com',
           'APP_SECRET' => secret,
           'APP_PASSWORD' => salt,
+          'HOST' => 'wss://pr-123-community2-cable.foobar.com/cable',
           'INTEGRATION_APP_HOST' => inputs['INTEGRATION_APP_HOST'],
           'INTEGRATION_APP_URL' => "#{inputs['INTEGRATION_APP_HOST']}/api/integrate",
+          'WELCOME_MSG' => 'Welcome foo',
           'DOMAINS' => '{"APP"=>["abc.com", "def.com"], "ADMIN"=>["abc-admin.com", "def-admin.com"]}'
         }
       end
@@ -115,6 +123,7 @@ RSpec.describe EnvSetup::EnvBuilder do
 
   describe '.build_var' do
     let(:inputs) { { 'MY_VAR' => 'Hey!', 'FOO' => 'bar', 'ENV_NAME' => 'env-test' } }
+    let(:env_name) { 'env-test' }
     let(:template) { {} }
     let(:builder) { described_class.new(inputs) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: env_setup
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Jonatas Daniel Hermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler