dpl 1.7.12.travis.783.4 → 1.7.12.travis.784.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWJhNDI4MjFkM2RiMjBmOTU4ZGQxNDM4ZjVjZjlkYTVjNmVjNzFjZg==
+    YTBkMzQxMjBiNjgwNTcyYjU0ZGM2Y2MxNjRjNjI2MmEzZGY5MjlmNg==
   data.tar.gz: !binary |-
-    Y2M4ZDMwNmExZTNmYjZhYjA3NTQ0NTJlNGMzODZhNmIxM2FmYTI4YQ==
+    ZGQ2YmQ4NGJmZDZhNGQ2MDAwOWQ3MDIzMTJjYzdjYzNlMGEzMTU3Mw==
 SHA512:
   metadata.gz: !binary |-
-    MTkwNTJlNDkyYTM4MzRkNmQyZjFkYmJkMGNmNGE4YTc5MjJiYmU4NDc2ZWE1
-    NDYyNGQ2ODRjZTc4MmQ4NGQ0MTRhMjExNTRjOTc0OGJjYmI0YjYyZGM4Mjc5
-    YjRiYTY1NjU2YmU1MDVjOTVjODFlNWMwODkwZDRhMTA0NjE3M2M=
+    ODQ1YzA3ZDUwM2I4YTlkZGE1NDI2NGJlNWQxOWM5OTdkOGE3YmE1ZGVjYzIw
+    MzM3Nzg1YzI3N2E0OWIyNzQwM2ExZmRmZDc5Yzk5MTliODc1ZGE4ZGMyYzEy
+    N2NlNTY0MjY4MjU2MTQ3MDNjMWRkOWVkMDA5MDU5NTc5YjNlOTk=
   data.tar.gz: !binary |-
-    OTI0YmNhYzExNzFjYjUwNGIwODEwOWE0YjVlZjhkYzcxMzQ2MTg5ZDAwZWVi
-    YzQ1MTUxMjcxNDA5NTdhY2Q0NDY2MWQ4Y2MwMDMyZGMzNmJhNDQzYTQ0YWVm
-    ZGVhNWNlNmZiOWQzNjRkNTczZDBkZDgyOWQ3ZjQ0OWY1YzlkNWQ=
+    ZDY2MTRjZmU1MTY0ZmE2OWY1MGU4NDk2ZjM0NWJmYjE3OGViYWM5ZmNjZmJj
+    YjM2YjJkM2E4YWFhZjZhMWY0NGQ2MTdjZTYyYzQ0MTk2YTZlODE5M2MxOTYy
+    ZjRhZjhlZjgxYTRjZjY4N2ViNmVkMmM5ODU0NTdhZDg5Zjk2YTI=

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -60,6 +60,10 @@ module DPL
         option(:bucket_name)
       end
 
+      def bucket_path
+        @bucket_path ||= options[:bucket_path] ? option(:bucket_path).gsub(/\/*$/,'/') : nil
+      end
+
       def s3
         @s3 ||= AWS::S3.new
       end
@@ -95,11 +99,7 @@ module DPL
 
       def upload(key, file)
         obj = s3.buckets[bucket_name]
-        if option(:bucket_path)
-          option(:bucket_path).gsub!(/\/*$/,'/')
-        end
-
-        obj = obj.objects["#{option(:bucket_path)}#{key}"]
+        obj = bucket_path ? obj.objects["#{bucket_path}#{key}"] : obj.objects[key]
         obj.write(Pathname.new(file))
         obj
       end

data/spec/provider/elastic_beanstalk_spec.rb

@@ -22,6 +22,7 @@ describe DPL::Provider::ElasticBeanstalk do
     allow(dbl).to receive(:objects).and_return(double("Hash", :[] => dbl))
     dbl
   end
+
   let(:s3_mock) do
     hash_dbl = double("Hash", :[] => bucket_mock, :map => [])
     double("AWS::S3", buckets: hash_dbl)
@@ -34,6 +35,13 @@ describe DPL::Provider::ElasticBeanstalk do
     )
   end
 
+  subject :provider_without_bucket_path do
+    described_class.new(
+      DummyContext.new, :access_key_id => access_key_id, :secret_access_key => secret_access_key,
+      :region => region, :app => app, :env => env, :bucket_name => bucket_name
+    )
+  end
+
   describe "#check_auth" do
     example do
       expect(AWS).to receive(:config).with(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
@@ -74,5 +82,24 @@ describe DPL::Provider::ElasticBeanstalk do
 
       provider.push_app
     end
+
+    context 'When the bucket_path option is not set' do
+      example 'Does not prepend bucket_path to the s3 bucket' do
+        allow(s3_mock.buckets).to receive(:map).and_return([bucket_name])
+
+        expect(provider_without_bucket_path).to receive(:s3).and_return(s3_mock).twice
+        expect(provider_without_bucket_path).not_to receive(:create_bucket)
+        expect(provider_without_bucket_path).to receive(:create_zip).and_return('/path/to/file.zip')
+        expect(provider_without_bucket_path).to receive(:archive_name).and_return('file.zip')
+        expect(provider_without_bucket_path).to receive(:bucket_path).and_return(nil)
+        expect(bucket_mock.objects).to receive(:[]).with("file.zip").and_return(bucket_mock)
+        expect(provider_without_bucket_path).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
+        expect(provider_without_bucket_path).to receive(:sleep).with(5)
+        expect(provider_without_bucket_path).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
+        expect(provider_without_bucket_path).to receive(:update_app).with(app_version)
+
+        provider_without_bucket_path.push_app
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.12.travis.783.4
+  version: 1.7.12.travis.784.4
 platform: ruby
 authors:
 - Konstantin Haase