bfs-gs 0.7.5 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068f4b652ec2ef87b680e2ababa9de943b87807626a662fc645813d8fe038eca'
-  data.tar.gz: de6b4d78c33dee9c85929031cf29f5b3fc19c9a0d0d28ae8735609f5f5f00b1e
+  metadata.gz: 361c56113182e489c7373029e15e134fe2f65a0cdec35b00f97a72ed8b8b94b7
+  data.tar.gz: 8f969343d8848f1ba073ce0948836290591fd1096995ed0456a7715c89e7cc70
 SHA512:
-  metadata.gz: 7d15bb556314fa4e06c24742890a47427b4b7af5e946120c7e24079e613dd236384146af23e67349e5625e7bcd283a5900394a1fb75144cff885bb7020231b76
-  data.tar.gz: 22bd175fecc3c3e75d3a60154a760c1c87c5e773f5ec6e1dd90af001b4ef91a799595d9942c3a5128542a0cd58a16a0f4a48e52e6a6b850657cacb66bc089bcd
+  metadata.gz: '04359b81560d94527826da03a81d00b2f399a7e2d77e8d5c563aa6f1587d8163aa863f69288aaecdc5213b07e1d26e579c129958d7d761a797ddf11bc013de84'
+  data.tar.gz: b3656acbcfaf1074bdcebabb4c6df76801bb913bceb37bb5be5a68e4099543d0a31e0953f7606af280faa2368aa415e4d36bce375e0ab6b87241d39b05158165

data/lib/bfs/bucket/gs.rb

@@ -33,14 +33,18 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **opts)
-        prefix = pattern[%r{^[^*?\{\}\[\]]+/}]
-        prefix = File.join(*[@prefix, prefix].compact) if @prefix
-        opts   = opts.merge(prefix: prefix) if prefix
+        Enumerator.new do |acc|
+          walk(pattern, **opts) do |name, _|
+            acc << name
+          end
+        end
+      end
 
-        Enumerator.new do |y|
-          @bucket.files(**opts).all do |file|
-            name = trim_prefix(file.name)
-            y << name if File.fnmatch?(pattern, name, File::FNM_PATHNAME)
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(pattern = '**/*', **opts)
+        Enumerator.new do |acc|
+          walk(pattern, **opts) do |name, file|
+            acc << file_info(name, file)
           end
         end
       end
@@ -52,14 +56,14 @@ module BFS
         raise BFS::FileNotFound, trim_prefix(path) unless file
 
         name = trim_prefix(file.name)
-        BFS::FileInfo.new(path: name, size: file.size, mtime: file.updated_at.to_time, content_type: file.content_type, metadata: norm_meta(file.metadata))
+        file_info(name, file)
       end
 
       # Creates a new file and opens it for writing
       def create(path, encoding: self.encoding, perm: self.perm, **opts, &block)
         opts[:metadata] = norm_meta(opts[:metadata])
         path = full_path(path)
-        BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
+        BFS::Writer.new(path, encoding: encoding, perm: perm) do |t|
           File.open(t, encoding: encoding) do |file|
             @bucket.create_file(file, path, **opts)
           end
@@ -94,6 +98,23 @@ module BFS
 
         file.copy(full_path(dst), **opts)
       end
+
+      private
+
+      def walk(pattern, **opts)
+        prefix = pattern[%r{^[^*?\{\}\[\]]+/}]
+        prefix = File.join(*[@prefix, prefix].compact) if @prefix
+        opts   = opts.merge(prefix: prefix) if prefix
+
+        @bucket.files(**opts).all do |file|
+          name = trim_prefix(file.name)
+          yield(name, file) if File.fnmatch?(pattern, name, File::FNM_PATHNAME)
+        end
+      end
+
+      def file_info(name, file)
+        BFS::FileInfo.new(path: name, size: file.size, mtime: file.updated_at.to_time, content_type: file.content_type, metadata: norm_meta(file.metadata))
+      end
     end
   end
 end

data/spec/bfs/bucket/gs_spec.rb

@@ -3,40 +3,41 @@ require 'spec_helper'
 # silence warnings
 module Google::Auth::CredentialsLoader
   def warn_if_cloud_sdk_credentials(*); end
-  module_function :warn_if_cloud_sdk_credentials # rubocop:disable Style/AccessModifierDeclarations
+  module_function :warn_if_cloud_sdk_credentials
 end
 
-sandbox = { project: 'bogus', bucket: 'bsm-bfs-unittest' }.freeze
+bucket_name = 'bsm-bfs-unittest'
 
 RSpec.describe BFS::Bucket::GS, gs: true do
-  let(:prefix) { "x/#{SecureRandom.uuid}/" }
-
   subject do
-    described_class.new sandbox[:bucket], project_id: sandbox[:project], prefix: prefix
+    described_class.new bucket_name, prefix: prefix
   end
-  after :all do
-    bucket = described_class.new sandbox[:bucket], project_id: sandbox[:project], prefix: 'x/'
+
+  let(:prefix) { "x/#{SecureRandom.uuid}/" }
+
+  after do
+    bucket = described_class.new bucket_name, prefix: prefix
     bucket.ls.each {|name| bucket.rm(name) }
   end
 
   it_behaves_like 'a bucket'
 
-  it 'should resolve from URL' do
-    bucket = BFS.resolve("gs://#{sandbox[:bucket]}/?project_id=#{sandbox[:project]}")
+  it 'resolves from URL' do
+    bucket = BFS.resolve("gs://#{bucket_name}")
     expect(bucket).to be_instance_of(described_class)
-    expect(bucket.name).to eq(sandbox[:bucket])
+    expect(bucket.name).to eq(bucket_name)
     expect(bucket.instance_variable_get(:@prefix)).to be_nil
     bucket.close
 
-    bucket = BFS.resolve("gs://#{sandbox[:bucket]}/a/b/")
+    bucket = BFS.resolve("gs://#{bucket_name}/a/b/")
     expect(bucket).to be_instance_of(described_class)
-    expect(bucket.name).to eq(sandbox[:bucket])
+    expect(bucket.name).to eq(bucket_name)
     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/'
+  it 'enumerates over a large number of files' do
+    bucket = described_class.new bucket_name, prefix: 'm/'
     expect(bucket.ls('**/*').count).to eq(2121)
     bucket.close
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-gs
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2021-05-27 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.5
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: GS bucket adapter for bfs