bfs-ftp 0.6.4 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9dfeab51060b65023ff843e57e8fcd01e8f7247ced86a085abeca18ccd555e5
-  data.tar.gz: 5e2e31f51ee3dc2fb6e4b76f38b83f2fde5f3d7c0edbe445996de8f56daaba28
+  metadata.gz: b481cc58f871c2d32a31c6b27a2d7663fabb5e780823aaf8a59766ca84ce92a7
+  data.tar.gz: d38ae55120b1b1ba286b0754a8cd549652a52d7dcec15938e2f174beb7a1995a
 SHA512:
-  metadata.gz: d1eb387f3b16a1e5e92cf11d4f56ece020ec26c649d2a689af33ec7f6f45e85c62c7761460e8c3b6315f55588ec18ce23a50fc72f733b4249d4c9a720fb14935
-  data.tar.gz: c8433b665270c881dc2a68f39a722cf19e6f064104af0f0aadd510455b2532bdb917d408ab0d0a6e9a677e1349a936a8bcc6e7c696652293087e3f9d30df41fb
+  metadata.gz: f367b5df775d462366cc2af0017d5684cac8c59f2e291ca535050e6bbe5807aa22993f4ebab6b3a7189cd311d3644f56791c36f210d5f4a9d83111f80c93ee02
+  data.tar.gz: d4f8b6949f088c003e97d0de38e69e574096ddc650588e8cadee5782addba3c5c99a95a7f27b078cb92c935ccc954c3deedb5eaf32de3452a1aa26c88c05ac80

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.4
+  version: 0.7.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 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.6.4
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: net-ftp-list
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: FTP adapter for bfs