dpl 1.8.30.travis.1873.3 → 1.8.30.travis.1881.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1232586e213d2d1b5c472fcadaa4a5e40afe946
-  data.tar.gz: b773f1ffc56623135cb4b57dab3f0e03e895b4cd
+  metadata.gz: be04e4325446d67cdb747c9e78da99e34998cef0
+  data.tar.gz: 699740e122c7d23be483df809455ab18aadc355c
 SHA512:
-  metadata.gz: b30ecc0aea695730d6747b6399f304d1e082a046760b42931856d4a08862cbab363655738d443f8287b6ac7c6784bde44f9cfbd6d0965d5c7a9c5f708dcddfa9
-  data.tar.gz: 284e1c3138e9450318fe497d4253834c8a45db89fcacf39bb2755fba8fe5c5913e9158ffecd3be90ca237aec930ee43e88730d1f5eaddce167be9a7c7dac1518
+  metadata.gz: cf578fc6dd9308cb31b19f54a4eaee3cde5962b090396d151c71e0133ef0d2f973b6980554b62db9649bcfe12c8c9c85e8cd6cca245f875c9f17963d678776e0
+  data.tar.gz: 8106d188c5a7f0774ee03608bd11e94f055a1b0d393b244f3f4e010c7f08f5e548722a0888f72feaf7a1ccf124ce08b4ebd506383b0020e3694647bd36dceaba

data/lib/dpl/provider/gae.rb

@@ -10,11 +10,22 @@ module DPL
       BOOTSTRAP="#{INSTALL}/#{NAME}/bin/bootstrapping/install.py"
       GCLOUD="#{INSTALL}/#{NAME}/bin/gcloud"
 
+      def with_python_2_7(cmd)
+        cmd.gsub!(/'/, "'\\\\''")
+        context.shell("bash -c 'source #{context.env['HOME']}/virtualenv/python2.7/bin/activate; #{cmd}'")
+      end
+
       def install_deploy_dependencies
         if File.exists? GCLOUD
           return
         end
 
+        $stderr.puts 'Python 2.7 Version'
+
+        unless with_python_2_7("python -c 'import sys; print(sys.version)'")
+          error 'Could not use python2.7'
+        end
+
         $stderr.puts 'Downloading Google Cloud SDK ...'
 
         unless context.shell("curl -L #{BASE + NAME + EXT} | gzip -d | tar -x -C #{INSTALL}")
@@ -23,7 +34,7 @@ module DPL
 
         $stderr.puts 'Bootstrapping Google Cloud SDK ...'
 
-        unless context.shell("#{BOOTSTRAP} --usage-reporting=false --command-completion=false --path-update=false")
+        unless with_python_2_7("#{BOOTSTRAP} --usage-reporting=false --command-completion=false --path-update=false")
           error 'Could not bootstrap Google Cloud SDK.'
         end
       end
@@ -33,7 +44,7 @@ module DPL
       end
 
       def check_auth
-        unless context.shell("#{GCLOUD} -q --verbosity debug auth activate-service-account --key-file #{keyfile}")
+        unless with_python_2_7("#{GCLOUD} -q --verbosity debug auth activate-service-account --key-file #{keyfile}")
           error 'Authentication failed.'
         end
       end
@@ -75,7 +86,7 @@ module DPL
         command << " --version \"#{version}\"" unless version.to_s.empty?
         command << " --#{no_promote ? 'no-' : ''}promote"
         command << ' --no-stop-previous-version' unless no_stop_previous_version.to_s.empty?
-        unless context.shell(command)
+        unless with_python_2_7(command)
           log 'Deployment failed.'
           context.shell('find $HOME/.config/gcloud/logs -type f -print -exec cat {} \;')
           error ''

data/spec/provider/gae_spec.rb

@@ -6,10 +6,21 @@ describe DPL::Provider::GAE do
     described_class.new(DummyContext.new, project: 'test')
   end
 
+
   describe '#push_app' do
     example 'with defaults' do
-      allow(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::GCLOUD} --quiet --verbosity \"warning\" --project \"test\" app deploy \"app.yaml\" --promote").and_return(true)
+      expect(provider.context.env).to receive(:[]).with('HOME').and_return('/home/travis')
+      allow(provider.context).to receive(:shell).with("bash -c 'source /home/travis/virtualenv/python2.7/bin/activate; #{DPL::Provider::GAE::GCLOUD} --quiet --verbosity \"warning\" --project \"test\" app deploy \"app.yaml\" --promote'").and_return(true)
       provider.push_app
     end
   end
+
+
+  describe '#with_python_2_7' do
+    example 'with apostrophe' do
+      expect(provider.context.env).to receive(:[]).with('HOME').and_return('/home/travis')
+      allow(provider.context).to receive(:shell).with("bash -c 'source /home/travis/virtualenv/python2.7/bin/activate; python -c '\\''import sys; print(sys.version)'\\'''").and_return(true)
+      provider.with_python_2_7("python -c 'import sys; print(sys.version)'")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.30.travis.1873.3
+  version: 1.8.30.travis.1881.3
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec