bfs-ftp 0.7.6 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d38185964804e9e5a66c247e02217133fc179dd56572ce1f31796e327be2b80
-  data.tar.gz: 2880cb28f4a001c41bc374ed41bc74fd84923bec89aa70adfc3d2fe4256928fe
+  metadata.gz: c5be3ed746fb7cb16a7370091447d6bfcb813c272d272e7a5a7c22eaef49eb4a
+  data.tar.gz: 6d70e82c8747aca2b0f6a6f2932b9c72c283506cac0598da2f5a9438f02b730c
 SHA512:
-  metadata.gz: b50533901599636d409e2f188e7ad79815488db581df8b9e8f89c9fd32e2ca0347216f75c8230f17370e9179ab2ffd99810f27dfb8ba19fa832a497538ffb635
-  data.tar.gz: 19f7c1630ea6e047d63de8c87d2c07f6fe795f0b23be627454d3414845380d4d0fdf0e044c8b505e21d9ebd8afebb219025c3a3ace6b5e377f0c904b309ae9bf
+  metadata.gz: b88b1f0dfc2c649bc606ac91e24e115091c8d79f6f59ba0828dd6ba95edf5cb2f5746f43582888410e9d447e84887614748e849f6e86600ce2bdd37a6a8de22b
+  data.tar.gz: 5c16e3e43dbce48a893e7e61731211f1d0bf6c234f1f5879dcde5de182e66a7beee21f0589a108401a7e4c77433dc9b083c6a39b304e106c3e125155b824d2f0

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)
@@ -52,7 +58,7 @@ module BFS
       # Creates a new file and opens it for writing
       def create(path, encoding: self.encoding, perm: self.perm, **_opts, &block)
         path = norm_path(path)
-        BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
+        BFS::Writer.new(path, encoding: encoding, perm: perm) do |t|
           mkdir_p File.dirname(path)
           @client.put(t, path)
         end.perform(&block)
@@ -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

data/spec/bfs/bucket/ftp_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
 RSpec.describe BFS::Bucket::FTP, ftp: true do
+  subject { described_class.new hostname, **conn_opts }
+
   let(:hostname) { '127.0.0.1' }
   let(:conn_opts) { { port: 7021, username: 'ftpuser', password: 'ftppass', prefix: SecureRandom.uuid } }
 
-  subject { described_class.new hostname, **conn_opts }
-  after   { subject.close }
+  after { subject.close }
 
   it_behaves_like 'a bucket',
                   content_type: false,
                   metadata: false
 
-  it 'should resolve from URL' do
+  it 'resolves from URL' do
     bucket = BFS.resolve('ftp://ftpuser:ftppass@127.0.0.1:7021')
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.instance_variable_get(:@client).pwd).to eq('/ftp/ftpuser')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-ftp
 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: 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.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: FTP adapter for bfs