bfs-gs 0.7.6 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 204c52d94cef4322f9995de8bb647fab8db26bf4887168b43cfc9ca09d4bcc3a
-  data.tar.gz: e1e1645d86d891053ee41ae8c177ee4c26fb37613c46195016dfe93ee8c19750
+  metadata.gz: 60feaa9cdb01df69a203ad3186b59ccff80d3ea90b08d2c3829c295daab69bbb
+  data.tar.gz: 1fa9e149a27ab27ba3e7f1f7da9b7b2aa68bd1e847d67ba3ebf00e963ff3dae5
 SHA512:
-  metadata.gz: 0f7967ca40b047be697f909e853bdfa8db2dec44efbbb19c6f4e6ac8e711c5042b7fc43e5beb0a7f479da2dcfe32ffaadff7a7d1529af38d629e062e7314b33d
-  data.tar.gz: e1b5ec3d09f475ab2f09bb31a3a3a6e7c6b83c33a2792ceb02c2ebcb00adb6eabe21bc021d12058a3b7e59c94158e01106aaabc8d675188d41a31b4c36eaa904
+  metadata.gz: f87a1efec3101b603f39adb8523655e947b7ebcd85369ea0bcbce462005c6ac12192a8a1a8e4127cc88e0502eb41b80232a63a51a1d29547ecf8ffe441c69e62
+  data.tar.gz: c13c82ee443f8857b88158152ae66fc98de11e7f7bbb27b11c5284957293c7a1216dd70c8e6098a4177fedac398ee1ef9af893e046dceffd7a6fb1d0f716eb50

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,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.7.6
+  version: 0.8.4
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 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.6
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.8.4
 - !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