bfs-ftp 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd454e65db18af93c47c157366b9930f293c971f5a482d6de2d6448dfb673c24
-  data.tar.gz: 1dba041b60e9e5093021eb55a050203a18b7764464add61626c083887a158385
+  metadata.gz: b481cc58f871c2d32a31c6b27a2d7663fabb5e780823aaf8a59766ca84ce92a7
+  data.tar.gz: d38ae55120b1b1ba286b0754a8cd549652a52d7dcec15938e2f174beb7a1995a
 SHA512:
-  metadata.gz: 77e832b6c5a8c7f261cfb96b2e01351f9963644576f85b3b19fb90dcb8580b1b73ebcd7885f8b0f8493f78ad35cb097eb9c430b130f35b6672137a66f052f276
-  data.tar.gz: 1f903add7d127b61ac330af5a8c2da9b0df3c8e3d0ce16e7c4f3417979df4393701e157687dd41db679da1f286a6ea0bef1fb0c5bff5e6056588b056c5f780a2
+  metadata.gz: f367b5df775d462366cc2af0017d5684cac8c59f2e291ca535050e6bbe5807aa22993f4ebab6b3a7189cd311d3644f56791c36f210d5f4a9d83111f80c93ee02
+  data.tar.gz: d4f8b6949f088c003e97d0de38e69e574096ddc650588e8cadee5782addba3c5c99a95a7f27b078cb92c935ccc954c3deedb5eaf32de3452a1aa26c88c05ac80

data/lib/bfs/bucket/ftp.rb

@@ -115,6 +115,9 @@ module BFS
 end
 
 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,

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.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-10 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.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: net-ftp-list
   requirement: !ruby/object:Gem::Requirement