bfs-gs 0.6.4 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae53e3d99f879a7365cb5dd3ca06b5407cdd4542cef07a839a2b1362f83c8deb
-  data.tar.gz: 637c8a48a18b2df89381ca6ff16fbd2d4d0f993e025517d83de3032083b167ae
+  metadata.gz: ba5632283f82b8a38d0f25ccc839948c8d45fcdd81da8ed4bc3ab9154f62becb
+  data.tar.gz: eaed2684e48c0cb4cad20c51b1635ae4c4c2d173d4fdbe994e7a4f59ff760f8b
 SHA512:
-  metadata.gz: 59dbc0f2e5cd99bc71af65e922eaa439e41392763c80e13ce71a50fb40aaa27ffda796dc46615e76340cf799d584ec1bb61438e3d8b47db75f556e51d7c3639e
-  data.tar.gz: '08c336ee7b0a81be35f230b23b603a08f2523ae4cd5d1c04aee50b0af0576dbaf86bb053ad796cd9687a350e15d9642e38654a055361f370561f938286e7e430'
+  metadata.gz: f06d8e618fc56f661c965875d5597fd1a0c692c30f23e3e67d81c0889b9e37d309a211f88c51146f674a09b858be5f060a813ea95bcfb8379ca532191caa25dd
+  data.tar.gz: aa7dced6719a04c98817e4466b514598614b2319f4fdf597dcf650bc1760c2548a3258651dc2e74f3ee2ef54d7d7ce652745e1ce308d219da4032c336abd0597

data/bfs-gs.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 'bfs', s.version
   s.add_dependency 'google-cloud-storage', '~> 1.18'

data/lib/bfs/bucket/gs.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(prefix: prefix) if prefix
 
@@ -105,12 +105,15 @@ module BFS
   end
 end
 
-BFS.register('gs') do |url, opts|
+BFS.register('gs') do |url, opts, block|
   prefix = BFS.norm_path(opts.key?(:prefix) ? opts[:prefix] : url.path)
   prefix = nil if prefix.empty?
-
-  BFS::Bucket::GS.new url.host, **opts.slice(:project_id, :credentials, :acl),
-                      prefix: prefix,
-                      timeout: opts.key?(:timeout) ? opts[:timeout].to_i : nil,
-                      retries: opts.key?(:retries) ? opts[:retries].to_i : nil
+  opts   = opts.slice(:project_id, :credentials, :acl)
+  extra  = {
+    prefix: prefix,
+    timeout: opts.key?(:timeout) ? opts[:timeout].to_i : nil,
+    retries: opts.key?(:retries) ? opts[:retries].to_i : nil,
+  }
+
+  BFS::Bucket::GS.open url.host, **opts, **extra, &block
 end

data/spec/bfs/bucket/gs_spec.rb

@@ -6,17 +6,9 @@ module Google::Auth::CredentialsLoader
   module_function :warn_if_cloud_sdk_credentials # rubocop:disable Style/AccessModifierDeclarations
 end
 
-sandbox  = { project: 'bogus', bucket: 'bsm-bfs-unittest' }.freeze
-run_spec = \
-  begin
-    s = Google::Cloud::Storage.new(project_id: sandbox[:project])
-    !s.bucket(sandbox[:bucket]).nil?
-  rescue Signet::AuthorizationError => e
-    warn "WARNING: unable to run #{File.basename __FILE__}: #{e.message}"
-    false
-  end
+sandbox = { project: 'bogus', bucket: 'bsm-bfs-unittest' }.freeze
 
-RSpec.describe BFS::Bucket::GS, if: run_spec do
+RSpec.describe BFS::Bucket::GS, gs: true do
   let(:prefix) { "x/#{SecureRandom.uuid}/" }
 
   subject do
@@ -34,15 +26,18 @@ RSpec.describe BFS::Bucket::GS, if: run_spec do
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.name).to eq(sandbox[:bucket])
     expect(bucket.instance_variable_get(:@prefix)).to be_nil
+    bucket.close
 
     bucket = BFS.resolve("gs://#{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], project_id: sandbox[:project], prefix: 'm/'
     expect(bucket.ls('**/*').count).to eq(2121)
+    bucket.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-gs
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: GS bucket adapter for bfs