zanzibar 0.1.18 → 0.1.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzNhZjM1YjJkMTBhNjVkYWVlY2ZkZWFlYWZkNmY5NzNlZGQ0MWMyNQ==
+    ZWVlZGZlZDQ4ZmI4NWY1OTk1ZTcxNDQzYTE1MzYyYzFhZTY2NDY2Mw==
   data.tar.gz: !binary |-
-    NDQwZDE4MWUxNGZhOGY0YmZhNWEyNzMwNmUxNjIzN2VkMzE2YzFjOQ==
+    NWUzYzYyMjExODhiNzIxMjc0NDI5ODA1NDkwNDdlNmVkNTY5NDYzMQ==
 SHA512:
   metadata.gz: !binary |-
-    NWY5YzcyMzg4MGE2ZDk3ODEwZGJjZTVlZDRhMWJkOWI0MWI1NDBlMTdkYTNk
-    MzYyZWY4NGM5MzVhZWQ0NDBiOGM5ZGViMjU1ZGMxN2E0YzliNWJkOTEzMGNh
-    YzZhZDdkNjJkNTQwYmMwNWRjMGVkYzc2N2UxZDZjMjVkZTEwMGU=
+    MTFmZWE4MGIwMWRkNWMwYTYyOTNiZmYwOGU1ZjAwNWExYzJiMTNmYmEwNGYz
+    NmU4MDkwZjQ4ZjNhZDk2MTBlMGU3ZjJlMzA1N2E2MTRlMzUwYTY1ZmI0NGFl
+    MzhhZTY0ZjU2M2IxODk3MjFjYmNhYzkwZWQzZjY3YTUwMzI0MmE=
   data.tar.gz: !binary |-
-    OWE1NTI4MTEwNWI4ZGJhZjcyNDFkMDYyNjUyYmMyZDI5NGIzNzUxNjg0OGUy
-    ZjBjZmQ5ODc0NGQ2MzA0YzlmMDY0NDBkYWNkYTY0MTE1MzQ5ZGUwOGE5Y2M4
-    MzQxMjFjZTAyOGIyNmU0YmVmN2E4MTliY2NlMmQzNGViMTExZTk=
+    YWY0ODJmYTBiMzg4NjRiMzc1MTgzMmVkMDVlZTQ5MGU0MGM1YWZkNzk4YThm
+    YTU2YTgxYTYwY2U1MGQ1ZjIzN2E1Y2Y3NTZjZjZmOTM0YjkxZjMzNzE4OWFk
+    NzliNDJlNWQ4NDY2ZTdhNjFlOTEzMjJlMTA1MmE3N2NhNjllMDQ=

data/lib/zanzibar/actions/bundle.rb

@@ -92,9 +92,10 @@ module Zanzibar
 
         downloaded_secrets = {}
         remote_secrets.each do |key, secret|
+          full_path = secret.has_key?('prefix') ? File.join(@settings['secret_dir'], secret['prefix']) : @settings['secret_dir']
           downloaded_secrets[key] = download_one_secret(secret['id'],
                                                         secret['label'],
-                                                        @settings['secret_dir'],
+                                                        full_path,
                                                         args,
                                                         secret['name'] || "#{secret['id']}_password")
 

data/lib/zanzibar/version.rb

@@ -1,4 +1,4 @@
 # The version of the gem
 module Zanzibar
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 end

data/spec/files/Zanzifile

@@ -4,8 +4,11 @@ settings:
   domain: zanzitest.net
   secret_dir: secrets/
   ignore_ssl: true
-secrets:
 secrets:
   ssh_key:
     id: 2345
     label: Private Key
+  prefix_ssh_key:
+    id: 2345
+    label: Private Key
+    prefix: ssh/

data/spec/lib/zanzibar/actions/bundle_spec.rb

@@ -24,9 +24,12 @@ describe Zanzibar::Cli do
         FakeFS::FileSystem.clone files
 
         stub_request(:any, 'https://www.zanzitest.net/webservices/sswebservice.asmx')
-          .to_return(body: AUTH_XML, status: 200).then
-          .to_return(body: SECRET_WITH_KEY_XML, status: 200).then
-          .to_return(body: PRIVATE_KEY_XML, status: 200)
+          .to_return({body: AUTH_XML, status: 200}).then
+          .to_return({body: SECRET_WITH_KEY_XML, status: 200}).then
+          .to_return({body: PRIVATE_KEY_XML, status: 200}).then
+          .to_return({body: AUTH_XML, status: 200}).then
+          .to_return({body: SECRET_WITH_KEY_XML, status: 200}).then
+          .to_return({body: PRIVATE_KEY_XML, status: 200})
 
         Dir.chdir File.join(source_root, 'spec', 'files')
       end
@@ -50,6 +53,12 @@ describe Zanzibar::Cli do
         expect(FakeFS::FileTest.file? File.join('secrets', 'zanzi_key')).to be(true)
       end
 
+      it 'should download a file to a prefix' do
+        expect(FakeFS::FileTest.file? File.join('secrets/ssh', 'zanzi_key')).to be(false)
+        expect { subject.bundle }.to output(/Finished downloading secrets/).to_stdout
+        expect(FakeFS::FileTest.file? File.join('secrets/ssh', '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
@@ -64,7 +73,7 @@ describe Zanzibar::Cli do
 
       it 'should not redownload files it already has' do
         expect { subject.bundle }.to output(/Finished downloading secrets/).to_stdout
-        expect(WebMock).to have_requested(:post, 'https://www.zanzitest.net/webservices/sswebservice.asmx').times(3)
+        expect(WebMock).to have_requested(:post, 'https://www.zanzitest.net/webservices/sswebservice.asmx').times(6)
 
         WebMock.reset!
 
@@ -74,16 +83,19 @@ describe Zanzibar::Cli do
 
       it 'should redownload on update action' do
         expect { subject.bundle }.to output(/Finished downloading secrets/).to_stdout
-        expect(WebMock).to have_requested(:post, 'https://www.zanzitest.net/webservices/sswebservice.asmx').times(3)
+        expect(WebMock).to have_requested(:post, 'https://www.zanzitest.net/webservices/sswebservice.asmx').times(6)
 
         WebMock.reset!
         stub_request(:any, 'https://www.zanzitest.net/webservices/sswebservice.asmx')
+          .to_return({body: AUTH_XML, status: 200}).then
+          .to_return({body: SECRET_WITH_KEY_XML, status: 200}).then
+          .to_return({body: PRIVATE_KEY_XML, status: 200}).then
           .to_return(body: AUTH_XML, status: 200).then
           .to_return(body: SECRET_WITH_KEY_XML, status: 200).then
           .to_return(body: PRIVATE_KEY_XML, status: 200)
 
         expect { subject.update }.to output(/Finished downloading secrets/).to_stdout
-        expect(WebMock).to have_requested(:post, 'https://www.zanzitest.net/webservices/sswebservice.asmx').times(3)
+        expect(WebMock).to have_requested(:post, 'https://www.zanzitest.net/webservices/sswebservice.asmx').times(6)
       end
 
       it 'should reject a malformed Zanzifile' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zanzibar
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Jason Davis-Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler