From e6ec5e6dbdb4ad4c72c526e708f1abcb3075f446 Mon Sep 17 00:00:00 2001 From: Jason Davis-Cooke Date: Wed, 3 Jun 2015 16:16:56 -0400 Subject: [PATCH 1/4] Add a gitignore to secrets_dir --- lib/zanzibar/actions/bundle.rb | 8 +++++++- spec/lib/zanzibar/actions/bundle_spec.rb | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/zanzibar/actions/bundle.rb b/lib/zanzibar/actions/bundle.rb index ef64c56..7e30a56 100644 --- a/lib/zanzibar/actions/bundle.rb +++ b/lib/zanzibar/actions/bundle.rb @@ -44,7 +44,13 @@ module Zanzibar end def ensure_secrets_path - FileUtils.mkdir_p(@settings['secret_dir']) unless @settings['secret_dir'] == nil + ## Make sure the directory exists and that a .gitignore is there to ignore it + if @settings['secret_dir'] + FileUtils.mkdir_p(@settings['secret_dir']) + File.open("#{@settings['secret_dir']}/.gitignore", 'w') do |file| + file.write '.' + end + end end def resolved_file? diff --git a/spec/lib/zanzibar/actions/bundle_spec.rb b/spec/lib/zanzibar/actions/bundle_spec.rb index 088604f..ca2f0e6 100644 --- a/spec/lib/zanzibar/actions/bundle_spec.rb +++ b/spec/lib/zanzibar/actions/bundle_spec.rb @@ -50,6 +50,12 @@ describe Zanzibar::Cli do expect(FakeFS::FileTest.file? File.join('secrets', 'zanzi_key')).to be(true) end + it 'should create a .gitignore' do + expect(FakeFS::FileTest.file? File.join('secrets', '.gitignore')).to be(false) + expect { subject.bundle }.to output(/Finished downloading secrets/).to_stdout + expect(FakeFS::FileTest.file? File.join('secrets', '.gitignore')).to be(true) + end + it 'should create a resolved file' do expect(FakeFS::FileTest.file? Zanzibar::RESOLVED_NAME).to be(false) expect { subject.bundle }.to output(/Finished downloading secrets/).to_stdout From ff99246b461c1d5c6067b5e448ed0f3d9d5bd6df Mon Sep 17 00:00:00 2001 From: Jason Davis-Cooke Date: Wed, 3 Jun 2015 16:24:40 -0400 Subject: [PATCH 2/4] Update bundle.rb Don't gitignore the gitignore --- lib/zanzibar/actions/bundle.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/zanzibar/actions/bundle.rb b/lib/zanzibar/actions/bundle.rb index 7e30a56..f296997 100644 --- a/lib/zanzibar/actions/bundle.rb +++ b/lib/zanzibar/actions/bundle.rb @@ -49,6 +49,7 @@ module Zanzibar FileUtils.mkdir_p(@settings['secret_dir']) File.open("#{@settings['secret_dir']}/.gitignore", 'w') do |file| file.write '.' + file.write '!.gitignore' end end end From 867e14214c7848b425354f4578b200b27e1ce7ee Mon Sep 17 00:00:00 2001 From: Jason Davis-Cooke Date: Wed, 3 Jun 2015 16:26:19 -0400 Subject: [PATCH 3/4] Update bundle.rb *, not . --- lib/zanzibar/actions/bundle.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zanzibar/actions/bundle.rb b/lib/zanzibar/actions/bundle.rb index f296997..7150f74 100644 --- a/lib/zanzibar/actions/bundle.rb +++ b/lib/zanzibar/actions/bundle.rb @@ -48,7 +48,7 @@ module Zanzibar if @settings['secret_dir'] FileUtils.mkdir_p(@settings['secret_dir']) File.open("#{@settings['secret_dir']}/.gitignore", 'w') do |file| - file.write '.' + file.write '*' file.write '!.gitignore' end end From 73b939808e15e834e12f087ae5fb2b69c84a4e80 Mon Sep 17 00:00:00 2001 From: Jason Davis-Cooke Date: Wed, 3 Jun 2015 16:27:03 -0400 Subject: [PATCH 4/4] Update bundle.rb we need to puts so we get the requisite newlines --- lib/zanzibar/actions/bundle.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/zanzibar/actions/bundle.rb b/lib/zanzibar/actions/bundle.rb index 7150f74..c87ba68 100644 --- a/lib/zanzibar/actions/bundle.rb +++ b/lib/zanzibar/actions/bundle.rb @@ -48,8 +48,8 @@ module Zanzibar if @settings['secret_dir'] FileUtils.mkdir_p(@settings['secret_dir']) File.open("#{@settings['secret_dir']}/.gitignore", 'w') do |file| - file.write '*' - file.write '!.gitignore' + file.puts '*' + file.puts '!.gitignore' end end end