bfs-scp 0.7.3 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '082511639a1f7eb8048581b475eb529cd49c804bc2b403ae19b69eb0ab43a42a'
-  data.tar.gz: 548569c50be5de5d6866167260cd343e938241f2f7fe4a5b55fb88130db1f763
+  metadata.gz: 44a0713c9f175213b7c659269892ea70cb8ed870cf60d8346e04d884d59c26c0
+  data.tar.gz: f47f64d9a6c0e981c45ebecb993d70ee6f8a3813e327a23f1ac817824bf67321
 SHA512:
-  metadata.gz: 24a18cba7f9bfae36ee116e026f89e3bd3755f1e16ec465b6cf8f2ed4512d27f52d239450f5686038507750879aeb03e4631cac297d9eba387618229896b1ea1
-  data.tar.gz: d1f1567669599b9677ecc19eb9db863605d8cfbb87170c9881b1810e0866c975200226af1d7c03fd68b57f03d72501858b359f2fe9aec93c33bc6d1648d1761d
+  metadata.gz: f81f0d970feacce7728442dc01b645b797202473ac5798eaa9c13593362a80fcdcee4324d3193ea269e8203db0354211f7ffad0a60914dbb6ed53a1b013b25b6
+  data.tar.gz: 75112da87d9464b66ae823a03d28c9ae7074d47bb1ca237ccc53d61f93af4760317ad8067a9ae12e9248b07704d800050d20d1be8713c329302b4657ede9e660

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
@@ -160,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|
@@ -174,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,23 +1,25 @@
 require 'spec_helper'
 
-sandbox = { host: '127.0.0.1', opts: { port: 7022, user: 'root', password: 'root' } }.freeze
-
 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 }
+  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 }
+
+  after { subject.close }
 
+  context 'with absolute path' 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 }
+  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
@@ -29,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' }
 
@@ -43,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.7.3
+  version: 0.8.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 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.7.3
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement