bfs-ftp 0.6.5 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b81fe78a4d4ed60e8bea55f766aeaca804f481134fe8f22e4c83d08b187a73
-  data.tar.gz: bd0249940b1b8c636e29a9dd9d270078093040f630a7a3b027c3690e7b16c9c7
+  metadata.gz: a5820d3e120364beff252e9be4627e000b78ada20644d8bd5c84ad4eb44eb3e1
+  data.tar.gz: bac8723f260ec70508c558b8e6ca777741f91794efd4ee2ef31334c328076d28
 SHA512:
-  metadata.gz: 66062208216843dea9ac3f5244851b8ed4e8e9c73f280aa02e3cc6b60205d7a88244d7431763e1e303beaf0d2ceca5ee86b9083f0656817d76efeaf47e561cb4
-  data.tar.gz: e07b00f473543d6e825bb99d21ed4de2adc0e3b2c5ebe829b6edfbb5ed580ed82f01cb544a818040068e24b45b9620db9dbd15a047da2f33fdaa0fea6870889d
+  metadata.gz: 45921227dd24fe1a7114b8933bdf0beebe12ff85a2e3e6dfb98a1b8c011a446e60e5f48f5a7861d3c0a29a9a5cf34dc21a0fe2e7bd0623cea7ec0d7898dfffd4
+  data.tar.gz: f4c815dfaeb5f3c553dc629627af46857a3a38dbf49381fde8a65a66de94a903b6ed752f7d3e37344958b85fec79cc018a7ba818eee4f28f964b75aa1f53ec7e

data/bfs-ftp.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'bfs', s.version
   s.add_dependency 'net-ftp-list'

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|
@@ -114,10 +114,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.6.5
+  version: 0.7.4
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: net-ftp-list
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="