bfs-ftp 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38b05322f90198412292ff3521d4d59b82b32bc3d9f10b8799a8dff4b29a8fe3
-  data.tar.gz: 0db611782568ba9ea4b58f92bc706d755dc5cb19a5ca5ed9f347e832378bcaf4
+  metadata.gz: e82797725ebe072d7a7d384baaf2409ad28c14a12e01e5dcf93fc43f611db082
+  data.tar.gz: fa949c1d80de980559ac17cd05d103a7b226e02b650a64b81a949fc7bc83fbad
 SHA512:
-  metadata.gz: b46c593f7f2c31b2e1284091f3aefd9557c5c807538e7bebb3cbacc89814e23be126f8699472ac7f6e5e7b612374d4425e75caafd79f1eb00ffcece69ace155b
-  data.tar.gz: f98a8d56a8d41bcc500e61167feedf3bb51b0fca9a5c146e3d78ead1e564932062eaf4b5bfcae1de43544c5a8d224be0a3b0ee891406e681711b425a47a343f8
+  metadata.gz: 07a83b8967eb478a2b81a13bf369e6be61b8c921baa1a773e2a4132a0e73968ec2c21be07be0acce6d7cf04c1140ba9ca00e0073de9823faebb3c7a0ab074d5b
+  data.tar.gz: fe4f046c10dcf18e2f657d1b6b780e555b99e9fc6db252bd158547ca6fb43f490180184a729d25365d8df769ad7c63d090b9c590a38f9c9609e5934b6e2d75fa

data/lib/bfs/bucket/ftp.rb

@@ -31,7 +31,7 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **_opts)
-        dir = pattern[%r{^[^\*\?\{\}\[\]]+/}]
+        dir = pattern[%r{^[^*?\{\}\[\]]+/}]
         dir&.chomp!('/')
 
         Enumerator.new do |y|
@@ -52,17 +52,10 @@ 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)
-        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
+        BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
           mkdir_p File.dirname(path)
           @client.put(t, path)
-        end
-        return temp unless block
-
-        begin
-          yield temp
-        ensure
-          temp.close
-        end
+        end.perform(&block)
       end
 
       # Opens an existing file for reading
@@ -81,7 +74,7 @@ module BFS
       def rm(path, **_opts)
         path = norm_path(path)
         @client.delete(path)
-      rescue Net::FTPPermError
+      rescue Net::FTPPermError # rubocop:disable Lint/SuppressedException
       end
 
       # Closes the underlying connection
@@ -114,10 +107,15 @@ module BFS
   end
 end
 
-BFS.register('ftp', 'sftp') do |url, opts|
-  BFS::Bucket::FTP.new url.host, **opts,
-                       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'
+BFS.register('ftp', 'sftp') do |url, opts, block|
+  prefix = BFS.norm_path(opts[:prefix] || url.path)
+  opts[:prefix] = prefix unless prefix.empty?
+
+  extra = {
+    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',
+  }
+  BFS::Bucket::FTP.open url.host, **opts, **extra, &block
 end

data/spec/bfs/bucket/ftp_spec.rb

@@ -1,17 +1,8 @@
 require 'spec_helper'
 
-sandbox  = { host: '127.0.0.1', port: 7021, username: 'ftpuser', password: 'ftppass' }.freeze
-run_spec = \
-  begin
-    ftp = Net::FTP.new sandbox[:host], sandbox
-    ftp.list
-    ftp.close
-  rescue Errno::ECONNREFUSED, Net::FTPError => e
-    warn "WARNING: unable to run #{File.basename __FILE__}: #{e.message}"
-    false
-  end
+sandbox = { host: '127.0.0.1', port: 7021, username: 'ftpuser', password: 'ftppass' }.freeze
 
-RSpec.describe BFS::Bucket::FTP, if: run_spec do
+RSpec.describe BFS::Bucket::FTP, ftp: true do
   subject { described_class.new sandbox[:host], **sandbox.merge(prefix: SecureRandom.uuid) }
   after   { subject.close }
 
@@ -22,5 +13,12 @@ RSpec.describe BFS::Bucket::FTP, if: run_spec do
   it 'should resolve 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')
+    bucket.close
+
+    bucket = BFS.resolve('ftp://ftpuser:ftppass@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')
+    bucket.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-ftp
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-11-02 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.0
+        version: 0.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: net-ftp-list
   requirement: !ruby/object:Gem::Requirement