bfs-s3 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 006a47eb5bb98ed25ce659ef731f72ea815f629382906125dff18d90866b06c9
-  data.tar.gz: '09e8fb5e9c3a7496f2d6004300f20e03e62af725a9e238abd4d67fa0d66b8ed2'
+  metadata.gz: 63aa7d24ff89dfba3557e9d02c08881f01d27c541beab1ac4006986e4ebadf24
+  data.tar.gz: 2ffa79c55d126ec13bf260bb1ecd7f9f5b76cff53e6e76fe9d3bac2cf46c34a0
 SHA512:
-  metadata.gz: 0aa16aadd6093b213199286f61a4ac965b54386e96e441b74c567d277fb5c5fc552977fb44f580ce254ce565dc79c12db23941dbd3e490e52e24288911218e17
-  data.tar.gz: a68af4df46647ccb88bdf6d2869b068aa26b83f75fb267a093d443146a30fc092bc73879f45b958d4e7112ceb9d769608e18fa452802e43b5674b12ebb9060d2
+  metadata.gz: d39f2de32870e27de52944a1263d1626a48c9b11b236609d6e993e1728905550cab8078f2cf2e51a36b8f0062f8301acb0121fef00eeecc0311f779a5d38acb1
+  data.tar.gz: e66ecc98c6e0b770f61b1d71cfe15e3bf36977508eab22db733cb27c9fd96f37411815a4f6fd72efe71a818bcb487bb2299afc48cc552268bed47ae35f9dce1c

data/lib/bfs/bucket/s3.rb

@@ -143,11 +143,13 @@ module BFS
       private
 
       def init_client(opts)
-        credentials = opts[:credentials]
-        credentials ||= Aws::Credentials.new(opts[:access_key_id].to_s, opts[:secret_access_key].to_s) if opts[:access_key_id]
-        credentials ||= Aws::SharedCredentials.new(profile_name: opts[:profile_name])
+        config = {}
+        config[:region] = opts[:region] if opts[:region]
+        config[:credentials] = opts[:credentials] if opts[:credentials]
+        config[:credentials] ||= Aws::Credentials.new(opts[:access_key_id].to_s, opts[:secret_access_key].to_s) if opts[:access_key_id]
+        config[:credentials] ||= Aws::SharedCredentials.new(profile_name: opts[:profile_name]) if opts[:profile_name]
 
-        Aws::S3::Client.new region: opts[:region], credentials: credentials
+        Aws::S3::Client.new(config)
       end
     end
   end

data/spec/bfs/bucket/s3_spec.rb

@@ -1,17 +1,12 @@
 require 'spec_helper'
 
-sandbox  = { region: 'us-east-1', bucket: 'bsm-bfs-unittest' }.freeze
+sandbox  = { bucket: 'bsm-bfs-unittest' }.freeze
 run_spec = \
   begin
-    c = Aws::SharedCredentials.new
-    if c.loadable?
-      s = Aws::S3::Client.new(region: sandbox[:region], credentials: c)
-      s.head_bucket(bucket: sandbox[:bucket])
-      true
-    else
-      false
-    end
-  rescue Aws::Errors::ServiceError
+    s = Aws::S3::Client.new
+    s.head_bucket(bucket: sandbox[:bucket])
+    true
+  rescue StandardError
     false
   end
 
@@ -19,24 +14,24 @@ RSpec.describe BFS::Bucket::S3, if: run_spec do
   let(:prefix) { "x/#{SecureRandom.uuid}/" }
 
   subject do
-    described_class.new sandbox[:bucket], region: sandbox[:region], prefix: prefix
+    described_class.new sandbox[:bucket], prefix: prefix
   end
   after :all do
-    bucket = described_class.new sandbox[:bucket], region: sandbox[:region], prefix: 'x/'
+    bucket = described_class.new sandbox[:bucket], prefix: 'x/'
     bucket.ls.each {|name| bucket.rm(name) }
   end
 
   it_behaves_like 'a bucket'
 
   it 'should resolve from URL' do
-    bucket = BFS.resolve("s3://#{sandbox[:bucket]}?acl=private&region=#{sandbox[:region]}")
+    bucket = BFS.resolve("s3://#{sandbox[:bucket]}?acl=private")
     expect(bucket).to be_instance_of(described_class)
     expect(bucket.name).to eq(sandbox[:bucket])
     expect(bucket.acl).to eq(:private)
   end
 
   it 'should enumerate over a large number of files' do
-    bucket = described_class.new sandbox[:bucket], region: sandbox[:region], prefix: 'm/'
+    bucket = described_class.new sandbox[:bucket], prefix: 'm/'
     expect(bucket.ls('**/*').count).to eq(2121)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 description: https://github.com/bsm/bfs.rb
 email: dimitrij@blacksquaremedia.com
 executables: []