bfs-ftp 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd454e65db18af93c47c157366b9930f293c971f5a482d6de2d6448dfb673c24
-  data.tar.gz: 1dba041b60e9e5093021eb55a050203a18b7764464add61626c083887a158385
+  metadata.gz: 3fc095ce10f0585ef7c4ece472b54d4b6543017f47b0b49f267b0bdd199aa493
+  data.tar.gz: e366f5a503feb6bf5843f8459823052ca939952aa3bd94288813a1ac58835bee
 SHA512:
-  metadata.gz: 77e832b6c5a8c7f261cfb96b2e01351f9963644576f85b3b19fb90dcb8580b1b73ebcd7885f8b0f8493f78ad35cb097eb9c430b130f35b6672137a66f052f276
-  data.tar.gz: 1f903add7d127b61ac330af5a8c2da9b0df3c8e3d0ce16e7c4f3417979df4393701e157687dd41db679da1f286a6ea0bef1fb0c5bff5e6056588b056c5f780a2
+  metadata.gz: 60d25fde695df0aa25eb4f3ced184a87692211b64982d33c1a9ec1bc8ca42f6eeb89a0ce343c9230a385e2ed622033982e0ce4e5ad89a1648cf6a9be2b24ab82
+  data.tar.gz: 2539e624485bf2ddf7b171dbc981a51a5f5e4c60e378e78b5caa5c8286f1a11ae0ffb6c24246ac3b8737b6ab89a408fe81a1994cb63e20a8c4c1e5b280cccb55

data/lib/bfs/bucket/ftp.rb

@@ -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::Writer.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
@@ -115,6 +108,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,18 +1,10 @@
 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
+RSpec.describe BFS::Bucket::FTP, ftp: true do
+  let(:hostname) { '127.0.0.1' }
+  let(:conn_opts) { { port: 7021, username: 'ftpuser', password: 'ftppass', prefix: SecureRandom.uuid } }
 
-RSpec.describe BFS::Bucket::FTP, if: run_spec do
-  subject { described_class.new sandbox[:host], **sandbox.merge(prefix: SecureRandom.uuid) }
+  subject { described_class.new hostname, **conn_opts }
   after   { subject.close }
 
   it_behaves_like 'a bucket',
@@ -22,5 +14,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.8.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-12-01 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.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: net-ftp-list
   requirement: !ruby/object:Gem::Requirement