bfs-gs 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 345994febf6083e1839a95b796da1b86075c831aa320eee9f9fff7ea13974099
-  data.tar.gz: '096620f7ada887459c5bbd94b46c94c8175523f03f2d47b33880068af3e7b2e2'
+  metadata.gz: 6c05921b7f3936aefcd380046b1a398d40530215948615de357bf0d7c0d6e575
+  data.tar.gz: 557b1a80b5a11514fb4f0306774480a22033d280d6c721c90e970bb1e1aec708
 SHA512:
-  metadata.gz: 7e65dd0c03fbedff21bf049bcd32db8e3e3a55456577cf1e28647ab109dab3e8b2123199b210c97e96e458263672ef1fe55c5c21008cfe5494330e9e2fb4e912
-  data.tar.gz: cbaf26fa087974a16d84bead6fdb88a99b66c17fc4876fbe7df70cd67ace72ed430345c175419c68fb6321896beddefe9ed15ff3a2d6abcaac2002cf8aad4e1f
+  metadata.gz: 0f99769aafab92479689073ddafc7544fe91589964e0de2164acc58dc6dca77235a13712bdba20a5a4ee528901291ae0bf8a846a11ca3d2fb4be6490bf47d891
+  data.tar.gz: 0a82c9940d8ed456548abd934d57b826a9beb3a9f73cfb90392ad92a168da164c62eacde0d626b13e6c3d520f37502a003cfb79d61f35666d3583021bf9671b6

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,7 +56,7 @@ 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
@@ -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,26 +3,26 @@ 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
 
 bucket_name = 'bsm-bfs-unittest'
 
 RSpec.describe BFS::Bucket::GS, gs: true do
-  let(:prefix) { "x/#{SecureRandom.uuid}/" }
-
   subject do
     described_class.new bucket_name, prefix: prefix
   end
 
-  after :all do
-    bucket = described_class.new bucket_name, 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
+  it 'resolves from URL' do
     bucket = BFS.resolve("gs://#{bucket_name}")
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.name).to eq(bucket_name)
@@ -36,7 +36,7 @@ RSpec.describe BFS::Bucket::GS, gs: true do
     bucket.close
   end
 
-  it 'should enumerate over a large number of files' do
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-gs
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !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.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: GS bucket adapter for bfs