dpl 1.7.12.travis.773.4 → 1.7.12.travis.774.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjQ1NmZiMDZmOTY2ZThjYWJlNWFiYzhiMjc1NDY0OTI0YWYwODI1Mg==
+    ZDU5ZmVlZGU0MzJlYzI3ZWFjZmRmNGI0NWZlNjViZGU1ZWVkMjg5OQ==
   data.tar.gz: !binary |-
-    YjNhZDU5NTI3MjY3NjBmZjk2ZjhjN2I5MzdiYWZiY2Q5M2JkZTRiOA==
+    OWZlN2E2NzNlZmM1YTA1ODBhMDM1MGZmYTg0Y2MwYzA5N2IyOTUyMQ==
 SHA512:
   metadata.gz: !binary |-
-    YTlkNzAxNjVjYTc0MzA5OWIyNmE0Yjg3Y2M3NmM2YTNkNGM2NjMwMzI3Njhh
-    NzQ5YmZkNzQ4YWI4ZWQzNDI2NjhmM2JhNmE3OTliYWJhYTU5YTY0NzZhNTQz
-    N2U4NjA1YzA0OGFiMGRhZWQ0MzdkNjg4MTBhMzg2OGFiZjgwYzU=
+    M2UzMjE5MTA0MzExNzA0OGUxMGZiMTA4NWZhMzBhMDg1ZTU4ODM1ZjlmYzA0
+    MGZlMTAyZDI4MTcxY2Y4MDgxYWM3ZjIwOTI0ZTI2Y2ZjMWE3YTdlMzljMTQ4
+    NzVkODg1NTc1NDM2MTM5YjlmN2E4OTBiNmNmMjQ3N2FjZWNiNjM=
   data.tar.gz: !binary |-
-    ZmZhZWJiMDFhNzcyOGYwMWE3NTAzODgyMDRmZjBlNGI1MWUzOGU2ZWU3NWFk
-    NzBjYmM1OTc5Y2RlYTYxYmZjOTJlN2Y0YWYxYTQ0Njg1NDBhNmNkOWY1MWU3
-    MDlkMjY4NDRkYmZhNTRhYTJlY2ZhMjUzNGRkZjE0MGFiYWVhMGM=
+    YmNiNTQ5NjcwMTc1OGY4MjUyZDA0YTg3NGI4MTUxMTE3ZGQwMTUyMjc1NGZk
+    OGNkODgwOWUyMTdmMWIzOWRhYzkzNmU1NWVmN2Y2YWI5ZWE5MTA0ZmQzNDg0
+    ZWFlZDc3MTRjZmY1YzBjNjdlNDhhNmY2NzdlYjMyOWQzODRhMTI=

data/README.md

@@ -402,6 +402,7 @@ For accounts using two factor authentication, you have to use an oauth token as
  * **env**: Elastic Beanstalk environment name which will be updated.
  * **zip-file**: The zip-file that you want to deploy. _**Note:**_ you also need to use the `skip-cleanup` or the zipfile you are trying to upload will be removed during cleanup.
  * **bucket_name**: Bucket name to upload app to.
+ * **bucket_path**: Location within Bucket to upload app to.
 
 #### Examples:
 

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -94,7 +94,12 @@ module DPL
       end
 
       def upload(key, file)
-        obj = s3.buckets[bucket_name].objects[key]
+        obj = s3.buckets[bucket_name]
+        if option(:bucket_path)
+          option(:bucket_path).gsub!(/\/*$/,'/')
+        end
+
+        obj = obj.objects["#{option(:bucket_path)}#{key}"]
         obj.write(Pathname.new(file))
         obj
       end

data/spec/provider/elastic_beanstalk_spec.rb

@@ -15,11 +15,22 @@ describe DPL::Provider::ElasticBeanstalk do
   let(:app) { 'example-app' }
   let(:env) { 'live' }
   let(:bucket_name) { "travis-elasticbeanstalk-test-builds-#{region}" }
+  let(:bucket_path) { "some/app"}
+
+  let(:bucket_mock) do
+    dbl = double("bucket mock", write: nil)
+    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)
+  end
 
   subject :provider 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
+      :region => region, :app => app, :env => env, :bucket_name => bucket_name, :bucket_path => bucket_path
     )
   end
 
@@ -33,35 +44,32 @@ describe DPL::Provider::ElasticBeanstalk do
   describe "#push_app" do
 
     let(:bucket_name) { "travis-elasticbeanstalk-test-builds-#{region}" }
-    let(:s3_object) { Object.new }
     let(:app_version) { Object.new }
 
-    let(:bucket) { Struct.new(:name) }
-    let(:s3) { Struct.new(:buckets) }
-
     example 'bucket exists already' do
-      s3_mock = s3.new([bucket.new(bucket_name)])
-      expect(provider).to receive(:s3).and_return(s3_mock)
+      allow(s3_mock.buckets).to receive(:map).and_return([bucket_name])
+
+      expect(provider).to receive(:s3).and_return(s3_mock).twice
       expect(provider).not_to receive(:create_bucket)
       expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
       expect(provider).to receive(:archive_name).and_return('file.zip')
-      expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_return(s3_object)
+      expect(bucket_mock.objects).to receive(:[]).with("#{bucket_path}/file.zip").and_return(bucket_mock)
+      expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
       expect(provider).to receive(:sleep).with(5)
-      expect(provider).to receive(:create_app_version).with(s3_object).and_return(app_version)
+      expect(provider).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
       expect(provider).to receive(:update_app).with(app_version)
 
       provider.push_app
     end
 
     example 'bucket doesnt exist yet' do
-      s3_mock = s3.new([])
-      expect(provider).to receive(:s3).and_return(s3_mock)
+      expect(provider).to receive(:s3).and_return(s3_mock).twice
       expect(provider).to receive(:create_bucket)
       expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
       expect(provider).to receive(:archive_name).and_return('file.zip')
-      expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_return(s3_object)
+      expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
       expect(provider).to receive(:sleep).with(5)
-      expect(provider).to receive(:create_app_version).with(s3_object).and_return(app_version)
+      expect(provider).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
       expect(provider).to receive(:update_app).with(app_version)
 
       provider.push_app

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.12.travis.773.4
+  version: 1.7.12.travis.774.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec