bfs-scp 0.6.5 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d0399a5fa1d89c350c262f5051f3a00910581075f61fd4a43c5ea1bc75708e
-  data.tar.gz: '019131a51c1f72e08726ec832702b3da3dceda032752b7601b1f8728adb5af91'
+  metadata.gz: ef0ef96a3e86298cb7dd7fa6ff941b737a7a8e81d77739628eb1bd94ddca8369
+  data.tar.gz: 2bdf06c5c853c2af45b7ab2ffb93877179134eafe4a9ee28d44fbbddf71e5370
 SHA512:
-  metadata.gz: c03f5bdc38ad4d7bd7ee475489d0697c3d933ac16e832a205dd88c92377b208c81a0d20b8799f9403d44c294c66ad36392afebc43654f98ca22dc55bac4ee459
-  data.tar.gz: 3ce40183b6d57dc539ae9b6084e798ba3277a98d7d1c0475e4b8c730541e99bfcbf027b7b5ba4614295eab1259a9c49eb62d375a261c12710252dfb8d51766d1
+  metadata.gz: 2438d29d8106ef151596a2a7556349796e0a2a491f0f8f35386182d65669b6db4fb1a7f8bc5ae8195fc46f983e52545f5c7d8782df64f5cc272f13bad954c6a9
+  data.tar.gz: 57e203c4d7b5a2d4d561f4a51a301312f3abe109eef6ab127335e62d70d56943c4abf95e3f03d7d80a534d4ddad8544ca923ab65e074fa18d735b291eeb730e6

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

@@ -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
@@ -183,10 +183,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.6.5
+  version: 0.7.4
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-10-26 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.5
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ 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:
   - - ">="