bfs-gs 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2d89afa0f45efa9b6fd19cc525754cc52dd0860df44c1ca042371df28c1f75a
-  data.tar.gz: b5ec4ef496facbc6f062c81017ed0ed35f0a06f7e512b5a657688130bed041a7
+  metadata.gz: '068f4b652ec2ef87b680e2ababa9de943b87807626a662fc645813d8fe038eca'
+  data.tar.gz: de6b4d78c33dee9c85929031cf29f5b3fc19c9a0d0d28ae8735609f5f5f00b1e
 SHA512:
-  metadata.gz: 1c7c2c221cb15b740721a1224a73ffb1203fefd0431253f8b07e12cec454aa8d1b8806381bbe5036ee607fdc582f43ab98a862471ac3c37e76dcb7cad79ab9c1
-  data.tar.gz: a8f78a4813033d7ebe7cb244ae68a3424aadbf251d845f909614325e35931bf85816a4e3aceffdf51e8520e9023aa0fbb1528a46a18801f9335b71ae16864de0
+  metadata.gz: 7d15bb556314fa4e06c24742890a47427b4b7af5e946120c7e24079e613dd236384146af23e67349e5625e7bcd283a5900394a1fb75144cff885bb7020231b76
+  data.tar.gz: 22bd175fecc3c3e75d3a60154a760c1c87c5e773f5ec6e1dd90af001b4ef91a799595d9942c3a5128542a0cd58a16a0f4a48e52e6a6b850657cacb66bc089bcd

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
 
@@ -59,18 +59,11 @@ module BFS
       def create(path, encoding: self.encoding, perm: self.perm, **opts, &block)
         opts[:metadata] = norm_meta(opts[:metadata])
         path = full_path(path)
-        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
+        BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
           File.open(t, encoding: encoding) do |file|
             @bucket.create_file(file, path, **opts)
           end
-        end
-        return temp unless block
-
-        begin
-          yield temp
-        ensure
-          temp.close
-        end
+        end.perform(&block)
       end
 
       # Opens an existing file for reading
@@ -105,12 +98,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.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement