kumo_keisei 0.0.53 → 0.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c9dafdfe6ea6683d23c2198a20d4230877f2318
-  data.tar.gz: ee25f2edcdc58560e449df3d85da7ac496238f9e
+  metadata.gz: aafae086e285b92c93f77d21ab4938c4dc4458dd
+  data.tar.gz: de6b75f61452599be6dcbd375e0bef150ed7a07f
 SHA512:
-  metadata.gz: 861bf3c2ac3a321b7bf16f3323e25e5ed2ff8075429236301d8c0de298c8a28c33db0a0b2772a536b33a98d3f87d185346ee136b5d5425f1edab708034149d07
-  data.tar.gz: 1342a2fbc2c8bfb1ce701072da6400e7994e01bce4724b1d83219d9a929ef2f2fe8e424c40216789c49962da587940ba9b77a6822681ba39986e06564f0543b7
+  metadata.gz: 930367bd74af5b2ab2e423f41d123dd904fe33bf21c1035846ae9f0bd327b8eecaf517a2029ef0c9d81e07d5c5a887061f0c07cbe9fb7d365018744f1689fe7c
+  data.tar.gz: 665b7bab8e79ac469c3cfcf3da8c9697fd2866bbe9034a11409d538a4901f335684e3df8db684ad25a4a91c88c70396db41a2b1fcfc379df4843eaa46306f4d0

data/VERSION

@@ -1 +1 @@
-0.0.53
+0.0.54

data/lib/kumo_keisei/environment_config.rb

@@ -97,7 +97,13 @@ class KumoKeisei::EnvironmentConfig
   end
 
   def encrypted_env_secrets
-    @file_loader.load_config(env_secrets_file_name)
+    secrets = @file_loader.load_config(env_secrets_file_name)
+
+    if !secrets.empty?
+      secrets
+    else
+      @file_loader.load_config('development_secrets.yml')
+    end
   end
 
   def common_config
@@ -106,6 +112,11 @@ class KumoKeisei::EnvironmentConfig
 
   def env_config
     config = @file_loader.load_config(env_config_file_name)
-    config || @file_loader.load_config('development.yml')
+
+    if !config.empty?
+      config
+    else
+      @file_loader.load_config('development.yml')
+    end
   end
 end

data/spec/lib/kumo_keisei/environment_config_spec.rb

@@ -87,6 +87,7 @@ describe KumoKeisei::EnvironmentConfig do
       it 'adds injected config to the config hash' do
         allow(file_loader).to receive(:load_config).with('common.yml').and_return(common_parameters)
         allow(file_loader).to receive(:load_config).with(environment_config_file_name).and_return({})
+        allow(file_loader).to receive(:load_config).with('development.yml').and_return({})
 
         expect(subject).to eq({ "stack_name" => "okonomiyaki", "injected" => "yes" })
       end
@@ -98,16 +99,18 @@ describe KumoKeisei::EnvironmentConfig do
       it 'creates a array containing an aws formatted parameter hash' do
         allow(file_loader).to receive(:load_config).with('common.yml').and_return(common_parameters)
         allow(file_loader).to receive(:load_config).with(environment_config_file_name).and_return({})
+        allow(file_loader).to receive(:load_config).with('development.yml').and_return({})
 
         expect(subject).to eq('stack_name' => 'okonomiyaki')
       end
     end
 
     context 'merging common and environment specific configurations' do
+      let(:environment_config) { {'image' => 'ami-5678'} }
+
       context 'with environmental overrides' do
         let(:parameter_template) { "image: <%= config['image'] %>" }
         let(:common_config) { {'image' => 'ami-1234'} }
-        let(:environment_config) { {'image' => 'ami-5678'} }
         let(:env_name) { 'development' }
 
         it 'replaces the common value with the env value' do
@@ -117,6 +120,14 @@ describe KumoKeisei::EnvironmentConfig do
           expect(subject).to eq('image' => 'ami-5678')
         end
       end
+
+      it 'falls back to a default environment if the requested one does not exist' do
+        allow(file_loader).to receive(:load_config).with('common.yml').and_return({})
+        allow(file_loader).to receive(:load_config).with("#{env_name}.yml").and_return({})
+        expect(file_loader).to receive(:load_config).with("development.yml").and_return(environment_config)
+
+        expect(subject).to eq('image' => 'ami-5678')
+      end
     end
   end
 
@@ -135,26 +146,35 @@ describe KumoKeisei::EnvironmentConfig do
       allow(kms).to receive(:decrypt).with(crypted_password).and_return(plain_text_password)
     end
 
-    it 'should decrypt common secrets' do
+    it 'decrypts common secrets' do
       allow(file_loader).to receive(:load_config).with('common_secrets.yml').and_return(secrets)
       allow(file_loader).to receive(:load_config).with("#{env_name}_secrets.yml").and_return({})
+      allow(file_loader).to receive(:load_config).with("development_secrets.yml").and_return({})
 
       expect(subject).to eq('secret_password' => plain_text_password)
     end
 
-    it 'should decrypt environment secrets' do
+    it 'decrypts environment secrets' do
       allow(file_loader).to receive(:load_config).with('common_secrets.yml').and_return({})
       allow(file_loader).to receive(:load_config).with("#{env_name}_secrets.yml").and_return(secrets)
 
       expect(subject).to eq('secret_password' => plain_text_password)
     end
 
-    it 'should give preference to environment secrets' do
+    it 'gives preference to environment secrets' do
       allow(file_loader).to receive(:load_config).with('common_secrets.yml').and_return(secrets)
       allow(file_loader).to receive(:load_config).with("#{env_name}_secrets.yml").and_return(env_secrets)
       allow(kms).to receive(:decrypt).with(crypted_env_password).and_return(plain_text_env_password)
 
       expect(subject).to eq('secret_password' => plain_text_env_password)
     end
+
+    it 'falls back to a default environment if the requested one does not exist' do
+      allow(file_loader).to receive(:load_config).with('common_secrets.yml').and_return({})
+      allow(file_loader).to receive(:load_config).with("#{env_name}_secrets.yml").and_return({})
+      expect(file_loader).to receive(:load_config).with("development_secrets.yml").and_return(secrets)
+
+      expect(subject).to eq('secret_password' => plain_text_password)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumo_keisei
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.54
 platform: ruby
 authors:
 - Redbubble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk