dpl 1.8.32.travis.1957.5 → 1.8.32.travis.1958.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e39224780b902e25e44ae745cfa501ed7f926b4
-  data.tar.gz: 699230260516ed63565df9b747c03d51d934eeb9
+  metadata.gz: 5c73cb5cb409a1dcc6e94c211efcfcc4b701b7da
+  data.tar.gz: 754816797de947073773b8c6b352da140039dc75
 SHA512:
-  metadata.gz: 6f5ab1930859cca43e325bfdfe66608b559162f7d66e1ec584be7dbacedb08488e5976e688e53001925e8465a1bf3a1c5e5d8f346983bd247b805b250d683e05
-  data.tar.gz: 99a848b888c4120e3bc695468b6860496274faaa90b4639404651ac24d7eb9bce4b6fca6f18066fc32784521ed3db86573a07e9c0c93534dbec0a9504d81b6d7
+  metadata.gz: fa61f15d0ee4343f10a2ee10ec2960d4b1cfe3fe567f5da9ff6208636b04c99be0c38ad8632c766914a8c22e944c2bbcbb98cea547b852bb15267c130efaf41c
+  data.tar.gz: 4fe17be5fd9042da66cd70e6970b9f7671e5f7680baf993000274261237283fa0bedeacb364c91bea6ebcd41176d4d507d5c3c51de3c75f3d5e87fac04077422

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -42,7 +42,7 @@ module DPL
         create_bucket unless bucket_exists?
 
         if options[:zip_file]
-          zip_file = File.join(Dir.pwd, options[:zip_file])
+          zip_file = File.expand_path(options[:zip_file])
         else
           zip_file = create_zip
         end

data/spec/provider/elastic_beanstalk_spec.rb

@@ -65,7 +65,7 @@ describe DPL::Provider::ElasticBeanstalk do
       allow(io_double).to receive(:open)
       allow(s3_obj_double).to receive(:put).with(anything).and_return(Object.new)
       allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
-      expect(Pathname).to receive(:new).with('/path/to/file.zip').and_return(io_double)
+      expect(Pathname).to receive(:new).and_return(io_double)
     end
 
     example 'bucket exists already' do
@@ -158,5 +158,46 @@ describe DPL::Provider::ElasticBeanstalk do
         provider.push_app
       end
     end
+
+    context "when zip_file option is given" do
+      before :each do
+        allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
+        expect(provider).to receive(:s3).and_return(s3_mock).twice
+        expect(provider).to receive(:create_bucket)
+        expect(provider).to receive(:archive_name).and_return('file.zip')
+        expect(provider).to receive(:sleep).with(5)
+        expect(provider).to receive(:create_app_version).with(s3_obj_double).and_return(app_version)
+        expect(provider).to receive(:update_app).with(app_version)
+      end
+
+      example 'zip_file is an absolute path' do
+        provider.options.update(:zip_file => '/absolute/path/to/file.zip')
+        expect(provider).to receive(:upload).with('file.zip', '/absolute/path/to/file.zip').and_call_original
+
+        provider.push_app
+      end
+
+      example 'zip_file is an relative path' do
+        provider.options.update(:zip_file => 'relative/path/to/file.zip')
+        expect(provider).to receive(:upload).with('file.zip', File.join(Dir.pwd, 'relative/path/to/file.zip')).and_call_original
+
+        provider.push_app
+      end
+
+      example 'zip_file is a path with ~/' do
+        provider.options.update(:zip_file => '~/file.zip')
+        expect(provider).to receive(:upload).with('file.zip', File.join(ENV['HOME'], 'file.zip')).and_call_original
+
+        provider.push_app
+      end
+
+      example 'zip_file is has no path' do
+        provider.options.update(:zip_file => 'file.zip')
+        expect(provider).to receive(:upload).with('file.zip', File.join(Dir.pwd, 'file.zip')).and_call_original
+
+        provider.push_app
+      end
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.32.travis.1957.5
+  version: 1.8.32.travis.1958.5
 platform: ruby
 authors:
 - Konstantin Haase