bfs-scp 0.4.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2249f61d6b64e9816ec5a54ca7141ceff09bc9f290ddb7bdebd040b695e5a339
-  data.tar.gz: 81c282a260b33d36c24f906c0fee161cc5594ddef47ac2c35fbd1c9786df864e
+  metadata.gz: 9fc1b42d4747715149cbe00ed2712c973680221579ab7a420ac46f6bd1bb2333
+  data.tar.gz: abf74a6979b1959547f91ed3ab238dab1a3120ffcd0191dc552c17916c4a0627
 SHA512:
-  metadata.gz: 78f6577a9b1a5e8617291f73f705539a3a3496b54cc9ed0c1c300dd83b140c7d566803f66f1ad145cc635fda1fe946678dc1c8622a1300e773459aa592dec888
-  data.tar.gz: cc8b355b35164f3ec1dbcc3c4abcd2dbf4a9922e6bd89b2588546d0c449656b9f84122d3ae9165728238d8b64697d9c7e990ffb6c7c517fd888fbc8f1a06a718
+  metadata.gz: 8aef59c1210055d2852a39a1c8100e8f63e19094e6b8708614c66339386321ff15434538e6add8e7112bfd1c6caf360e5cff62ae4c34a9d8a35d642ccf1349ad
+  data.tar.gz: f1f5755b3f4d2751582d7dd4fc592dad5bfbf98c6e07527372bd04e6dbd52c793c390675a9d7ade419aa854d5e9e9347530828d0c8bd5c1c636d4dd87abc30d3

data/lib/bfs/bucket/scp.rb

@@ -41,17 +41,17 @@ module BFS
 
         if @prefix # rubocop:disable Style/GuardClause
           @prefix = norm_path(@prefix) + '/'
-          mkdir_p(@prefix)
+          mkdir_p abs_path(@prefix)
         end
       end
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern='**/*', _opts={})
-        prefix = @prefix || '.'
+        prefix = @prefix ? abs_path(@prefix) : '/'
         Enumerator.new do |y|
           sh! 'find', prefix, '-type', 'f' do |out|
             out.each_line do |line|
-              path = trim_prefix(line.strip)
+              path = trim_prefix(norm_path(line.strip))
               y << path if File.fnmatch?(pattern, path, File::FNM_PATHNAME)
             end
           end
@@ -141,6 +141,15 @@ module BFS
 
       private
 
+      def abs_path(path)
+        path = "/#{path}" unless path.start_with?('~/', './')
+        path
+      end
+
+      def full_path(*)
+        abs_path(super)
+      end
+
       def mkdir_p(path)
         sh! 'mkdir', '-p', path
       end

data/spec/bfs/bucket/scp_spec.rb

@@ -7,21 +7,42 @@ run_spec = \
       scp.session.exec!('hostname')
     end
     true
-  rescue Net::SSH::Exception => e
+  rescue Net::SSH::Exception, Errno::ECONNREFUSED => e
     warn "WARNING: unable to run #{File.basename __FILE__}: #{e.message}"
     false
   end
 
 RSpec.describe BFS::Bucket::SCP, if: run_spec do
-  subject { described_class.new sandbox[:host], sandbox[:opts].merge(prefix: SecureRandom.uuid) }
-  after   { subject.close }
+  context 'absolute' do
+    subject { described_class.new sandbox[:host], sandbox[:opts].merge(prefix: SecureRandom.uuid) }
+    after   { subject.close }
 
-  it_behaves_like 'a bucket',
-    content_type: false,
-    metadata: false
+    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 }
+
+    it_behaves_like 'a bucket', content_type: false, metadata: false
+  end
 
   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)
   end
+
+  it 'should handle 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' }
+
+    rel = BFS::Blob.new("scp://root:root@127.0.0.1:7022/~/#{SecureRandom.uuid}/file.txt")
+    rel.create {|w| w.write 'relative' }
+
+    expect(abs.read).to eq('absolute')
+    expect(rel.read).to eq('relative')
+
+    abs.close
+    rel.close
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-scp
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
 - !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.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: SCP/SSH adapter for bfs