bfs 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32e754ffdd81a72cc648eb786fc2ca34839c0debe67b80e2ee6256766c8194e4
-  data.tar.gz: 443d181595af99d3b00be21809965d68e2373439435bfefbca35df168bdc1962
+  metadata.gz: 03b755b393438097fae39868308111fa84eab83caab2fd514098acc068f62feb
+  data.tar.gz: 1d35f8bc21448e828d13ee0e47b6c04ed156ebb9e4b1cd3273125ab16774945c
 SHA512:
-  metadata.gz: 13cd555372996a1a2050229f57eae18c32215dc0303e83ccbc866ed4e6b3e5d1c8079a827520ed39871c39152cf96a01532bc254ad2f1a9e996cf6a32b5c24c9
-  data.tar.gz: 8ac28da9c0c664810e5665299f1cd97609dba0c789fc42244e9494a95a8587ef799ecee64c38eec40a301c2e1d131bcb98aad89d0ee4d43ab4f66a2db14203c7
+  metadata.gz: a95cfcb805b0f91b3dba7113abab08d5792030cd111e8772a94824baee0fe10d9b932d50e5d6f8e17575b1f224ceea43e46e556029bd7e0a70f610794c277b25
+  data.tar.gz: 947eea2d6c8482718cb6e33b04038b8e8c23ae9f5b0e43e0af4e6a401adf19d6c1bf8a5784b92c659ac8d589845195c9fe3e51f5e7d3ce278ffe49fdf6693cfd

data/lib/bfs/bucket/abstract.rb

@@ -40,6 +40,11 @@ module BFS
         raise 'not implemented'
       end
 
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(_pattern = '**', **_opts)
+        raise 'not implemented'
+      end
+
       # Info returns the info for a single file
       def info(_path, **_opts)
         raise 'not implemented'

data/lib/bfs/bucket/fs.rb

@@ -15,19 +15,30 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **_opts)
-        Enumerator.new do |y|
-          Pathname.glob(@root.join(pattern)) do |pname|
-            y << trim_prefix(pname.to_s) if pname.file?
+        Enumerator.new do |acc|
+          walk(pattern) do |path, _|
+            acc << path
+          end
+        end
+      end
+
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(pattern = '**/*', **_opts)
+        Enumerator.new do |acc|
+          walk(pattern) do |path, stat|
+            acc << file_info(path, stat)
           end
         end
       end
 
       # Info returns the info for a single file
       def info(path, **_opts)
-        full = @root.join(norm_path(path))
-        path = trim_prefix(full.to_s)
-        stat = full.stat
-        BFS::FileInfo.new(path: path, size: stat.size, mtime: stat.mtime, mode: BFS.norm_mode(stat.mode))
+        norm = norm_path(path)
+        pn   = @root.join(norm)
+        stat = pn.stat
+        raise BFS::FileNotFound, path unless stat.file?
+
+        file_info(norm, stat)
       rescue Errno::ENOENT
         raise BFS::FileNotFound, path
       end
@@ -93,6 +104,19 @@ module BFS
       rescue Errno::ENOENT
         raise BFS::FileNotFound, norm_path(src)
       end
+
+      private
+
+      def walk(pattern)
+        Pathname.glob(@root.join(pattern)) do |pn|
+          stat = pn.stat
+          yield(trim_prefix(pn.to_s), stat) if stat.file?
+        end
+      end
+
+      def file_info(path, stat)
+        BFS::FileInfo.new(path: path, size: stat.size, mtime: stat.mtime, mode: BFS.norm_mode(stat.mode))
+      end
     end
   end
 end

data/lib/bfs/bucket/in_mem.rb

@@ -36,8 +36,17 @@ module BFS
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **_opts)
         Enumerator.new do |y|
-          @files.each_key do |key|
-            y << key if File.fnmatch?(pattern, key, File::FNM_PATHNAME)
+          @files.each_key do |path|
+            y << path if File.fnmatch?(pattern, path, File::FNM_PATHNAME)
+          end
+        end
+      end
+
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(pattern = '**/*', **_opts)
+        Enumerator.new do |y|
+          @files.each_key do |path|
+            y << file_info(path) if File.fnmatch?(pattern, path, File::FNM_PATHNAME)
           end
         end
       end
@@ -47,8 +56,7 @@ module BFS
         path = norm_path(path)
         raise BFS::FileNotFound, path unless @files.key?(path)
 
-        entry = @files[path]
-        BFS::FileInfo.new(path: path, size: entry.io.size, mtime: entry.mtime, content_type: entry.content_type, metadata: entry.metadata)
+        file_info(path)
       end
 
       # Creates a new file and opens it for writing.
@@ -84,6 +92,13 @@ module BFS
       def rm(path, **_opts)
         @files.delete(norm_path(path))
       end
+
+      private
+
+      def file_info(path)
+        entry = @files[path]
+        BFS::FileInfo.new path: path, size: entry.io.size, mtime: entry.mtime, content_type: entry.content_type, metadata: entry.metadata
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies: []
 description: Minimalist abstraction for bucket storage
 email: dimitrij@blacksquaremedia.com
@@ -51,7 +51,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: Multi-platform cloud bucket adapter