bfs-scp 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c7f82a6aae8c2bd13d174bb267ba3a27d2635e03813fa99f2aa531be59f9be
-  data.tar.gz: 3b89574dc5e9b02693de9a6bae66fefea69605b5d75e83a17de062dd532a35a6
+  metadata.gz: 6262201fae915737a6ed368d730f812a0e179ce6a8b21f722f4aacd93fe47ceb
+  data.tar.gz: 2c1225b186236d9b112ec3ceb787aa19cb4cf0b28ca2dcb43742b0f2c3ef1e2e
 SHA512:
-  metadata.gz: 84c82c16c24daa41792c9a2509092f06a79bd080ae4b83dad44ab97b41730cc03b1af9921f25d6c5dcf9f137ec2260b47d814afbd52699a259eb6b0f07280498
-  data.tar.gz: 58d1ef53e369746d33b4c783c1bcaa67a72963e6b289f7f2b080362525197503eea5c4599e2b5d469b76fb3fe8b614585743806d48a8e9b62459591912a28b29
+  metadata.gz: 1cdc7db7d5bc18d93733ceaf15a114b832c234cfbf1099387072425716d182f1c063c877cae63948667b6c8ee26b776b58653d07153993243cfb54f85121e33d
+  data.tar.gz: b7a0dad1fa8b08604ab4ec6fb844160ea12e05345aee867884b4d5a85f65f96713979f9d807029d706ba0d6f6f828b03bd635526d11c68542ab190995f34fb5a

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.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-10-09 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.1
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement