bfs-ftp 0.7.1 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82596b06db1568d9f633733e9ee00a0473d3597c96b4ea755f7c67f1e0b150e2
-  data.tar.gz: ea4dfedb77af9e9a77167aac97745deb9fca9e598eab058d53e9270f0ef709c8
+  metadata.gz: 0d38185964804e9e5a66c247e02217133fc179dd56572ce1f31796e327be2b80
+  data.tar.gz: 2880cb28f4a001c41bc374ed41bc74fd84923bec89aa70adfc3d2fe4256928fe
 SHA512:
-  metadata.gz: 6bc46e356ba7c382e7b7614f4770dafc3019796b212873f41fecbf6ab571ec5961e109cfd008120cf5fd7b3549be8d09b5a4a3d6c719b1dd6b93d8ff5464c9ec
-  data.tar.gz: cdb89ae7e48ca49e02a051c595ea021a69e8106d2427b615a5073152279dcdf0c3473dd64183838120765aeb879299ddbaf1cbbe514cb13256e77c26d6c24ca9
+  metadata.gz: b50533901599636d409e2f188e7ad79815488db581df8b9e8f89c9fd32e2ca0347216f75c8230f17370e9179ab2ffd99810f27dfb8ba19fa832a497538ffb635
+  data.tar.gz: 19f7c1630ea6e047d63de8c87d2c07f6fe795f0b23be627454d3414845380d4d0fdf0e044c8b505e21d9ebd8afebb219025c3a3ace6b5e377f0c904b309ae9bf

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::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
@@ -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.1
+  version: 0.7.6
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-11-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.1
+        version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.6
 - !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.1.2
 signing_key: 
 specification_version: 4
 summary: FTP adapter for bfs