bfs-scp 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d2a1d8aa79faab191a46b8719628bc1b92fa2528be1e9b95d1e0c88e34e5131
-  data.tar.gz: 3b8ed648fc045c535b360c9541028655a18748c4421cdec5f6ac23b3ca04681a
+  metadata.gz: d3ac45a899e6b5a91f4eaa84e8adfb1c6d5e6e179872fe76af60f8a5bfb46d20
+  data.tar.gz: 077d7b94bc27f0be53cad5219f73541edae90faca2bc1d16cf63f1c0af68483c
 SHA512:
-  metadata.gz: 375ed1a9efc068961df091335dd6950e934d3f9363d7c79b6e8428c4d04febe368569189caf8b941ca74b3b1c964229cc7df6ed1399e6cdb783e16a2e71c1814
-  data.tar.gz: faaccfff6e02b43e0e41374596dd89f169c827916ca1902d3504de4cdbafb6fcc53594055170a68a7b76715783d82217e55200bdb233c379392446d4853888aa
+  metadata.gz: 97744f1e6f7762a7c56e9d78049e78d9b14bff967c75a84f066275eeeebc6625b3f5185b06ddba0831bf4759febd1cae299c687f096cfb4f57fc295d99c97b67
+  data.tar.gz: d34bf523fb6a8e23b3ce5b9ec81c1c077e8507f46b678ca0b598575ca1c0cb4c7c658752f099c852b4bd7bc84bbca5c63f1b55956f53e138ae5e91ae60316f23

data/bfs-scp.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-scp'

data/lib/bfs/bucket/scp.rb

@@ -1,6 +1,6 @@
 require 'bfs'
 require 'net/scp'
-require 'cgi'
+require 'net/ssh'
 require 'shellwords'
 
 module BFS
@@ -32,7 +32,7 @@ module BFS
         super(**opts)
 
         @prefix = prefix
-        @client = Net::SCP.start(host, nil, **opts)
+        @client = Net::SCP.start(host, nil, **opts.slice(*Net::SSH::VALID_OPTIONS))
 
         if @prefix # rubocop:disable Style/GuardClause
           @prefix = norm_path(@prefix) + '/'
@@ -68,12 +68,11 @@ module BFS
       # Creates a new file and opens it for writing
       # @option opts [String|Encoding] :encoding Custom file encoding.
       # @option opts [Integer] :perm Custom file permission, default: 0600.
-      def create(path, encoding: nil, perm: nil, **opts, &block)
+      def create(path, encoding: self.encoding, perm: self.perm, **opts, &block)
         full = full_path(path)
 
         opts[:preserve] = true if perm && !opts.key?(:preserve)
-        enc = encoding || @encoding
-        temp = BFS::TempWriter.new(path, encoding: enc, perm: perm) do |temp_path|
+        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |temp_path|
           mkdir_p File.dirname(full)
           @client.upload!(temp_path, full, **opts)
         end
@@ -87,14 +86,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, tempdir: nil, **_opts, &block)
         full = full_path(path)
-        enc  = encoding || @encoding
-        temp = Tempfile.new(File.basename(path), tempdir, encoding: enc)
+        temp = Tempfile.new(File.basename(path), tempdir, encoding: encoding)
         temp.close
 
         @client.download!(full, temp.path)
-        File.open(temp.path, encoding: enc, &block)
+        File.open(temp.path, encoding: encoding, &block)
       rescue Net::SCP::Error
         raise BFS::FileNotFound, path
       end
@@ -185,14 +183,10 @@ module BFS
   end
 end
 
-BFS.register('scp', 'ssh') do |url|
-  opts = {}
-  CGI.parse(url.query.to_s).each do |key, values|
-    opts[key.to_sym] = values.first
-  end
+BFS.register('scp', 'ssh') do |url, opts, block|
   opts[:user] ||= CGI.unescape(url.user) if url.user
   opts[:password] ||= CGI.unescape(url.password) if url.password
   opts[:port] ||= url.port if url.port
 
-  BFS::Bucket::SCP.new(url.host, **opts)
+  BFS::Bucket::SCP.open(url.host, **opts, &block)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-scp
 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-scp
   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: SCP/SSH adapter for bfs