bfs-ftp 0.7.5 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e82797725ebe072d7a7d384baaf2409ad28c14a12e01e5dcf93fc43f611db082
-  data.tar.gz: fa949c1d80de980559ac17cd05d103a7b226e02b650a64b81a949fc7bc83fbad
+  metadata.gz: f926cbf5d1e11566b003f431781d2a7724619245d3cb6f65a35f74db0a1c1c86
+  data.tar.gz: a2db0fcadc0b559053dd92cfa48980ea94949a5aa2d1b66316042cbdadc10b40
 SHA512:
-  metadata.gz: 07a83b8967eb478a2b81a13bf369e6be61b8c921baa1a773e2a4132a0e73968ec2c21be07be0acce6d7cf04c1140ba9ca00e0073de9823faebb3c7a0ab074d5b
-  data.tar.gz: fe4f046c10dcf18e2f657d1b6b780e555b99e9fc6db252bd158547ca6fb43f490180184a729d25365d8df769ad7c63d090b9c590a38f9c9609e5934b6e2d75fa
+  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)
@@ -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,16 +1,18 @@
 require 'spec_helper'
 
-sandbox = { host: '127.0.0.1', port: 7021, username: 'ftpuser', password: 'ftppass' }.freeze
-
 RSpec.describe BFS::Bucket::FTP, ftp: true do
-  subject { described_class.new sandbox[:host], **sandbox.merge(prefix: SecureRandom.uuid) }
-  after   { subject.close }
+  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 } }
+
+  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.5
+  version: 0.8.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 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.5
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        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.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: FTP adapter for bfs