bfs-scp 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d510784470981aeebbf54fdde1c56cafbe6e7a53bb3aa7cc1ac6f043315c3f
-  data.tar.gz: d80b9721dbb7934abddbb5ea09adf1fb0de83421cf9deeb298d0bf0ae450a50e
+  metadata.gz: 44a0713c9f175213b7c659269892ea70cb8ed870cf60d8346e04d884d59c26c0
+  data.tar.gz: f47f64d9a6c0e981c45ebecb993d70ee6f8a3813e327a23f1ac817824bf67321
 SHA512:
-  metadata.gz: 1d9bf7a73342ae2090dbbb487d87fc28aefd8680b6f6145c82f790905467e2e662152e7c5710f73147a163f4adc43687dbb63afece37b8867e20c437169b9af6
-  data.tar.gz: e0458841db2fa130caa4a64d4b954f4ef3fda113a905ce9ae3b9e556d3a468f3747cfdb83d9f5f629dda505a27ed35b60b445a10f35fdc7aeec1db70462f5495
+  metadata.gz: f81f0d970feacce7728442dc01b645b797202473ac5798eaa9c13593362a80fcdcee4324d3193ea269e8203db0354211f7ffad0a60914dbb6ed53a1b013b25b6
+  data.tar.gz: 75112da87d9464b66ae823a03d28c9ae7074d47bb1ca237ccc53d61f93af4760317ad8067a9ae12e9248b07704d800050d20d1be8713c329302b4657ede9e660

data/lib/bfs/bucket/scp.rb

@@ -153,10 +153,11 @@ module BFS
         @client.session.open_channel do |ch|
           ch.exec(cmdstr) do |_, _success|
             ch.on_data do |_, data|
+              stdout << data
+
               if block_given?
-                yield data
-              else
-                stdout += data
+                pos = stdout.rindex("\n")
+                yield stdout.slice!(0..pos) if pos
               end
             end
             ch.on_extended_data do |_, _, data|
@@ -167,6 +168,12 @@ module BFS
             end
           end
         end
+
+        if block_given? && stdout.length.positive?
+          yield stdout
+          stdout.clear
+        end
+
         @client.session.loop
         raise CommandError.new(cmdstr, status, stderr) unless status.zero?
 

data/spec/bfs/bucket/scp_spec.rb

@@ -1,24 +1,25 @@
 require 'spec_helper'
 
 RSpec.describe BFS::Bucket::SCP, scp: true do
+  subject { described_class.new hostname, **conn_opts }
+
   let(:hostname) { '127.0.0.1' }
   let(:conn_opts) { { port: 7022, user: 'root', password: 'root', prefix: prefix } }
   let(:prefix) { SecureRandom.uuid }
 
-  subject { described_class.new hostname, **conn_opts }
   after { subject.close }
 
-  context 'absolute' do
+  context 'with absolute path' do
     it_behaves_like 'a bucket', content_type: false, metadata: false
   end
 
-  context 'relative' do
+  context 'with relative path' do
     let(:prefix) { "~/#{SecureRandom.uuid}" }
 
     it_behaves_like 'a bucket', content_type: false, metadata: false
   end
 
-  it 'should resolve from URL' do
+  it 'resolves 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
@@ -30,7 +31,7 @@ RSpec.describe BFS::Bucket::SCP, scp: true do
     bucket.close
   end
 
-  it 'should handle absolute and relative paths' do
+  it 'handles absolute and relative paths' do
     abs = BFS::Blob.new("scp://root:root@127.0.0.1:7022/#{SecureRandom.uuid}/file.txt")
     abs.create {|w| w.write 'absolute' }
 
@@ -44,7 +45,7 @@ RSpec.describe BFS::Bucket::SCP, scp: true do
     rel.close
   end
 
-  it 'should support custom perms' do
+  it 'supports custom perms' do
     blob = BFS::Blob.new("scp://root:root@127.0.0.1:7022/#{SecureRandom.uuid}/file.txt")
     blob.create(perm: 0o666) {|w| w.write 'foo' }
     expect(blob.info.mode).to eq(0o666)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-scp
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement