bfs-scp 0.7.1 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3ac45a899e6b5a91f4eaa84e8adfb1c6d5e6e179872fe76af60f8a5bfb46d20
-  data.tar.gz: 077d7b94bc27f0be53cad5219f73541edae90faca2bc1d16cf63f1c0af68483c
+  metadata.gz: b6de04002b6c77e4844986f058b84ed6ec066ea0449a8046f14f5bb5d30c9451
+  data.tar.gz: 8da046cce602ade820a2d3143918919db5f5d7d5f5af4f083e98a3bd81082fa1
 SHA512:
-  metadata.gz: 97744f1e6f7762a7c56e9d78049e78d9b14bff967c75a84f066275eeeebc6625b3f5185b06ddba0831bf4759febd1cae299c687f096cfb4f57fc295d99c97b67
-  data.tar.gz: d34bf523fb6a8e23b3ce5b9ec81c1c077e8507f46b678ca0b598575ca1c0cb4c7c658752f099c852b4bd7bc84bbca5c63f1b55956f53e138ae5e91ae60316f23
+  metadata.gz: 18039611b8beffc15715cc13de3e1d9f36af8f71bd5a79ff2847289572d16d6793bd3a3d9ee90cce28623a6b40f1fad5894b4c64d1a131ea9cc8230d06bcf34b
+  data.tar.gz: a6be1bb4418cc1e31c45a6e247879a0269d3f5832bb62dabf9b083658050eb05a20b429a030d8b36d4403f13cadfd239a9705037123dd08e536847ef22b61cb1

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
@@ -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.1
+  version: 0.7.6
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-11-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.1
+        version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: SCP/SSH adapter for bfs