bfs-scp 0.6.0 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fc1b42d4747715149cbe00ed2712c973680221579ab7a420ac46f6bd1bb2333
-  data.tar.gz: abf74a6979b1959547f91ed3ab238dab1a3120ffcd0191dc552c17916c4a0627
+  metadata.gz: f7d0399a5fa1d89c350c262f5051f3a00910581075f61fd4a43c5ea1bc75708e
+  data.tar.gz: '019131a51c1f72e08726ec832702b3da3dceda032752b7601b1f8728adb5af91'
 SHA512:
-  metadata.gz: 8aef59c1210055d2852a39a1c8100e8f63e19094e6b8708614c66339386321ff15434538e6add8e7112bfd1c6caf360e5cff62ae4c34a9d8a35d642ccf1349ad
-  data.tar.gz: f1f5755b3f4d2751582d7dd4fc592dad5bfbf98c6e07527372bd04e6dbd52c793c390675a9d7ade419aa854d5e9e9347530828d0c8bd5c1c636d4dd87abc30d3
+  metadata.gz: c03f5bdc38ad4d7bd7ee475489d0697c3d933ac16e832a205dd88c92377b208c81a0d20b8799f9403d44c294c66ad36392afebc43654f98ca22dc55bac4ee459
+  data.tar.gz: 3ce40183b6d57dc539ae9b6084e798ba3277a98d7d1c0475e4b8c730541e99bfcbf027b7b5ba4614295eab1259a9c49eb62d375a261c12710252dfb8d51766d1

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.4.0'
+  s.required_ruby_version = '>= 2.5.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
@@ -10,7 +10,7 @@ module BFS
       class CommandError < RuntimeError
         attr_reader :status
 
-        def initialize(cmd, status, extra=nil)
+        def initialize(cmd, status, extra = nil)
           @status = status
           super ["Command '#{cmd}' exited with status #{status}", extra].join(': ')
         end
@@ -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
-        super(opts)
+      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) + '/'
@@ -46,7 +41,7 @@ module BFS
       end
 
       # Lists the contents of a bucket using a glob pattern
-      def ls(pattern='**/*', _opts={})
+      def ls(pattern = '**/*', **_opts)
         prefix = @prefix ? abs_path(@prefix) : '/'
         Enumerator.new do |y|
           sh! 'find', prefix, '-type', 'f' do |out|
@@ -59,24 +54,27 @@ module BFS
       end
 
       # Info returns the object info
-      def info(path, _opts={})
+      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
 
       # Creates a new file and opens it for writing
-      def create(path, opts={}, &block)
+      # @option opts [String|Encoding] :encoding Custom file encoding.
+      # @option opts [Integer] :perm Custom file permission, default: 0600.
+      def create(path, encoding: self.encoding, perm: self.perm, **opts, &block)
         full = full_path(path)
-        enc  = opts.delete(:encoding) || @encoding
-        temp = BFS::TempWriter.new(path, 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)
+          @client.upload!(temp_path, full, **opts)
         end
         return temp unless block
 
@@ -88,20 +86,19 @@ 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
 
       # Deletes a file.
-      def rm(path, _opts={})
+      def rm(path, **_opts)
         path = full_path(path)
         sh! 'rm', '-f', path
       end
@@ -110,7 +107,7 @@ module BFS
       #
       # @param [String] src The source path.
       # @param [String] dst The destination path.
-      def cp(src, dst, _opts={})
+      def cp(src, dst, **_opts)
         full_src = full_path(src)
         full_dst = full_path(dst)
 
@@ -124,7 +121,7 @@ module BFS
       #
       # @param [String] src The source path.
       # @param [String] dst The destination path.
-      def mv(src, dst, _opts={})
+      def mv(src, dst, **_opts)
         full_src = full_path(src)
         full_dst = full_path(dst)
 
@@ -186,14 +183,10 @@ 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
 
-  BFS::Bucket::SCP.new url.host, opts
+  BFS::Bucket::SCP.new(url.host, **opts)
 end

data/spec/bfs/bucket/scp_spec.rb

@@ -14,14 +14,14 @@ run_spec = \
 
 RSpec.describe BFS::Bucket::SCP, if: run_spec do
   context 'absolute' do
-    subject { described_class.new sandbox[:host], sandbox[:opts].merge(prefix: SecureRandom.uuid) }
+    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
 
   context 'relative' do
-    subject { described_class.new sandbox[:host], sandbox[:opts].merge(prefix: "~/#{SecureRandom.uuid}") }
+    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
@@ -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.0
+  version: 0.6.5
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-02-17 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.0
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: SCP/SSH adapter for bfs