bfs-scp 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2d33dfdf2a7f5d80e33d0392f3c52feffe3c5be8b63573ffb7fb2b6fd88bef1
-  data.tar.gz: e0858d6cd3738f575e61ab3f3cb010ecc7e1683788363c138e7e2c2633602b35
+  metadata.gz: ce2b40891ff68887074207496ca807a6565c68d8d10ab4c442d0a8584a4137b8
+  data.tar.gz: c7c2fa83b17402d00f8a2b80107078266f9e92ab8225f2e0047cdfd1412509a1
 SHA512:
-  metadata.gz: 14925bd3e352f5e20c8176c2f0c7cb8826f9cb25f8ac3a1b7fbf05015793319e330bc957da393c3830ca64516c212f015aa6ae2b88e02cc085a85b410df970c1
-  data.tar.gz: 17611abf696df83bf868761988fa6208e39dd830b735c7e2ec8a54f4db08ce35daad1259f3ed551233159d7ccfc22ea32e8cef71e38c39fbb8e8708720b0aad7
+  metadata.gz: 1f69d3f9ed84f8dcd6be21633abe18ec98eed989ad71c5dfcf3134af9cd3e057ea0768a26bd402d55a3fec82616f26ad257f10cdb45d4d4c8773fc0c53a885cf
+  data.tar.gz: 5b53c05aec603396e18ac17276664d48540c675996a0238016e10d66ffdcee52e6e47069b67d464b40193a0075961fc69fab76861b766dc0c05b0e98ca7ccc21

data/lib/bfs/bucket/scp.rb

@@ -35,7 +35,7 @@ module BFS
         @client = Net::SCP.start(host, nil, **opts.slice(*Net::SSH::VALID_OPTIONS))
 
         if @prefix # rubocop:disable Style/GuardClause
-          @prefix = norm_path(@prefix) + '/'
+          @prefix = "#{norm_path(@prefix)}/"
           mkdir_p abs_path(@prefix)
         end
       end
@@ -72,17 +72,10 @@ module BFS
         full = full_path(path)
 
         opts[:preserve] = true if perm && !opts.key?(:preserve)
-        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |temp_path|
+        BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |temp_path|
           mkdir_p File.dirname(full)
           @client.upload!(temp_path, full, **opts)
-        end
-        return temp unless block
-
-        begin
-          yield temp
-        ensure
-          temp.close
-        end
+        end.perform(&block)
       end
 
       # Opens an existing file for reading
@@ -183,10 +176,12 @@ module BFS
   end
 end
 
-BFS.register('scp', 'ssh') do |url, opts|
+BFS.register('scp', 'ssh') do |url, opts, block|
+  prefix = BFS.norm_path(opts[:prefix] || url.path)
+  opts[:prefix] = prefix unless prefix.empty?
   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

data/spec/bfs/bucket/scp_spec.rb

@@ -1,18 +1,8 @@
 require 'spec_helper'
 
-sandbox  = { host: '127.0.0.1', opts: { port: 7022, user: 'root', password: 'root' } }.freeze
-run_spec = \
-  begin
-    Net::SCP.start sandbox[:host], nil, sandbox[:opts].merge(timeout: 1) do |scp|
-      scp.session.exec!('hostname')
-    end
-    true
-  rescue Net::SSH::Exception, Errno::ECONNREFUSED => e
-    warn "WARNING: unable to run #{File.basename __FILE__}: #{e.message}"
-    false
-  end
+sandbox = { host: '127.0.0.1', opts: { port: 7022, user: 'root', password: 'root' } }.freeze
 
-RSpec.describe BFS::Bucket::SCP, if: run_spec do
+RSpec.describe BFS::Bucket::SCP, scp: true do
   context 'absolute' do
     subject { described_class.new sandbox[:host], **sandbox[:opts].merge(prefix: SecureRandom.uuid) }
     after   { subject.close }
@@ -30,6 +20,13 @@ RSpec.describe BFS::Bucket::SCP, if: run_spec do
   it 'should resolve from URL' do
     bucket = BFS.resolve('scp://root:root@127.0.0.1:7022')
     expect(bucket).to be_instance_of(described_class)
+    expect(bucket.instance_variable_get(:@prefix)).to be_nil
+    bucket.close
+
+    bucket = BFS.resolve('scp://root:root@127.0.0.1:7022/a/b/')
+    expect(bucket).to be_instance_of(described_class)
+    expect(bucket.instance_variable_get(:@prefix)).to eq('a/b/')
+    bucket.close
   end
 
   it 'should handle absolute and relative paths' do

metadata

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