bfs 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3de22f9cab6ba21d594854a2fcec49cc215b7c10c6f6b5b9cb1528ba6ce96b59
-  data.tar.gz: cc3b427ff41229556b7b39a9d0ad5d61afdd0439fa984aafadd0aa9635ac4664
+  metadata.gz: 7cbeb0028830b8448bfb4b66054e5a1b9a0389df56e36b9e80063403f692e8d0
+  data.tar.gz: 3ebdc9ac4cbbdbc856fb8c5f487f58d8339df57845412b32655323b0f3adee75
 SHA512:
-  metadata.gz: 569ac3d4e157eebf08f948eab831f214a900d29a96028a703d541d3fa7de7fdcde6a2cb11413ff802c459ff163cff15feb00c3477abcae7b18d77c302255d529
-  data.tar.gz: 2804530bcc9aaf60f1b475a6948b357242dc96e15788835e34d6cc1989ec7bda8e0bd66372427ce4aa9d5b923eda5468a9c33087b716ac3ca379f391a6192f43
+  metadata.gz: 62c813077440f5b39b90f2b48c587959691ed71668bc99553cd4e3938a32f7b150acea7e7ae800c4b6aa20a9752f1bb38665a5ad60d5c41260b968950ffd8ee7
+  data.tar.gz: 40bae544a2be1b32e69d410cd4274613e6fcb538f13752a68ebd4527355d0e1129c3d443b77b057eea303806113aa6b19b27cf49cfde3777b03a7d9fbd83684d

data/lib/bfs/bucket/abstract.rb

@@ -40,6 +40,11 @@ module BFS
         raise 'not implemented'
       end
 
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(_pattern = '**', **_opts)
+        raise 'not implemented'
+      end
+
       # Info returns the info for a single file
       def info(_path, **_opts)
         raise 'not implemented'
@@ -107,7 +112,7 @@ module BFS
       def norm_meta(meta)
         norm = {}
         meta.each do |key, value|
-          nkey = key.to_s.downcase.split(/-/).map(&:capitalize).join('-')
+          nkey = key.to_s.downcase.split('-').map(&:capitalize).join('-')
           norm[nkey] = value
         end if meta.is_a?(Hash)
         norm

data/lib/bfs/bucket/fs.rb

@@ -15,19 +15,30 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **_opts)
-        Enumerator.new do |y|
-          Pathname.glob(@root.join(pattern)) do |pname|
-            y << trim_prefix(pname.to_s) if pname.file?
+        Enumerator.new do |acc|
+          walk(pattern) do |path, _|
+            acc << path
+          end
+        end
+      end
+
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(pattern = '**/*', **_opts)
+        Enumerator.new do |acc|
+          walk(pattern) do |path, stat|
+            acc << file_info(path, stat)
           end
         end
       end
 
       # Info returns the info for a single file
       def info(path, **_opts)
-        full = @root.join(norm_path(path))
-        path = trim_prefix(full.to_s)
-        stat = full.stat
-        BFS::FileInfo.new(path: path, size: stat.size, mtime: stat.mtime, mode: BFS.norm_mode(stat.mode))
+        norm = norm_path(path)
+        pn   = @root.join(norm)
+        stat = pn.stat
+        raise BFS::FileNotFound, path unless stat.file?
+
+        file_info(norm, stat)
       rescue Errno::ENOENT
         raise BFS::FileNotFound, path
       end
@@ -93,6 +104,19 @@ module BFS
       rescue Errno::ENOENT
         raise BFS::FileNotFound, norm_path(src)
       end
+
+      private
+
+      def walk(pattern)
+        Pathname.glob(@root.join(pattern)) do |pn|
+          stat = pn.stat
+          yield(trim_prefix(pn.to_s), stat) if stat.file?
+        end
+      end
+
+      def file_info(path, stat)
+        BFS::FileInfo.new(path: path, size: stat.size, mtime: stat.mtime, mode: BFS.norm_mode(stat.mode))
+      end
     end
   end
 end

data/lib/bfs/bucket/in_mem.rb

@@ -36,8 +36,17 @@ module BFS
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **_opts)
         Enumerator.new do |y|
-          @files.each_key do |key|
-            y << key if File.fnmatch?(pattern, key, File::FNM_PATHNAME)
+          @files.each_key do |path|
+            y << path if File.fnmatch?(pattern, path, File::FNM_PATHNAME)
+          end
+        end
+      end
+
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(pattern = '**/*', **_opts)
+        Enumerator.new do |y|
+          @files.each_key do |path|
+            y << file_info(path) if File.fnmatch?(pattern, path, File::FNM_PATHNAME)
           end
         end
       end
@@ -47,8 +56,7 @@ module BFS
         path = norm_path(path)
         raise BFS::FileNotFound, path unless @files.key?(path)
 
-        entry = @files[path]
-        BFS::FileInfo.new(path: path, size: entry.io.size, mtime: entry.mtime, content_type: entry.content_type, metadata: entry.metadata)
+        file_info(path)
       end
 
       # Creates a new file and opens it for writing.
@@ -84,6 +92,13 @@ module BFS
       def rm(path, **_opts)
         @files.delete(norm_path(path))
       end
+
+      private
+
+      def file_info(path)
+        entry = @files[path]
+        BFS::FileInfo.new path: path, size: entry.io.size, mtime: entry.mtime, content_type: entry.content_type, metadata: entry.metadata
+      end
     end
   end
 end

data/spec/bfs/blob_spec.rb

@@ -2,12 +2,15 @@ require 'spec_helper'
 
 RSpec.describe BFS::Blob, core: true do
   describe 'default' do
+    subject      { described_class.new('memtest://bucket/path/to/file.txt') }
+
     let(:bucket) { BFS::Bucket::InMem.new }
