bfs-ftp 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46d16067aed45ba5b08ed78f8aef03c9a5bba71e1d3907a889342ce1f4947ca
-  data.tar.gz: a877150fc240a0b79060d3c15295f734965b0d8ad04f09aac2ad565bddfc6c34
+  metadata.gz: 82596b06db1568d9f633733e9ee00a0473d3597c96b4ea755f7c67f1e0b150e2
+  data.tar.gz: ea4dfedb77af9e9a77167aac97745deb9fca9e598eab058d53e9270f0ef709c8
 SHA512:
-  metadata.gz: cba1489d833132157c36c56259eb7bc3f7be852549a2915d72b9506606b966d9be3528d264023515b63ce74ce9b7bdd361e20d1a2d7666434750befa03f0cd16
-  data.tar.gz: f152b36ca6a2548c8a4aee5a6c6f18e373bb5ddb65226ab9a7e4b0693b1d25557158df0ad9dee6515e549eb053aa8db871e0632d999f6c9effaf14b72d3024a1
+  metadata.gz: 6bc46e356ba7c382e7b7614f4770dafc3019796b212873f41fecbf6ab571ec5961e109cfd008120cf5fd7b3549be8d09b5a4a3d6c719b1dd6b93d8ff5464c9ec
+  data.tar.gz: cdb89ae7e48ca49e02a051c595ea021a69e8106d2427b615a5073152279dcdf0c3473dd64183838120765aeb879299ddbaf1cbbe514cb13256e77c26d6c24ca9

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

@@ -1,11 +1,12 @@
 require 'bfs'
 require 'net/ftp/list'
-require 'cgi'
 
 module BFS
   module Bucket
     # FTP buckets are operating on ftp servers
     class FTP < Abstract
+      attr_reader :perm
+
       # Initializes a new bucket
       # @param [String] host the host name
       # @param [Hash] opts options
@@ -30,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|
@@ -49,11 +50,9 @@ module BFS
       end
 
       # Creates a new file and opens it for writing
-      def create(path, encoding: nil, perm: nil, **_opts, &block)
+      def create(path, encoding: self.encoding, perm: self.perm, **_opts, &block)
         path = norm_path(path)
-
-        enc  = encoding || @encoding
-        temp = BFS::TempWriter.new(path, encoding: enc, perm: perm) do |t|
+        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
           mkdir_p File.dirname(path)
           @client.put(t, path)
         end
@@ -67,14 +66,13 @@ module BFS
       end
 
       # Opens an existing file for reading
-      def open(path, encoding: nil, tempdir: nil, **_opts, &block)
+      def open(path, encoding: self.encoding, perm: self.perm, tempdir: nil, **_opts, &block)
         path = norm_path(path)
-        enc  = encoding || @encoding
-        temp = Tempfile.new(File.basename(path), tempdir, encoding: enc)
+        temp = Tempfile.new(File.basename(path), tempdir, encoding: encoding, perm: perm)
         temp.close
 
         @client.get(path, temp.path)
-        File.open(temp.path, encoding: enc, &block)
+        File.open(temp.path, encoding: encoding, &block)
       rescue Net::FTPPermError
         raise BFS::FileNotFound, path
       end
@@ -116,13 +114,12 @@ module BFS
   end
 end
 
-BFS.register('ftp', 'sftp') do |url|
-  params = CGI.parse(url.query.to_s)
-
-  BFS::Bucket::FTP.new url.host,
-                       username: url.user ? CGI.unescape(url.user) : nil,
-                       password: url.password ? CGI.unescape(url.password) : nil,
-                       port: url.port,
-                       ssl: params.key?('ssl') || url.scheme == 'sftp',
-                       prefix: params.key?('prefix') ? params['prefix'].first : nil
+BFS.register('ftp', 'sftp') do |url, opts, block|
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-ftp
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-07-02 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.2
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.1
 - !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.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: FTP adapter for bfs