bfs-scp 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d30fbc577f75cfa618423e299e08dc7ca08fe857d2139d69082e7a0a4b629b88
-  data.tar.gz: 04ad9c4acb42fa70b33233f6662057c336e67c1999394f5ee98607589f1557bc
+  metadata.gz: 29d510784470981aeebbf54fdde1c56cafbe6e7a53bb3aa7cc1ac6f043315c3f
+  data.tar.gz: d80b9721dbb7934abddbb5ea09adf1fb0de83421cf9deeb298d0bf0ae450a50e
 SHA512:
-  metadata.gz: e691623195168d64a689be190fc88282b796ee4fa52bbed51e0cbe5c7831ed027e043709ccbe27ceb620d1120b2bf4bb95f37c638954d9c71024fc05c2d8114f
-  data.tar.gz: 4433f5ceaf8d66ef4ed14cc4fb34be4a0eb0b6e212e29c3223f545935ce15e739280884aea46f54f522771dcdac1e656dc95eb9122bc55e06f42637abf94fee8
+  metadata.gz: 1d9bf7a73342ae2090dbbb487d87fc28aefd8680b6f6145c82f790905467e2e662152e7c5710f73147a163f4adc43687dbb63afece37b8867e20c437169b9af6
+  data.tar.gz: e0458841db2fa130caa4a64d4b954f4ef3fda113a905ce9ae3b9e556d3a468f3747cfdb83d9f5f629dda505a27ed35b60b445a10f35fdc7aeec1db70462f5495

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::Writer.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
@@ -184,6 +177,8 @@ module BFS
 end
 
 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

data/spec/bfs/bucket/scp_spec.rb

@@ -1,28 +1,19 @@
 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
+RSpec.describe BFS::Bucket::SCP, scp: true do
+  let(:hostname) { '127.0.0.1' }
+  let(:conn_opts) { { port: 7022, user: 'root', password: 'root', prefix: prefix } }
+  let(:prefix) { SecureRandom.uuid }
 
-RSpec.describe BFS::Bucket::SCP, if: run_spec do
-  context 'absolute' do
-    subject { described_class.new sandbox[:host], **sandbox[:opts].merge(prefix: SecureRandom.uuid) }
-    after   { subject.close }
+  subject { described_class.new hostname, **conn_opts }
+  after { subject.close }
 
+  context 'absolute' do
     it_behaves_like 'a bucket', content_type: false, metadata: false
   end
 
   context 'relative' do
-    subject { described_class.new sandbox[:host], **sandbox[:opts].merge(prefix: "~/#{SecureRandom.uuid}") }
-    after   { subject.close }
+    let(:prefix) { "~/#{SecureRandom.uuid}" }
 
     it_behaves_like 'a bucket', content_type: false, metadata: false
   end
@@ -30,6 +21,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.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-12-01 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.2
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement