bfs-ftp 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b5e49a381ab76953cfffc9dd522b818be1b5423509bc35798758c5ca968f88a
-  data.tar.gz: a821689a6b8de899193ac293f0f51e786f23ea07a52ef9ca9d7d63a7ac27d225
+  metadata.gz: 1382d2b94a93557fd39b9fa5a81a932836bb381e5eb96b4cf41551b8b7d1cfea
+  data.tar.gz: c8152beba12ccc144e5b740bc768d5559be75ee0b79029c9bfdadbdc415975ed
 SHA512:
-  metadata.gz: 3903fc670e7e5709289e2cea5a95e7fe39383df0ae26e578d863654dfca016862c0309f286403241fd82ac0328a014fa29dec5956b1410ac660fb80107a1f67a
-  data.tar.gz: b8d81cc725fc66a79d52a882f9c5789978559311884eb54a5f51fc23c13d523957a7a8fd7379b9bf019e2eb8886180788f6e5aa9b20910d6e5f1b62e2bdcdbef
+  metadata.gz: 5d12dedbf6a8ef0f96dccaf21c9104298739ed9deb821006ef10a3596d76ec1d2b3da1ec95e2f2e37ac9ad0af24afdf9638dff001bcc0e74e0f7c8ffdccc42ee
+  data.tar.gz: afc2daba69cacdb914a474b2b1575e627eb6e72f026e1da34aa4759f46d328cab123211c2366885882e347e17bd19f021984c3d25449ea6a5c423b50f8aed316

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.4.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.add_dependency 'bfs', s.version
   s.add_dependency 'net-ftp-list'

data/lib/bfs/bucket/ftp.rb

@@ -6,7 +6,6 @@ module BFS
   module Bucket
     # FTP buckets are operating on ftp servers
     class FTP < Abstract
-
       # Initializes a new bucket
       # @param [String] host the host name
       # @param [Hash] opts options
@@ -16,16 +15,16 @@ 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={})
+      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
-        super(opts)
+        super(**opts)
 
         prefix  = opts.delete(:prefix)
-        @client = Net::FTP.new(host, opts)
+        @client = Net::FTP.new(host, **opts)
         @client.binary = true
 
         if prefix # rubocop:disable Style/GuardClause
@@ -36,7 +35,7 @@ module BFS
       end
 
       # Lists the contents of a bucket using a glob pattern
-      def ls(pattern='**/*', _opts={})
+      def ls(pattern = '**/*', **_opts)
         dir = pattern[%r{^[^\*\?\{\}\[\]]+/}]
         dir&.chomp!('/')
 
@@ -48,7 +47,7 @@ module BFS
       end
 
       # Info returns the object info
-      def info(path, _opts={})
+      def info(path, **_opts)
         path = norm_path(path)
         BFS::FileInfo.new(path, @client.size(path), @client.mtime(path))
       rescue Net::FTPPermError
@@ -56,7 +55,7 @@ module BFS
       end
 
       # Creates a new file and opens it for writing
-      def create(path, opts={}, &block)
+      def create(path, **opts, &block)
         path = norm_path(path)
         enc  = opts.delete(:encoding) || @encoding
         temp = BFS::TempWriter.new(path, encoding: enc) do |t|
@@ -73,7 +72,7 @@ module BFS
       end
 
       # Opens an existing file for reading
-      def open(path, opts={}, &block)
+      def open(path, **opts, &block)
         path = norm_path(path)
         enc  = opts.delete(:encoding) || @encoding
         temp = Tempfile.new(File.basename(path), encoding: enc)
@@ -86,7 +85,7 @@ module BFS
       end
 
       # Deletes a file.
-      def rm(path, _opts={})
+      def rm(path, **_opts)
         path = norm_path(path)
         @client.delete(path)
       rescue Net::FTPPermError # rubocop:disable Lint/SuppressedException
@@ -114,10 +113,8 @@ module BFS
       def mkdir_p(path)
         parts = path.split('/').reject(&:empty?)
         (0...parts.size).each do |i|
-          begin
-            @client.mkdir parts[0..i].join('/')
-          rescue Net::FTPPermError # rubocop:disable Lint/SuppressedException
-          end
+          @client.mkdir parts[0..i].join('/')
+        rescue Net::FTPPermError # rubocop:disable Lint/SuppressedException
         end
       end
     end
@@ -128,9 +125,9 @@ 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
+                       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
 end

data/spec/bfs/bucket/ftp_spec.rb

@@ -12,12 +12,12 @@ run_spec = \
   end
 
 RSpec.describe BFS::Bucket::FTP, if: run_spec do
-  subject { described_class.new sandbox[:host], sandbox.merge(prefix: SecureRandom.uuid) }
+  subject { described_class.new sandbox[:host], **sandbox.merge(prefix: SecureRandom.uuid) }
   after   { subject.close }
 
   it_behaves_like 'a bucket',
-    content_type: false,
-    metadata: false
+                  content_type: false,
+                  metadata: false
 
   it 'should resolve from URL' do
     bucket = BFS.resolve('ftp://ftpuser:ftppass@127.0.0.1:7021')

metadata

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