+
     before       { allow(BFS).to receive(:resolve).and_return(bucket) }
-    subject      { described_class.new('memtest://bucket/path/to/file.txt') }
+
     after        { subject.close }
 
-    it 'should move' do
+    it 'moves' do
       expect(subject.path).to eq('path/to/file.txt')
       expect { subject.mv('/to/other/path.txt') }.to raise_error(BFS::FileNotFound)
 
@@ -16,7 +19,7 @@ RSpec.describe BFS::Blob, core: true do
       expect(subject.path).to eq('to/other/path.txt')
     end
 
-    it 'should write/read' do
+    it 'write/reads' do
       expect { subject.read }.to raise_error(BFS::FileNotFound)
       subject.write('TESTDATA', content_type: 'text/plain', metadata: { 'x-key' => 'val' })
 
@@ -36,12 +39,14 @@ RSpec.describe BFS::Blob, core: true do
   end
 
   describe 'file system' do
+    subject { described_class.new("file:///#{path}") }
+
     let(:tmpdir) { Dir.mktmpdir }
     let(:path)   { "#{tmpdir}/path/to/file.txt".sub('/', '') }
-    after   { FileUtils.rm_rf tmpdir }
-    subject { described_class.new("file:///#{path}") }
 
-    it 'should move' do
+    after { FileUtils.rm_rf tmpdir }
+
+    it 'moves' do
       expect(subject.path).to eq(path)
       expect { subject.mv("#{tmpdir}/to/other/path.txt") }.to raise_error(BFS::FileNotFound)
 
@@ -54,7 +59,7 @@ RSpec.describe BFS::Blob, core: true do
       ]
     end
 
-    it 'should write/read' do
+    it 'write/reads' do
       expect { subject.read }.to raise_error(BFS::FileNotFound)
 
       subject.write('TESTDATA', content_type: 'text/plain', metadata: { 'x-key' => 'val' })

data/spec/bfs/bucket/abstract_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe BFS::Bucket::Abstract, core: true do
-  it 'should open with a block' do
+  it 'opens with a block' do
     sub_class = Class.new(described_class) do
       def close
         @closed = true

data/spec/bfs/bucket/fs_spec.rb

@@ -1,15 +1,17 @@
 require 'spec_helper'
 
 RSpec.describe BFS::Bucket::FS, core: true do
-  let(:tmpdir) { Dir.mktmpdir }
-  after   { FileUtils.rm_rf tmpdir }
   subject { described_class.new(tmpdir) }
 
+  let(:tmpdir) { Dir.mktmpdir }
+
+  after { FileUtils.rm_rf tmpdir }
+
   it_behaves_like 'a bucket',
                   content_type: false,
                   metadata: false
 
-  it 'should resolve from URL' do
+  it 'resolves from URL' do
     File.open(File.join(tmpdir, 'test.txt'), 'wb') {|f| f.write 'TESTDATA' }
 
     bucket = BFS.resolve("file://#{tmpdir}")
@@ -18,14 +20,14 @@ RSpec.describe BFS::Bucket::FS, core: true do
     bucket.close
   end
 
-  it 'should support custom perms on #initialize' do
+  it 'supports custom perms on #initialize' do
     blob = BFS::Blob.new("file://#{tmpdir}/test.txt?perm=0666")
     blob.create {|w| w.write 'foo' }
     expect(blob.info.mode).to eq(0o666)
     blob.close
   end
 
-  it 'should support custom perms on #create' do
+  it 'supports custom perms on #create' do
     blob = BFS::Blob.new("file://#{tmpdir}/test.txt")
     blob.create(perm: 0o666) {|w| w.write 'foo' }
     expect(blob.info.mode).to eq(0o666)

data/spec/bfs/helpers_spec.rb

@@ -1,16 +1,17 @@
 require 'spec_helper'
 
 RSpec.describe BFS::Writer, core: true do
-  let(:on_commit) { proc { true } }
   subject { described_class.new 'test', &on_commit }
 
-  it 'should support custom params' do
+  let(:on_commit) { proc { true } }
+
+  it 'supports custom params' do
     subject = described_class.new 'test', perm: 0o640, &on_commit
     expect(subject.stat.mode).to eq(0o100640)
     expect(subject.commit).to be(true)
   end
 
-  it 'should execute a on_commit block' do
+  it 'executes a on_commit block' do
     expect(on_commit).to receive(:call).with(subject.path).once
     expect(subject.commit).to be(true)
     expect(subject.commit).to be(false)
@@ -21,7 +22,7 @@ RSpec.describe BFS::Writer, core: true do
     expect(subject.discard).to be(true)
   end
 
-  it 'should not auto-commit on close' do
+  it 'does not auto-commit on close' do
     expect(on_commit).not_to receive(:call)
     expect(subject.close).to be_nil
   end

data/spec/bfs_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 RSpec.describe BFS, core: true do
-  it 'should resolve' do
-    bucket = BFS.resolve("file://#{Dir.tmpdir}")
+  it 'resolves' do
+    bucket = described_class.resolve("file://#{Dir.tmpdir}")
     expect(bucket).to be_instance_of(BFS::Bucket::FS)
     bucket.close
   end
 
-  it 'should resolve with block' do
-    BFS.resolve("file://#{Dir.tmpdir}") do |bucket|
+  it 'resolves with block' do
+    described_class.resolve("file://#{Dir.tmpdir}") do |bucket|
       expect(bucket).to be_instance_of(BFS::Bucket::FS)
       expect(bucket).to receive(:close)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies: []
 description: Minimalist abstraction for bucket storage
 email: dimitrij@blacksquaremedia.com
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Multi-platform cloud bucket adapter