From 4907f71b53d0483d61236b692cf7a6a1f49d0927 Mon Sep 17 00:00:00 2001 From: Scott McKenzie Date: Wed, 26 Oct 2022 09:56:42 -0600 Subject: [PATCH 1/3] Only capitalize first letter, leave rest untouched --- .DS_Store | Bin 0 -> 8196 bytes lib/.DS_Store | Bin 0 -> 6148 bytes lib/arkana/.DS_Store | Bin 0 -> 6148 bytes lib/arkana/models/config.rb | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .DS_Store create mode 100644 lib/.DS_Store create mode 100644 lib/arkana/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6aed7224d911365c98c8c90d51ffa0712ed957dc GIT binary patch literal 8196 zcmeHMPj3=I9Q_So7lby%*rXSeO}tjbD01+E6x1f#CZ*~@4YIIpH*9wae@Yrs!&$$B zU%{)N#P8xs-*09i>~wpqnmCipyxE!e<~RFhV3~!8M19hGK(s|fS!Bjy9z{ape$JOt zDr(sT3g~Iq54(;ZI=C)gVw(ozfN{V$U>q+tuEzbMaSM`*d0^x&@&MQ8bV|Oa`>E;H zm%4MhM`wt{5j~6$#FeRIO}RlGaQi3&WcJKOyu{fOd-rw4yENwM=@E!MTV)k!hh9Lt zN6)EAFKHiGLX2K~X41D+-7V<$sR2zJ_zWdq@1f;2YKMtqu%D}AWT+>d9BHxGzg3=v zIq`iT;eLF5MWtt}>_VK4nfNkFKOTks5*snUe2ky4$C6mibTo+GJAHQszBd||%RfXa zow>1QSvf0jeQ2G8)7H2%o{Z|9;XA%M3`5^p)H}`_&z-i5w|Bx|-0=c;CJsBdKkvj$AIAYZtd>vue4rZ9lA3F1GDiwOZb`A3d&IT;#Hwcke$rX!rfo zAp8s$kwoEO|B3@CNsM)*1$W81U|6wuODLi&bo5JzLa_`^GyV=17(fus8cy zp~UqOh!f-Iz;D9+2E76%?KP}_Op!_6@x1aeUV+APpA2wU9a&HOe9D#ov|M@f{9kSf zQ!x%)s{?5@`c@v;y!!qBwa&o|ZX7TU{9Ok`rqOEDF^9#E6MZ^-*0zy9B6DKiT%nYp lkjHVLJdOjGe;A@}gUXs(gmZ;xK{77_qz$Gp4*XFEegovkMC1Sf literal 0 HcmV?d00001 diff --git a/lib/.DS_Store b/lib/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a108fe1d3d8a2d8c2be079854fde05cc7e2dfc48 GIT binary patch literal 6148 zcmeHKK~KUk6m9`!3o+rK3CAX03C<{T@G=n(UY*f{8r+2F!d%G)av&r->yPp3FY)i_ zdu=f+=#>!jUh?|2ukUT`*QT#!jPdrkx6fFWF=l}x7HlYf5$s1@l7g|60J-``%>466 zJ_L~rmb}TZjtt=1Z8D!FYyf3`{cuy9fHuCAsNv^)gGo9xYyA-nqc9yg&L=MvOBM!~%92UlT#(yeZv%6R05aX(Q3VXqG^x7T6Zlasa_ z$Gud=db-25ExTK-O{XoVSr-S*=BzHJt(H?4heyrX%(ixR_l_^RgXlSyuWHnc!~RsV zWpEB}P|3~d#Y^Hy#*bjf7<-W$)&QP@g&mFzy@M_?1WgiRfEXYK)|>%zCR&v>A14iu z7$62#&j6ke0u<3Tm}yi;2NdcF0EpK}B~Zsp5yl9EuE9(r^nh?33aCT5d17!K4t8Pu zT!WcL9nQFUd~ow;ZeA!{{T;q9lsn_DMkUf@T+8_hNr`?3jpDf0{fb@`(eo5D(Hk(zu%Hle8q=I@ylEv$GMKhm*^Sr z@RyhjXAho*#7HjXd|Tr*=oG#=_6mMWS$%`Lx8}V|XXqhE&o_L({K+?-l_T5p@9`+l z%1OKZL)CWbH+CBhud(0w5T5E;IEg0HvLB7#ap|?zd3^C4#c#57Ht=sh*Tp2tigYZ5 zEJ@+={%uwyde+y|A}NI%ng-8ndISGpKJT_Wt>96ovuFkLZnxbE9zW?U7GCqt{RdB9 z4L;>(h5jrWlEMxucGKbo@c1g@KM%)6u8Se+nRAOu?6)~hu=5U~P$7y&DC_O>r+$L9 zI)8T&VTQRskr=!dSn0ovR^xuGM)MFQ#e9v>C+ Date: Wed, 26 Oct 2022 10:05:56 -0600 Subject: [PATCH 2/3] Removed .DS_Store file changes --- .DS_Store | Bin 8196 -> 0 bytes lib/.DS_Store | Bin 6148 -> 0 bytes lib/arkana/.DS_Store | Bin 6148 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 lib/.DS_Store delete mode 100644 lib/arkana/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6aed7224d911365c98c8c90d51ffa0712ed957dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMPj3=I9Q_So7lby%*rXSeO}tjbD01+E6x1f#CZ*~@4YIIpH*9wae@Yrs!&$$B zU%{)N#P8xs-*09i>~wpqnmCipyxE!e<~RFhV3~!8M19hGK(s|fS!Bjy9z{ape$JOt zDr(sT3g~Iq54(;ZI=C)gVw(ozfN{V$U>q+tuEzbMaSM`*d0^x&@&MQ8bV|Oa`>E;H zm%4MhM`wt{5j~6$#FeRIO}RlGaQi3&WcJKOyu{fOd-rw4yENwM=@E!MTV)k!hh9Lt zN6)EAFKHiGLX2K~X41D+-7V<$sR2zJ_zWdq@1f;2YKMtqu%D}AWT+>d9BHxGzg3=v zIq`iT;eLF5MWtt}>_VK4nfNkFKOTks5*snUe2ky4$C6mibTo+GJAHQszBd||%RfXa zow>1QSvf0jeQ2G8)7H2%o{Z|9;XA%M3`5^p)H}`_&z-i5w|Bx|-0=c;CJsBdKkvj$AIAYZtd>vue4rZ9lA3F1GDiwOZb`A3d&IT;#Hwcke$rX!rfo zAp8s$kwoEO|B3@CNsM)*1$W81U|6wuODLi&bo5JzLa_`^GyV=17(fus8cy zp~UqOh!f-Iz;D9+2E76%?KP}_Op!_6@x1aeUV+APpA2wU9a&HOe9D#ov|M@f{9kSf zQ!x%)s{?5@`c@v;y!!qBwa&o|ZX7TU{9Ok`rqOEDF^9#E6MZ^-*0zy9B6DKiT%nYp lkjHVLJdOjGe;A@}gUXs(gmZ;xK{77_qz$Gp4*XFEegovkMC1Sf diff --git a/lib/.DS_Store b/lib/.DS_Store deleted file mode 100644 index a108fe1d3d8a2d8c2be079854fde05cc7e2dfc48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKK~KUk6m9`!3o+rK3CAX03C<{T@G=n(UY*f{8r+2F!d%G)av&r->yPp3FY)i_ zdu=f+=#>!jUh?|2ukUT`*QT#!jPdrkx6fFWF=l}x7HlYf5$s1@l7g|60J-``%>466 zJ_L~rmb}TZjtt=1Z8D!FYyf3`{cuy9fHuCAsNv^)gGo9xYyA-nqc9yg&L=MvOBM!~%92UlT#(yeZv%6R05aX(Q3VXqG^x7T6Zlasa_ z$Gud=db-25ExTK-O{XoVSr-S*=BzHJt(H?4heyrX%(ixR_l_^RgXlSyuWHnc!~RsV zWpEB}P|3~d#Y^Hy#*bjf7<-W$)&QP@g&mFzy@M_?1WgiRfEXYK)|>%zCR&v>A14iu z7$62#&j6ke0u<3Tm}yi;2NdcF0EpK}B~Zsp5yl9EuE9(r^nh?33aCT5d17!K4t8Pu zT!WcL9nQFUd~ow;ZeA!{{T;q9lsn_DMkUf@T+8_hNr`?3jpDf0{fb@`(eo5D(Hk(zu%Hle8q=I@ylEv$GMKhm*^Sr z@RyhjXAho*#7HjXd|Tr*=oG#=_6mMWS$%`Lx8}V|XXqhE&o_L({K+?-l_T5p@9`+l z%1OKZL)CWbH+CBhud(0w5T5E;IEg0HvLB7#ap|?zd3^C4#c#57Ht=sh*Tp2tigYZ5 zEJ@+={%uwyde+y|A}NI%ng-8ndISGpKJT_Wt>96ovuFkLZnxbE9zW?U7GCqt{RdB9 z4L;>(h5jrWlEMxucGKbo@c1g@KM%)6u8Se+nRAOu?6)~hu=5U~P$7y&DC_O>r+$L9 zI)8T&VTQRskr=!dSn0ovR^xuGM)MFQ#e9v>C+ Date: Wed, 26 Oct 2022 11:23:23 -0600 Subject: [PATCH 3/3] Requested changes --- .gitignore | 1 + lib/arkana/models/config.rb | 2 +- spec/fixtures/arkana-fixture.yml | 2 ++ spec/models/config_spec.rb | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f26532..8e0ab14 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ .rspec_status coverage *.gem +**/.DS_Store diff --git a/lib/arkana/models/config.rb b/lib/arkana/models/config.rb index 35fae12..2cc9ab2 100644 --- a/lib/arkana/models/config.rb +++ b/lib/arkana/models/config.rb @@ -32,7 +32,7 @@ class Config # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity def initialize(yaml) - @environments = (yaml["environments"] || []).map { |env| env.sub(/^./, &:upcase) } + @environments = (yaml["environments"] || []).map(&:capitalize_first_letter) @environment_secrets = yaml["environment_secrets"] || [] @global_secrets = yaml["global_secrets"] || [] default_name = "ArkanaKeys" diff --git a/spec/fixtures/arkana-fixture.yml b/spec/fixtures/arkana-fixture.yml index a9a683a..a59b7f9 100644 --- a/spec/fixtures/arkana-fixture.yml +++ b/spec/fixtures/arkana-fixture.yml @@ -11,6 +11,8 @@ package_manager: cocoapods environments: - debug - release + - debugPlusMore + - ReleasePlusMore global_secrets: - Domain - Global diff --git a/spec/models/config_spec.rb b/spec/models/config_spec.rb index 2d055d2..cba8531 100644 --- a/spec/models/config_spec.rb +++ b/spec/models/config_spec.rb @@ -28,7 +28,7 @@ context "when yaml configurations are provided" do it "should correctly assign each key/value pair to their respective property" do - expect(subject.environments).to eq %w[Debug Release] + expect(subject.environments).to eq %w[Debug Release DebugPlusMore ReleasePlusMore] expect(subject.environment_secrets).to eq %w[ServiceKey Server] expect(subject.global_secrets).to eq %w[Domain Global] custom_name = "MySecrets" @@ -64,7 +64,7 @@ context "when there is one or more environment secrets" do it "should generate a new key for each environment + environment secret pair" do - expect(subject.environment_keys.count).to eq(2 * 2) # There are 2 environments and 2 environment secrets + expect(subject.environment_keys.count).to eq(4 * 2) # There are 4 environments and 2 environment secrets end it "should have all keys with a prefix of the environment secret name" do