dpl 1.8.3.travis.1078.4 → 1.8.3.travis.1087.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODc3MTBhMzhkNDM5ZWM4MDgwM2E0MzQzOWQxN2EwMTE0NGE4NjdhNg==
+    NjY2YTBhMjE0MDg5NTA5YTMzZTE2MDVkZmU2NTAyMTk3NjUzNjQ4Zg==
   data.tar.gz: !binary |-
-    MDIwOTViMWNmM2I5YmI5ZGUwODhjZDU3ZWMzZTNhOWU3YWI3YjcxNw==
+    NWE1YzU0ZDMwYzUwMDQxMDYyMDA4ZjFmODY5MjRmMDU1OTQ5OTY2OA==
 SHA512:
   metadata.gz: !binary |-
-    OTFlOTNlMDFjOTBlY2U4MTdmMDEzODRiOTg5OWMwYmUyNzlmMmI2YjZlYjFh
-    YzhjMzM4NGMyNWJkZmZlZDA4NWIzY2E2YzI4YzVhMjZkNzJmODVkOTAzMGM2
-    NDJiNjk1MmExYmMwNTUxZGQ2ZTYxY2MxYmFlZTRkMGVhMjRhNzM=
+    NjBkZDY3MzY5OTJkZGI5YWNmNjUyOGVhMjFhMGY1ZmM4ZGNkYWE2NDdiNDc4
+    ZjEyYzM3Njg2ZGI1NDNmMmFkOGFhMzQyOTQ0NzgxZWM4ZjQ4Y2JjNDcwNTQ4
+    OTM1YWM1MDNjN2Q3OWUwNTE0NThlYmIwZDM4YTQzNzkwNjljYmU=
   data.tar.gz: !binary |-
-    NjFkY2M5MTZjNjRiZTI5YWVlZTZhMjBkNTg2OTk0ZjFkYWVhYjU2ZThlNGMz
-    MjI1Njg5YjZjNmFhY2U2NTYxNjlkMDIwZDhlZDRjOTFhNTBkMWMzMTEzYTVl
-    YmUwNjY1MzQyMTU1OTM0ZTMzYWFhM2VmZTkxMDI1Njc1ZmRjYjY=
+    Y2M3MThjMTcxZTMyZGMxNTE0MGNkMjlkMWE2ZTM1NTAxYmZmMzc3NzBmYjFi
+    YWIyNTZkODkwYjI3ODBhNDlhM2RiMTliMzQ1M2E0ZmNmZGIyOWQxM2EzYWNm
+    MGIxZjI4NmYzNGMxMGFlZDQwNjY2MDRmMTgxYTA5OTUwYzU1NmU=

data/lib/dpl/provider/script.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module DPL
   class Provider
     class Script < Provider
@@ -15,9 +17,17 @@ module DPL
       end
 
       def push_app
-        context.shell script
-        if $?.exitstatus != 0
-          raise Error, "Script #{script} failed with status #{$?.exitstatus}"
+        stdin, stdout, stderr, wait_thr = Open3.popen3(script)
+        while wait_thr.status do
+          sleep 1
+        end
+
+        log stdout.read
+        warn stderr.read
+
+        status = wait_thr.value
+        if !status.success?
+          raise Error, "Script #{File.join(ENV['PWD'], script)} failed with status #{status.exitstatus}"
         end
       end
 

data/spec/provider/script_spec.rb

@@ -8,15 +8,28 @@ describe DPL::Provider::Script do
 
   let(:script) { 'scripts/deploy_script' }
 
+  before :each do
+    stdin, stdout, stderr, wait_thr = double('stdin'), double('stdout'), double('stderr'), double('wait_thr')
+    @status = double
+
+    allow(stdout).to receive(:read)
+    allow(stderr).to receive(:read)
+    allow(wait_thr).to receive(:status).and_return(false)
+    allow(wait_thr).to receive(:value).and_return(@status)
+    allow(@status).to receive(:success?).and_return(true)
+
+    expect(Open3).to receive(:popen3).and_return([stdin, stdout, stderr, wait_thr])
+  end
+
   it 'runs command "script" given' do
-    expect(provider.context).to receive(:shell).with(script)
     provider.push_app
   end
 
   context 'when script exits with nonzero status' do
     before :each do
       # TODO: Found a better way to test this
-      Process::Status.any_instance.stub(:exitstatus).and_return(1)
+      allow(@status).to receive(:success?).and_return(false)
+      allow(@status).to receive(:exitstatus).and_return(1)
     end
 
     it 'raises error' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.3.travis.1078.4
+  version: 1.8.3.travis.1087.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec