bfs-ftp 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1382d2b94a93557fd39b9fa5a81a932836bb381e5eb96b4cf41551b8b7d1cfea
-  data.tar.gz: c8152beba12ccc144e5b740bc768d5559be75ee0b79029c9bfdadbdc415975ed
+  metadata.gz: 38b05322f90198412292ff3521d4d59b82b32bc3d9f10b8799a8dff4b29a8fe3
+  data.tar.gz: 0db611782568ba9ea4b58f92bc706d755dc5cb19a5ca5ed9f347e832378bcaf4
 SHA512:
-  metadata.gz: 5d12dedbf6a8ef0f96dccaf21c9104298739ed9deb821006ef10a3596d76ec1d2b3da1ec95e2f2e37ac9ad0af24afdf9638dff001bcc0e74e0f7c8ffdccc42ee
-  data.tar.gz: afc2daba69cacdb914a474b2b1575e627eb6e72f026e1da34aa4759f46d328cab123211c2366885882e347e17bd19f021984c3d25449ea6a5c423b50f8aed316
+  metadata.gz: b46c593f7f2c31b2e1284091f3aefd9557c5c807538e7bebb3cbacc89814e23be126f8699472ac7f6e5e7b612374d4425e75caafd79f1eb00ffcece69ace155b
+  data.tar.gz: f98a8d56a8d41bcc500e61167feedf3bb51b0fca9a5c146e3d78ead1e564932062eaf4b5bfcae1de43544c5a8d224be0a3b0ee891406e681711b425a47a343f8

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
@@ -15,15 +16,9 @@ module BFS
       # @option opts [String] :password password for login.
       # @option opts [String] :passive connect in passive mode. Default: true.
       # @option opts [String] :prefix optional prefix.
-      def initialize(host, **opts)
-        opts = opts.dup
-        opts.keys.each do |key|
-          val = opts.delete(key)
-          opts[key.to_sym] = val unless val.nil?
-        end
+      def initialize(host, prefix: nil, **opts)
         super(**opts)
 
-        prefix  = opts.delete(:prefix)
         @client = Net::FTP.new(host, **opts)
         @client.binary = true
 
@@ -49,16 +44,15 @@ module BFS
       # Info returns the object info
       def info(path, **_opts)
         path = norm_path(path)
-        BFS::FileInfo.new(path, @client.size(path), @client.mtime(path))
+        BFS::FileInfo.new(path: path, size: @client.size(path), mtime: @client.mtime(path))
       rescue Net::FTPPermError
         raise BFS::FileNotFound, path
       end
 
       # Creates a new file and opens it for writing
-      def create(path, **opts, &block)
+      def create(path, encoding: self.encoding, perm: self.perm, **_opts, &block)
         path = norm_path(path)
-        enc  = opts.delete(:encoding) || @encoding
-        temp = BFS::TempWriter.new(path, encoding: enc) do |t|
+        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
           mkdir_p File.dirname(path)
           @client.put(t, path)
         end
@@ -72,14 +66,13 @@ module BFS
       end
 
       # Opens an existing file for reading
-      def open(path, **opts, &block)
+      def open(path, encoding: self.encoding, perm: self.perm, tempdir: nil, **_opts, &block)
         path = norm_path(path)
-        enc  = opts.delete(:encoding) || @encoding
-        temp = Tempfile.new(File.basename(path), 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
@@ -88,7 +81,7 @@ module BFS
       def rm(path, **_opts)
         path = norm_path(path)
         @client.delete(path)
-      rescue Net::FTPPermError # rubocop:disable Lint/SuppressedException
+      rescue Net::FTPPermError
       end
 
       # Closes the underlying connection
@@ -121,13 +114,10 @@ module BFS
   end
 end
 
-BFS.register('ftp', 'sftp') do |url|
-  params = CGI.parse(url.query.to_s)
-
-  BFS::Bucket::FTP.new url.host,
+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: params.key?('ssl') || url.scheme == 'sftp',
-                       prefix: params.key?('prefix') ? params['prefix'].first : nil
+                       ssl: opts.key?(:ssl) || url.scheme == 'sftp'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-ftp
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-05-28 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.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !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:
   - - ">="