bfs-ftp 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc095ce10f0585ef7c4ece472b54d4b6543017f47b0b49f267b0bdd199aa493
-  data.tar.gz: e366f5a503feb6bf5843f8459823052ca939952aa3bd94288813a1ac58835bee
+  metadata.gz: 6bf5884a977c9d577fc09820f252807b903a8d1fbc73f32d10f111502512f789
+  data.tar.gz: e01f3f8c33b596ebe298921d607a180cde1d1b47331a88e2d774d3e1b7c4a04a
 SHA512:
-  metadata.gz: 60d25fde695df0aa25eb4f3ced184a87692211b64982d33c1a9ec1bc8ca42f6eeb89a0ce343c9230a385e2ed622033982e0ce4e5ad89a1648cf6a9be2b24ab82
-  data.tar.gz: 2539e624485bf2ddf7b171dbc981a51a5f5e4c60e378e78b5caa5c8286f1a11ae0ffb6c24246ac3b8737b6ab89a408fe81a1994cb63e20a8c4c1e5b280cccb55
+  metadata.gz: 9ff95022b49b9ec2bd51d8a30d14cdd07bb9c691d11fdbbe4da5b4522e405908e5f84398149725f57596b90e8c9249e855c1b11124f5f17cc6b4c7c22d6ad072
+  data.tar.gz: 013e221e874fa7b29c9d94589bade6d249adb3258b021872b1cdf5a18c22b607d571999d19abd66eea38069b3079cad8ecb2146f7785c48422c3ed72d1d3f1bf

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
@@ -107,7 +125,7 @@ module BFS
   end
 end
 
-BFS.register('ftp', 'sftp') do |url, opts, block|
+BFS.register('ftp') do |url, opts, block|
   prefix = BFS.norm_path(opts[:prefix] || url.path)
   opts[:prefix] = prefix unless prefix.empty?
 
@@ -115,7 +133,7 @@ BFS.register('ftp', 'sftp') do |url, opts, block|
     username: url.user ? CGI.unescape(url.user) : nil,
     password: url.password ? CGI.unescape(url.password) : nil,
     port: url.port,
-    ssl: opts.key?(:ssl) || url.scheme == 'sftp',
+    ssl: opts.key?(:ssl),
   }
   BFS::Bucket::FTP.open url.host, **opts, **extra, &block
 end

data/spec/bfs/bucket/ftp_spec.rb

@@ -1,25 +1,26 @@
 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 } }
+  let(:conn_opts) { { port: 7021, username: 'user', password: 'pass', 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
-    bucket = BFS.resolve('ftp://ftpuser:ftppass@127.0.0.1:7021')
+  it 'resolves from URL' do
+    bucket = BFS.resolve('ftp://user:pass@127.0.0.1:7021')
     expect(bucket).to be_instance_of(described_class)
-    expect(bucket.instance_variable_get(:@client).pwd).to eq('/ftp/ftpuser')
+    expect(bucket.instance_variable_get(:@client).pwd).to eq('/ftp/user')
     bucket.close
 
-    bucket = BFS.resolve('ftp://ftpuser:ftppass@127.0.0.1:7021/a/b/')
+    bucket = BFS.resolve('ftp://user:pass@127.0.0.1:7021/a/b/')
     expect(bucket).to be_instance_of(described_class)
-    expect(bucket.instance_variable_get(:@client).pwd).to eq('/ftp/ftpuser/a/b')
+    expect(bucket.instance_variable_get(:@client).pwd).to eq('/ftp/user/a/b')
     bucket.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-ftp
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-06-29 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.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !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