bfs-gs 0.6.5 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460902d2cc058b953f1180b5c6baa79979e13ce6601bf7e072a6c422d17ac348
-  data.tar.gz: 27aba18d5a723270b62575f9beb922a1614c835a03c909454f0dfbed47d4b1bd
+  metadata.gz: 7d02eb412617f33a9e5485ddc8f80c1a1daee35a13b8bf8de3522b42af8e67fd
+  data.tar.gz: 369a667e176cc6105c445ea127dc5c37d01042ab7d7f81b472591b2000070c4b
 SHA512:
-  metadata.gz: c6b0f5d5881f56eabb64303264f3faf9b9b76f602ee90ca6f92e39987cdfbae2071c668690b024833afcd2ba10a6c79e15406c26f4ae4899865d6fb2290e6131
-  data.tar.gz: 30825d6a15e154fda4db8fa9eae5bd2ab7652e239660f3e56ca21d2745439c2a7c781e60a85880e9a5ab9e0ce9f7fa937c7e812c2a12cd21cfd661490b58b730
+  metadata.gz: 7f0a7e56499b185b886945229e6bb85714ac64583b878e7f820402d0546b81a1ae885d19f6545ee6ee3655ed0a9639703b2b6826940a2f1b6786d6ccf7ab3f09
+  data.tar.gz: 94b29d3eb53ec0365bec5beaed37246a5b63514954262b49b9df1d9d4bc6e61fd1c1898546cea21204070b50c870db1ef4d2e445cb5f81f78f9744c88d7abd4d

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.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: bfs
@@ -16,14 +16,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
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -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:
   - - ">="