bfs-ftp 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a2274fa3727fd33cef1df0ab403e5db898294ad3e1ae48f580ece29dfa7900
-  data.tar.gz: 1380a85411db753dbc2d4b273e8aba23a82b2831c914c3d9e8cc7a1ade14c909
+  metadata.gz: f926cbf5d1e11566b003f431781d2a7724619245d3cb6f65a35f74db0a1c1c86
+  data.tar.gz: a2db0fcadc0b559053dd92cfa48980ea94949a5aa2d1b66316042cbdadc10b40
 SHA512:
-  metadata.gz: 1f0328f48f717639c9fd47ff20327e3828e8ab3a7e835936dec8bc49e9dd14da0bc24c6d9bcd285eaef1dd923039a9e36ca140f7f6da531c74617d0ce3c93e61
-  data.tar.gz: e730fb80fa69bce311cff7a5508e4045fe24db1194e32e567f760f4231e4b0c907cb02155c5c108b83fcfab7fe12663cd22e772ae4aec124a59451f1da71b75b
+  metadata.gz: a14a4f793f59f403d7562301015c3d92505c06e7d76eb98d3a0bf661f8a8108d8aaacf7a0948f728c10366b57b57928f5029f06a09368734addd04f6f0881f5a
+  data.tar.gz: c769992cb97bcdac23ad2e2669eefab10e274f170fc666f34b4a5e3efc7bcb62fc3181cbd6eb520589bc652ac776cf70e7242b6a3af4eabfd59f177794e57f23

data/lib/bfs/bucket/ftp.rb

@@ -31,16 +31,22 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **_opts)
-        dir = pattern[%r{^[^*?\{\}\[\]]+/}]
-        dir&.chomp!('/')
-
         Enumerator.new do |y|
-          glob(dir) do |path|
+          walk(pattern) 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|
+          walk(pattern) do |path, entry|
+            y << file_info(path, entry) if File.fnmatch?(pattern, path, File::FNM_PATHNAME)
+          end
+        end
+      end
+
       # Info returns the object info
       def info(path, **_opts)
         path = norm_path(path)
@@ -84,14 +90,26 @@ module BFS
 
       private
 
-      def glob(dir, &block)
-        @client.ls(dir || '.') do |e|
-          entry = Net::FTP::List.parse(e)
+      def file_info(path, entry)
+        BFS::FileInfo.new(path: path, size: entry.filesize, mtime: entry.mtime)
+      end
+
+      def walk(pattern, &block)
+        dir = pattern[%r{^[^*?\{\}\[\]]+/}]
+        dir&.chomp!('/')
+        walk_r(dir, &block)
+      end
+
+      def walk_r(dir, &block)
+        entries = @client.list(dir || '.')
+        entries.each do |ent|
+          entry = Net::FTP::List.parse(ent)
           if entry.dir?
             subdir = [dir, entry.basename].compact.join('/')
-            glob subdir, &block
+            walk_r(subdir, &block)
           elsif entry.file?
-            yield [dir, entry.basename].compact.join('/')
+            path = [dir, entry.basename].compact.join('/')
+            yield(path, entry)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-ftp
 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:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: net-ftp-list
   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: FTP adapter for bfs