bfs-scp 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 806a4a94596c4967bf51c5017c05cc60444a65ef67c8f76e9eb13448d8989428
-  data.tar.gz: 465ff7c8af4987f2ac97311cfb8039d584193a60e5837dfca2ba7759986d87cb
+  metadata.gz: e2d33dfdf2a7f5d80e33d0392f3c52feffe3c5be8b63573ffb7fb2b6fd88bef1
+  data.tar.gz: e0858d6cd3738f575e61ab3f3cb010ecc7e1683788363c138e7e2c2633602b35
 SHA512:
-  metadata.gz: 459ec003bfbd273b9aee278f8fd81533b5d0493d573eefa8c6f9303b9e8d1bb444216ab9bd9d1785b3c92ac0e3e60fce8233535374b9be59658b82c85c7ebe4a
-  data.tar.gz: 5b54beb2bd9b9bcfdd40e621adabbb71d34421eee4cddfbae59c0b6c2a32f5fe1156a0657db539880766c33d437d28d2adb458213f7d4eb50e25ffc240ac617a
+  metadata.gz: 14925bd3e352f5e20c8176c2f0c7cb8826f9cb25f8ac3a1b7fbf05015793319e330bc957da393c3830ca64516c212f015aa6ae2b88e02cc085a85b410df970c1
+  data.tar.gz: 17611abf696df83bf868761988fa6208e39dd830b735c7e2ec8a54f4db08ce35daad1259f3ed551233159d7ccfc22ea32e8cef71e38c39fbb8e8708720b0aad7

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

@@ -1,6 +1,6 @@
 require 'bfs'
 require 'net/scp'
-require 'cgi'
+require 'net/ssh'
 require 'shellwords'
 
 module BFS
@@ -28,16 +28,11 @@ module BFS
       # @option opts [Integer] :keepalive_interval interval if keepalive enabled. Default: 300.
       # @option opts [Array<String>] :keys an array of file names of private keys to use for publickey and hostbased authentication.
       # @option opts [Boolean|Symbol] :verify_host_key specifying how strict host-key verification should be, either false, true, :very, or :secure.
-      def initialize(host, **opts)
-        opts = opts.dup
-        opts.keys.each do |key|
-          val = opts.delete(key)
-          opts[key.to_sym] = val unless val.nil?
-        end
+      def initialize(host, prefix: nil, **opts)
         super(**opts)
 
-        @prefix = opts.delete(:prefix)
-        @client = Net::SCP.start(host, nil, **opts)
+        @prefix = prefix
+        @client = Net::SCP.start(host, nil, **opts.slice(*Net::SSH::VALID_OPTIONS))
 
         if @prefix # rubocop:disable Style/GuardClause
           @prefix = norm_path(@prefix) + '/'
@@ -62,10 +57,10 @@ module BFS
       def info(path, **_opts)
         full = full_path(path)
         path = norm_path(path)
-        out  = sh! 'stat', '-c', '%s;%Z', full
+        out  = sh! 'stat', '-c', '%s;%Z;%a', full
 
-        size, epoch = out.strip.split(';', 2).map(&:to_i)
-        BFS::FileInfo.new(path, size, Time.at(epoch))
+        size, epoch, mode = out.strip.split(';', 3)
+        BFS::FileInfo.new(path: path, size: size.to_i, mtime: Time.at(epoch.to_i), mode: BFS.norm_mode(mode))
       rescue CommandError => e
         e.status == 1 ? raise(BFS::FileNotFound, path) : raise
       end
@@ -73,13 +68,13 @@ module BFS
       # Creates a new file and opens it for writing
       # @option opts [String|Encoding] :encoding Custom file encoding.
       # @option opts [Integer] :perm Custom file permission, default: 0600.
-      def create(path, **opts, &block)
+      def create(path, encoding: self.encoding, perm: self.perm, **opts, &block)
         full = full_path(path)
-        perm = opts[:perm]
-        enc  = opts.delete(:encoding) || @encoding
-        temp = BFS::TempWriter.new(path, perm: perm, encoding: enc) do |temp_path|
+
+        opts[:preserve] = true if perm && !opts.key?(:preserve)
+        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |temp_path|
           mkdir_p File.dirname(full)
-          @client.upload!(temp_path, full, preserve: true)
+          @client.upload!(temp_path, full, **opts)
         end
         return temp unless block
 
@@ -91,14 +86,13 @@ module BFS
       end
 
       # Opens an existing file for reading
-      def open(path, **opts, &block)
+      def open(path, encoding: self.encoding, tempdir: nil, **_opts, &block)
         full = full_path(path)
-        enc  = opts.delete(:encoding) || @encoding
-        temp = Tempfile.new(File.basename(path), encoding: enc)
+        temp = Tempfile.new(File.basename(path), tempdir, encoding: encoding)
         temp.close
 
         @client.download!(full, temp.path)
-        File.open(temp.path, encoding: enc, &block)
+        File.open(temp.path, encoding: encoding, &block)
       rescue Net::SCP::Error
         raise BFS::FileNotFound, path
       end
@@ -189,11 +183,7 @@ module BFS
   end
 end
 
-BFS.register('scp', 'ssh') do |url|
-  opts = {}
-  CGI.parse(url.query.to_s).each do |key, values|
-    opts[key.to_sym] = values.first
-  end
+BFS.register('scp', 'ssh') do |url, opts|
   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

data/spec/bfs/bucket/scp_spec.rb

@@ -45,4 +45,11 @@ RSpec.describe BFS::Bucket::SCP, if: run_spec do
     abs.close
     rel.close
   end
+
+  it 'should support 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)
+    blob.close
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-scp
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-05-28 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.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !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:
   - - ">="