vx-builder 0.5.32 → 0.5.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc542262d0b9336fffc1b5bc3cba362a2dfe1e34
-  data.tar.gz: b6fd1b0a1a4ef02d3fcaf203182c478cee7ffd16
+  metadata.gz: 8c8bf242e425aa036a5eecf24ddb68b1d0c39522
+  data.tar.gz: 83a4b1b6c6a2fdc43aebbc1d845d21940125c421
 SHA512:
-  metadata.gz: 5bccbc9c11d6fa14c8451a7c43a8ff47fccbe2ace1bfd18dafb2d39d70706b2df29e44bc705a17493c202a0f82925495aa6b95e1e209d6ec6345e1894c230047
-  data.tar.gz: ef860fc85a85fd569cc977b7f9c86c0852d791eac121dc060783c1cfd4cfe90900d62beffd64d55cc250c60769ddd81ef4b7ee09ccdd3c0c127cb58956fa8386
+  metadata.gz: 184323fddd1e623e42c6f41353744cb7d1101b18c0133018d4e9a47a24ee073fa3b31693b0f6e467a7d5475c9a09b87bbbf7f2eb72e90523f410ebf4ffe908ab
+  data.tar.gz: 5fe7e5893ad722a5cad9dd816cf6c10913cfeb167d165cb721ecd4417c2cd1f1a61e01e582b541f7200d8659a14e7224099009c76c76bd0287ad49cfbd846a6e

data/lib/vx/builder/script_builder/python.rb

@@ -5,6 +5,7 @@ module Vx
       class Python < Base
 
         DEFAULT_PYTHON = '2.7'
+        VIRTUALENV_ROOT = "~/.python-virtualenv"
 
         def call(env)
           if enabled?(env)
@@ -17,8 +18,9 @@ module Vx
               i << "export TRAVIS_PYTHON_VERSION=#{py_v}" # for tornado
             end
 
-            do_cache_key(env) do |i|
-              i << "python-#{py_v}"
+            do_before_install(env) do |i|
+              i << trace_sh_command("virtualenv #{VIRTUALENV_ROOT}")
+              i << trace_sh_command("source #{VIRTUALENV_ROOT}/bin/activate")
             end
 
             do_announce(env) do |i|
@@ -27,9 +29,9 @@ module Vx
             end
 
             do_install(env) do |i|
-              i << "if [ -f Requirements.txt ] ; then \n #{trace_sh_command "sudo pip install -r Requirements.txt"}\nfi"
-              i << "if [ -f requirements.txt ] ; then \n #{trace_sh_command "sudo pip install -r requirements.txt"}\nfi"
-              i << "if [ -f setup.py ] ; then \n #{trace_sh_command "sudo python setup.py install"}\nfi"
+              i << "if [ -f Requirements.txt ] ; then \n #{trace_sh_command "pip install -r Requirements.txt"}\nfi"
+              i << "if [ -f requirements.txt ] ; then \n #{trace_sh_command "pip install -r requirements.txt"}\nfi"
+              i << "if [ -f setup.py ] ; then \n #{trace_sh_command "python setup.py install"}\nfi"
             end
 
             do_script(env) do |i|
@@ -44,6 +46,14 @@ module Vx
 EOF
               i << script
             end
+
+            do_cache_key(env) do |i|
+              i << "python-#{py_v}"
+            end
+
+            do_cached_directories(env) do |i|
+              i << VIRTUALENV_ROOT
+            end
           end
 
           app.call(env)

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.32"
+    VERSION = "0.5.33"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.32
+  version: 0.5.33
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common