lester 1.0.0.pre1 → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c17183ee2fb1a8f5b7001d8dca46b6d14ab655e5
-  data.tar.gz: 714db6829427e804e423a0012c873eb893c29846
+  metadata.gz: d9cd94f15e8e4c24b2865432990ecb938b130bbb
+  data.tar.gz: a7e6b43cc55488bfbe5fa6942b531558f03f4b9f
 SHA512:
-  metadata.gz: c3f392540c9b2f5a8d8322eb3e69df96ad068cc756e3dd85c55fdc9b50603686496d5485564d76cc4d70e02d5a4a340491f3e184f930e735a331176b1badb089
-  data.tar.gz: 1acf0d620e036b9d2081af46ec2dda0d3cb708053e102e30cb296515cd73e478a2c6c153fcf1469e0ef69b4d00b5180a6b7e16350169f40545b0e8aa49d73e89
+  metadata.gz: 7e00b55bcd24fafe1f087af99e350829e60e59a43a862992126cdd3015e763cb9383dcd243affb02642f815fa5a26db8da34a1c3782f0bee1f63d3673b61d149
+  data.tar.gz: ed3b0cbae73e924428625142fa8aa0f13b93c9e9a98ea157c6cb8dd3857332db5d6bc6d1481f4392b8f1a63e4a508276b4565c2f71b8e0317142ca92b6caf4be

data/lib/lester/factory.rb

@@ -37,7 +37,11 @@ module Lester
     private
 
     def create_store(suffix)
-      S3Store.new(storage_bucket, sprintf('%s/%s', @config[:domain], suffix), store_options)
+      uri = URI(sprintf('s3://%s', @config[:storage_bucket]))
+      bucket_name = uri.host
+      prefix = sprintf('%s/%s/%s', uri.path, @config[:domain], suffix).sub('/', '')
+      bucket = Aws::S3::Bucket.new(bucket_name)
+      S3Store.new(bucket, prefix, store_options)
     end
 
     def store_options
@@ -55,10 +59,6 @@ module Lester
       @site_bucket ||= Aws::S3::Bucket.new(@config[:site_bucket])
     end
 
-    def storage_bucket
-      @storage_bucket ||= Aws::S3::Bucket.new(@config[:storage_bucket])
-    end
-
     def iam
       @iam ||= Aws::IAM::Client.new
     end

data/lib/lester/version.rb

@@ -1,3 +1,3 @@
 module Lester
-  VERSION = '1.0.0.pre1'.freeze
+  VERSION = '1.0.0.pre2'.freeze
 end

data/spec/acceptance/cli_init_spec.rb

@@ -11,11 +11,15 @@ describe 'bin/lester init' do
     [
       'init',
       '--domain', 'example.org',
-      '--storage-bucket', 'example-org-backup',
+      '--storage-bucket', storage_bucket_name,
       '--private-key', private_key_path,
     ]
   end
 
+  let :storage_bucket_name do
+    'example-org-backup'
+  end
+
   context 'when the private key exists' do
     it 'stores it' do
       command.run
@@ -29,6 +33,18 @@ describe 'bin/lester init' do
     end
   end
 
+  context 'when --storage-bucket includes a prefix' do
+    let :storage_bucket_name do
+      'example-org-backup/lester'
+    end
+
+    it 'stores it under the given prefix' do
+      command.run
+      object = storage_bucket.object('lester/example.org/account/private_key.json')
+      expect { JSON::JWK.new(JSON.parse(object.read)).to_key }.to_not raise_error
+    end
+  end
+
   context 'when the private key does not exist' do
     let :private_key_path do
       'this/should/not/exist.pem'

data/spec/acceptance/cli_renew_spec.rb

@@ -13,12 +13,16 @@ describe 'bin/lester renew' do
       '--domain', 'example.org',
       '--endpoint', 'http://127.0.0.1:4000',
       '--site-bucket', 'example-org-site',
-      '--storage-bucket', 'example-org-backup',
+      '--storage-bucket', storage_bucket_name,
       '--email', 'contact@example.org',
       '--distribution-id', 'distribution-id',
     ]
   end
 
+  let :storage_bucket_name do
+    'example-org-backup'
+  end
+
   before do
     storage_bucket.put_object(key: 'example.org/account/private_key.json', body: Pathname.new(private_key_path))
     cloudfront.add_config('distribution-id', {
@@ -119,6 +123,22 @@ describe 'bin/lester renew' do
           end
         end
       end
+
+      context 'when --storage-bucket includes a prefix' do
+        let :storage_bucket_name do
+          'example-org-backup/lester'
+        end
+
+        it 'stores everything under given prefix' do
+          storage_bucket.put_object(key: 'lester/example.org/account/private_key.json', body: Pathname.new(private_key_path))
+          command.run
+          keys = storage_bucket.keys.select { |k| k.start_with?('lester') }
+          expect(keys).to_not be_empty
+          keys.each do |key|
+            expect(key).to start_with('lester/example.org')
+          end
+        end
+      end
     end
 
     context 'when verification fails', vcr: { cassette_name: 'verification-fail' } do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lester
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Mathias Söderberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: acme-client
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: tara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: github_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Let's Encrypt certificate renewer for sites hosted on S3
 email:
 - mths@sdrbrg.se
@@ -155,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Renew Let's Encrypt certificates using S3