vx-builder 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eaaf487acad50dc8c616d760ed325170492061d
-  data.tar.gz: f317d311216f6bfb8a289792439f1745efabf063
+  metadata.gz: 854113ca611fe901b98e1687bf2c5785e99cfae7
+  data.tar.gz: b029abf417eee984ed25138cbdd7e3be80449bba
 SHA512:
-  metadata.gz: 0bb1117eeed192aa0fa61c594aed41507cf2bb966dedbf22c6e2c0f5c741fdd608c655ac28975c4acda207295415bdff5f82d40b9d456d7dd5d92c2e3adcbb60
-  data.tar.gz: 563ff1f61f7a520e460e00afceeeb94fee9894a40a2e0acbe09de5fada9c820b845690881b0d0472ce253a06b77ffb7da2e48dfec8e9348b82c1ba6ac5b4a254
+  metadata.gz: 16012ee643268da656ed034422a8d3b399930ad0f625b8af50ab3a4466ccbb8d9eeab6e891b9db1201e4531c1caf7e315c1547803de4205ff5a7c247382462e9
+  data.tar.gz: b99fb162e766a033e7ffed578072be402694fd41412fd63b1912498bf76c864dbbd8287847f28753e0f4b9918cc663ca03c43082c69b96db4b4a7361fcba1351

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

@@ -5,8 +5,8 @@ module Vx
       class Python < Base
 
         DEFAULT_PYTHON = '2.7'
-        PIP_DOWNLOADS = "~/.pip-downloads"
-        PIP_OPTS = " --download-cache=#{PIP_DOWNLOADS}"
+        PIP_DOWNLOADS  = "~/.pip-downloads"
+        PIP_OPTS       = " --download-cache=#{PIP_DOWNLOADS}"
 
         def call(env)
           if enabled?(env)
@@ -26,7 +26,7 @@ module Vx
             end
 
             env.stage("install").tap do |i|
-              i.add_task "python", "action" => "install", "python" => DEFAULT_PYTHON
+              i.add_task "python", "action" => "install", "python" => py_version
               i.add_task "python", "virtualenv"
               i.add_task "python", "announce"
 
@@ -64,7 +64,7 @@ module Vx
 
           def python_version(env)
             v = env.source.python.first
-            v || DEFAULT_PYTHON
+            (v || DEFAULT_PYTHON).to_s
           end
 
       end

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

data/spec/integration/script_builder_v2/python_spec.rb

@@ -18,8 +18,27 @@ describe "(integration v2) python" do
     config = Vx::Builder::BuildConfiguration.from_yaml(file)
     matrix = Vx::Builder.matrix config
     options[:task] ||= create(:task)
-    script = Vx::Builder.script_v2(options[:task], matrix.build.first)
-    OpenStruct.new script: script, matrix: matrix
+    scripts = matrix.build.map do |b|
+      Vx::Builder.script_v2(options[:task], b)
+    end
+    OpenStruct.new scripts: scripts, matrix: matrix
+  end
+
+  it "should successfuly generate scripts" do
+    file =<<-EOF
+      python:
+      - 2.7
+      - 3.4
+      install: pip install flake8
+      script:
+      - flake8 --max-line-length=120 .
+      - py.test -v
+    EOF
+    task = create(:task, sha: "HEAD")
+    b = build(file, task: task)
+    one_script, two_script = b.scripts
+    expect(one_script.to_yaml).to match(/python: '2\.7'/)
+    expect(two_script.to_yaml).to match(/python: '3\.4'/)
   end
 
   it "should succesfuly run lang/python", real: true do
@@ -34,7 +53,7 @@ describe "(integration v2) python" do
     Dir.chdir(path) do
       File.open("script.sh", "w") do |io|
         io.write "set -e\n"
-        io.write b.script.to_script
+        io.write b.scripts.first.to_script
       end
       system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
       expect($?.to_i).to eq 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common