dpl-s3 1.9.4.travis.2768.5 → 1.9.4.travis.2773.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8494fd60bf4b629439f94f9e9ca9d9b6cd73371d66ccdce83d79f1be22f38b55
-  data.tar.gz: fddbdefe57d40e6ffa561556b49a9b139fbf83bd587fe653d676c8d7f12985c7
+  metadata.gz: 9254475c3471a34f9f49703312ae3801e9505bac5ea245bb5f9296759ad00a3b
+  data.tar.gz: 1a8e03256d3188391979e065f9fc0eb4d2c7bfa301b6b7090bd6a2dd67f8381a
 SHA512:
-  metadata.gz: 778263d20d61985d17c6c23845c32adb584259c4335cfc7c259915d7fe07b35f6e7f002158f520d0b01aa0e0d501dfc0b969e735b5b0a444faf9d0f136755e36
-  data.tar.gz: c8ee8b8c06668e5f71b0b4546df0200cc649c81433195f146f5132d25867453754c622aea2b77fd65b5f28e1e3bc20ee487470bafc08d24be4bd45a1cc28a6be
+  metadata.gz: 290e10289a8c85c1d2bc0b8bd17f94228153a78b331a86f5f80da4c177dd39ee12a1bef9bd4c3bea43ff1f2659c0b73c06066d0faa04d99f93d30a2821f7c730
+  data.tar.gz: e8bb16f5635d10c062e635cfec3d1828d61af1c6cd81723cc77a54fdd511713cde4dcf7720c8793e0199357ef5ca0581e1bca34ce696e198f109daa55d82be53

data/lib/dpl/provider/s3.rb

@@ -49,8 +49,10 @@ module DPL
       end
 
       def push_app
+        old_pwd = Dir.pwd
         cwd = options.fetch(:local_dir, Dir.pwd)
-        glob_args = [cwd + "/**/*"]
+        Dir.chdir(cwd)
+        glob_args = ["**/*"]
         glob_args << File::FNM_DOTMATCH if options[:dot_match]
         files = Dir.glob(*glob_args).reject {|f| File.directory?(f)}
         upload_multithreaded(files)
@@ -64,6 +66,8 @@ module DPL
             }
           )
         end
+
+        Dir.chdir(old_pwd)
       end
 
       def upload_multithreaded(files)

data/spec/provider/s3_spec.rb

@@ -85,7 +85,9 @@ describe DPL::Provider::S3 do
     example "With local_dir" do
       someDir = "/some/dir/"
       provider.options.update(:local_dir => someDir)
-      expect(Dir).to receive(:glob).with(someDir + "/**/*").and_return([__FILE__])
+      allow(Dir).to receive(:chdir).with(someDir).and_return(true)
+      allow(Dir).to receive(:chdir).with(Dir.pwd).and_return(true)
+      expect(Dir).to receive(:glob).with("**/*").and_return([__FILE__])
       provider.push_app
     end
 
@@ -156,20 +158,20 @@ describe DPL::Provider::S3 do
 
     example "when dot_match is set" do
       provider.options.update(:dot_match => true)
-      expect(Dir).to receive(:glob).with(Dir.pwd + "/**/*", File::FNM_DOTMATCH).and_return([__FILE__])
+      expect(Dir).to receive(:glob).with("**/*", File::FNM_DOTMATCH).and_return([__FILE__])
       provider.push_app
     end
 
     example "when max_threads is set" do
       provider.options.update(:max_threads => 10)
-      expect(Dir).to receive(:glob).with(Dir.pwd + "/**/*").and_return([__FILE__])
+      expect(Dir).to receive(:glob).with("**/*").and_return([__FILE__])
       expect(provider).to receive(:log).with("Beginning upload of 1 files with 10 threads.")
       provider.push_app
     end
 
     example "when max_threads is too large" do
       provider.options.update(:max_threads => 100)
-      expect(Dir).to receive(:glob).with(Dir.pwd + "/**/*").and_return([__FILE__])
+      expect(Dir).to receive(:glob).with("**/*").and_return([__FILE__])
       expect(provider).to receive(:log).with("Beginning upload of 1 files with 15 threads.")
       expect(provider).to receive(:log).with("Desired thread count 100 is too large. Using 15.")
       provider.push_app

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl-s3
 version: !ruby/object:Gem::Version
-  version: 1.9.4.travis.2768.5
+  version: 1.9.4.travis.2773.5
 platform: ruby
 authors:
 - Konstantin Haase
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.4.travis.2768.5
+        version: 1.9.4.travis.2773.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.4.travis.2768.5
+        version: 1.9.4.travis.2773.5
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement