bfs-s3 0.6.5 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf51b2ca5b37742e046fa878b9c59a9b70b30f4cfd19e3a5a9781c89384a2574
-  data.tar.gz: '083cf03fdbea11349338255962021c5af62c80284edfa9df23c26d1d1c209c69'
+  metadata.gz: ac3a8ad583c3cd4849b744a550bf281cc2c8b921538fda890981fb6fcf566a7e
+  data.tar.gz: 35a48baca7cc5e8d6903f1e5ef4bb215199e9635e8ae84b9fe928d98a857fd87
 SHA512:
-  metadata.gz: 0f7449429a6ba8074007fad63f6913feb2e093345ef5d0a4c0013eee2ac572a693b506ed6de1f92e4c946b5921d531808107802ce0ec5c2d865d82efb2b564b3
-  data.tar.gz: cd11cbce9e79e1ea78a5b2bf3445b7f8a3dbf28ff23d6903f31de9c2621500f05b3961ce7c4f8ee1f3dc45d87f8bf344f1bde02b2591bbb1c05cfe74dc231921
+  metadata.gz: 844c31903cb25363730e01ba630f3127ed0af3b9cbfccb249ab74d4fe7c468b27c7f94230a7ac6898447eaa01301f66ac0872911517bc135495c6c78e07d93be
+  data.tar.gz: 3ba0d4876291f272426843ce319b9bcea2f3487ce617bb6604e15b310525e6808838e085986d0d35d395b673519d18bab87bd5d3587b050a45b105627648cfd6

data/bfs-s3.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'aws-sdk-s3', '~> 1.38'
   s.add_dependency 'bfs', s.version

data/lib/bfs/bucket/s3.rb

@@ -33,7 +33,7 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **opts)
-        prefix = pattern[%r{^[^\*\?\{\}\[\]]+/}]
+        prefix = pattern[%r{^[^*?\{\}\[\]]+/}]
         prefix = File.join(*[@prefix, prefix].compact) if @prefix
 
         opts = opts.merge(bucket: name, prefix: @prefix)
@@ -158,9 +158,10 @@ module BFS
   end
 end
 
-BFS.register('s3') do |url, opts|
+BFS.register('s3') do |url, opts, block|
   prefix = BFS.norm_path(opts[:prefix] || url.path)
   opts[:prefix] = prefix.empty? ? nil : prefix
+  opts = opts.slice(:prefix, :region, :sse, :access_key_id, :secret_access_key, :acl, :storage_class, :encoding)
 
-  BFS::Bucket::S3.new url.host, **opts.slice(:prefix, :region, :sse, :access_key_id, :secret_access_key, :acl, :storage_class, :encoding)
+  BFS::Bucket::S3.open url.host, **opts, &block
 end

data/spec/bfs/bucket/s3_spec.rb

@@ -1,17 +1,8 @@
 require 'spec_helper'
 
-sandbox  = { bucket: 'bsm-bfs-unittest' }.freeze
-run_spec = \
-  begin
-    s = Aws::S3::Client.new
-    s.head_bucket(bucket: sandbox[:bucket])
-    true
-  rescue StandardError => e
-    warn "WARNING: unable to run #{File.basename __FILE__}: #{e.message}"
-    false
-  end
+sandbox = { bucket: 'bsm-bfs-unittest' }.freeze
 
-RSpec.describe BFS::Bucket::S3, if: run_spec do
+RSpec.describe BFS::Bucket::S3, s3: true do
   let(:prefix) { "x/#{SecureRandom.uuid}/" }
 
   subject do
@@ -31,15 +22,18 @@ RSpec.describe BFS::Bucket::S3, if: run_spec do
     expect(bucket.acl).to eq(:private)
     expect(bucket.encoding).to eq('binary')
     expect(bucket.instance_variable_get(:@prefix)).to be_nil
+    bucket.close
 
     bucket = BFS.resolve("s3://#{sandbox[:bucket]}/a/b/")
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.name).to eq(sandbox[:bucket])
     expect(bucket.instance_variable_get(:@prefix)).to eq('a/b')
+    bucket.close
   end
 
   it 'should enumerate over a large number of files' do
     bucket = described_class.new sandbox[:bucket], prefix: 'm/'
     expect(bucket.ls('**/*').count).to eq(2121)
+    bucket.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.4
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.4
 description: https://github.com/bsm/bfs.rb
 email: dimitrij@blacksquaremedia.com
 executables: []
@@ -60,7 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="