bfs-scp 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d30fbc577f75cfa618423e299e08dc7ca08fe857d2139d69082e7a0a4b629b88
-  data.tar.gz: 04ad9c4acb42fa70b33233f6662057c336e67c1999394f5ee98607589f1557bc
+  metadata.gz: '082511639a1f7eb8048581b475eb529cd49c804bc2b403ae19b69eb0ab43a42a'
+  data.tar.gz: 548569c50be5de5d6866167260cd343e938241f2f7fe4a5b55fb88130db1f763
 SHA512:
-  metadata.gz: e691623195168d64a689be190fc88282b796ee4fa52bbed51e0cbe5c7831ed027e043709ccbe27ceb620d1120b2bf4bb95f37c638954d9c71024fc05c2d8114f
-  data.tar.gz: 4433f5ceaf8d66ef4ed14cc4fb34be4a0eb0b6e212e29c3223f545935ce15e739280884aea46f54f522771dcdac1e656dc95eb9122bc55e06f42637abf94fee8
+  metadata.gz: 24a18cba7f9bfae36ee116e026f89e3bd3755f1e16ec465b6cf8f2ed4512d27f52d239450f5686038507750879aeb03e4631cac297d9eba387618229896b1ea1
+  data.tar.gz: d1f1567669599b9677ecc19eb9db863605d8cfbb87170c9881b1810e0866c975200226af1d7c03fd68b57f03d72501858b359f2fe9aec93c33bc6d1648d1761d

data/lib/bfs/bucket/scp.rb

@@ -184,6 +184,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,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.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-10 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.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement