vx-builder 0.5.63 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9912af828ec46ec4f3497a6ebb7dc4d6b5814d2
-  data.tar.gz: 65a82851754e50452ac46b9de7e939801b247b72
+  metadata.gz: 9f6d28bd483799857d4da81a17615d136cbc6e3d
+  data.tar.gz: 91a0cb6651413827c40b6cef392f20f055c59dd4
 SHA512:
-  metadata.gz: 8d988ef41bff1f865ab81fe8c0994fe3ab74d1744e473c5637ea3da9ab20a441832d6c591d645839eccd5aba005d573c1cf3a7773fa2ef52463067ed45c2eadc
-  data.tar.gz: de7304226f18ea0098aee7141b1d91560c4afe820d57701a351784a3f17f9591d36886445bc1a89afd867249e690cf46f616845c0b7fd37ab1866aa3095fc880
+  metadata.gz: 109388549f3832dbc250e9acf46472882aec8b9825d159d4705190cde6bb44e9f36ab4fec59b942d25fb993a6e23c8ac180d773aef867ace3090f673d231d521
+  data.tar.gz: 87e2676cfe2f700a868df887de7b85345d5974649f4d4ccb7fc208a523fa9dafbe2ad9127db05444a50e8199b9c0a37ff22b47054452c6ce3c11ab388faf4de7

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

@@ -9,10 +9,10 @@ module Vx
         def call(env)
           rs = app.call env
 
-          if env.task.cache_url_prefix && enabled?(env)
-            env.stage("init").add_task "cache_fetch",    "url" => cache_fetch_urls(env)
-            env.stage("init").add_task "cache_add",      "dir" => cache_directories(env)
-            env.stage("teardown").add_task "cache_push", "url" => cache_push_url(env)
+          if env.task.cache_read_url && env.task.cache_write_url && enabled?(env)
+            env.stage("init").add_task     "cache_fetch", "url" => cache_fetch_urls(env)
+            env.stage("init").add_task     "cache_add",   "dir" => cache_directories(env)
+            env.stage("teardown").add_task "cache_push",  "url" => cache_push_url(env)
           end
 
           rs
@@ -29,21 +29,21 @@ module Vx
           end
 
           def cache_push_url(env)
-            url_for(env, env.task.branch)
+            url_for(env, env.task.branch, 'w')
           end
 
           def cache_fetch_urls(env)
             urls   = []
             branch = env.task.branch
             if branch != 'master'
-              urls << url_for(env, branch)
+              urls << url_for(env, branch, 'r')
             end
-            urls << url_for(env, 'master')
+            urls << url_for(env, 'master', 'r')
 
             urls
           end
 
-          def url_for(env, branch)
+          def url_for(env, branch, mode)
             name = branch
 
             key =
@@ -53,7 +53,15 @@ module Vx
                 env.cache_key.join("-").downcase.gsub(/[^a-z0-9_\-.]/, '-')
               end
 
-            "#{env.task.cache_url_prefix}/#{name}/#{key}.tgz"
+            prefix =
+              case mode
+              when 'r'
+                env.task.cache_read_url
+              when 'w'
+                env.task.cache_write_url
+              end
+
+            "#{prefix}?file_name=#{name}/#{key}.tgz"
           end
 
       end

data/lib/vx/builder/task.rb

@@ -3,8 +3,9 @@ module Vx
     class Task
 
       attr_reader :name, :src, :sha, :ssh_keys, :branch, :pull_request_id,
-        :cache_url_prefix, :job_id, :build_id, :build_number, :job_number,
-        :project_host, :project_token
+        :job_id, :build_id, :build_number, :job_number,
+        :project_host, :project_token,
+        :cache_read_url, :cache_write_url
 
       def initialize(options = {})
         @name                 = options[:name]
@@ -15,11 +16,12 @@ module Vx
         @ssh_keys             = options[:ssh_keys]
         @branch               = options[:branch]
         @pull_request_id      = options[:pull_request_id]
-        @cache_url_prefix     = options[:cache_url_prefix]
         @build_number         = options[:build_number]
         @job_number           = options[:job_number]
         @project_host         = options[:project_host]
         @project_token        = options[:project_token]
+        @cache_read_url       = options[:cache_read_url]
+        @cache_write_url      = options[:cache_write_url]
 
         validate!
       end

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.63"
+    VERSION = "0.6.0"
   end
 end

data/spec/fixtures/script_builder_v2/simple.sh

@@ -21,7 +21,7 @@ git clone -q --depth=1 --branch=master https://github.com/vexor/vx-citool.git ~/
 
 
 
-echo ---
- name: clone
  tasks:
  - ssh_agent:
      deploy_key:
      - |
        -----BEGIN RSA PRIVATE KEY-----
        MIIEpAIBAAKCAQEApMkam+mhwCdCQdqtu7U9p5VRFmkrbi9HaA3vagphMvyryWqx
        C9sY+an8jCNRUpelyjJ8f6b6/V5h4WcnlwpOvVGGns4HObnYj89GKoBF+QpT28mp
        CMi0kzHNSWMRZg/d9x3Af2cDIgJhgGKdKLhOb+SJ2iRzKA6ywmyNTrUB4tJhpgJ/
        PA1lGlYXkGad2KRAfg7mTcuQrqLJ4qi2XdgAHctISN9wUdbE1x5HFPyzukwKuBAE
        h7m6VVrJzskKNrBsuOVSZuQ6rv9TiqWXVpAXgrWvKztlf3SNAttmABb5d2uPOa2+
        reCWEzHbWOFgMQDQsXsS3rqC3fzw4VMKRQwXIQIDAQABAoIBADgZOpTPkcBf3R+c
        Ob8IcYfmvmc5wI5PTCjxbYsVI4f/GuCEEOfvW+5K324568qJU+ilDVtL1nCBPCNH
        QeQanzm2UnUnwK/3Q/GZZ9K6PpgM2wWc/o29/jOKJdARCPBNAIzLNShqQlfGpbjW
        WZhuPk27aO65r/Z4IoUr/WNJHe5Akv5FMfseAZ+zlAHA32QqNggOeit65Gio2cIu
        YDKI5Nr1iiSq3JMfEZvmc/5QedU9U7DIeNWwji8pGzFkF8xhu6Ey9hpGR2U7gEqR
        +dySnwi8+qaspof8rguGeSUZVmoTGmfYUEnz1ZpJVaQiABkaVXwADahhve8td1Tr
        7h1b+Q0CgYEA1vDp7OklWyvFiePYu4rlnmjVKNv6kbUULtOix9yKWbApY6ljpYhS
        yigiqV6jiVorC1ClcXPWpWsHosd+p6DRaa0MiqD2WJPSXndComGRsOrCeO7DrLWl
        UCRHl1OlcRHcuxSqVDH+CCqW+NC4JxUKc22OzI+kaKTruj3s9XkefIMCgYEAxEN6
        B7xANY9ceb1Xoev3Z7AWIhLPQ8GPZ3KSSmz1Zdp11MNouxRJBzDS4k64Qv2n44JP
        U+kbXSjvnCyITCjTevDIsKxHtO0wOLEwB5LCBzpJTEsjwGZcTP0AOv6dqwJwLPpm
        ysiTrLFBH5SdVsTMt8UJFxZ33sDWHZvSo0p21IsCgYB688rMk72jvpE8RJLpDRY2
        nH865UMbcHsAIl4ed+DIV0YF1ZLD0QySyYyyWAmye1reGR7anEnvzB7NFdM0roC8
        M5pV/qeMmdqf4RbD7o45psDiDqruM+ZBxs8RGG8uE+qxNawNh59qKnq8ECEXcijN
        SKGEELMajSSvH9dZwBQZYwKBgQCcBhiI9bsF2UZm8YMtEm3IXE/8Hn/vGX1re8WY
        rS4ZHqb10bL8po+3y7SafII3n3dMgleWGYbLdLOnsC9afEpDPhANg6gtyTHAn/vS
        yXS+UjPbFxEA718JRUhdnfSx8mpDF32IUBQ2AWQIOxkp1aH5pgYn+JCq4RpWx32Y
        mqYFKQKBgQCbEsvYlfeWJDi+CBH+zhfkfWIY9SiyuHEUQa4hNbaS/DkDMgqN58Cu
        8gXGSftEiTcLat0a0P6veacgPKuhAHe1K7h84+R0rE/cv1QTBpW38RQgabLs+exy
        jyF5R1NHI/LXsDBNaiR05srXdiSZumL0awX7riC4DzIk6ZZYRdbnbQ==
        -----END RSA PRIVATE KEY-----
      - |
        -----BEGIN RSA PRIVATE KEY-----
        MIIEoQIBAAKCAQEAp+sIWk/X62Aa7FueZOJzXjRLRypKAmUC+wLLv2RsJTqFtLOr
        pFUfOcDuXYCPWcgxcbRDzt9LfTbOd51QIn9BzKytnlECWWeQs0/by25K7bLVJYh8
        VNmFohziPcl8GL+g0PPwfyZaaLeSXiIqYJ3/Cwy9CW7xog8XoWmW81nwiXaiIcpE
        Uktq48VRbGlzYiWaMy2St48uRaDKFatDkrchStkAktSf0bofiN5XFRiNfQ5pt0Ee
        5s3TXGhMYzPSO1ml88bxBDCkvJ8VciATLNSZ8KTYvbJGrgPbvGyclW1v9SBBcMXr
        WhZPL75h24zUKwtmgK0fvz13/bvXdxPlOYo/lwIDAQABAoIBAQCDgmidSpEBb9hG
        Ko8H1e6i5fPa/XzPGUtXSV5HPCASnB3hYyHXZy84bSiCJFCg8VAADD1bBLi7jTPw
        rEz5Z48h/E9RgYKEgL7sIGw0i+G0/e0/IwC091NYnqR13ZoKS/JoE9TT0DbYcoT4
        omtsFfGMNuLKQ5CM6qMIMIkfd94R2YnabnZ8o6OV6tevr3m3PZWXD9B9F8dIfNYL
        ycYJ/eQQ+J98u8UqUUOOugjn4NSC/ktdO2fAPbSH3+XK8W75Cnuh2Y/dbjTraIjp
        Me5nvQa8cPHNSonCCeqBodnDLpIJJ3AIbQmeqUrUMWxU7bypTvoD4HoNPFiih2C7
        +xciYDFRAoGBANMobQ+aMOPLU0EK/JwyCTjLULQgx0eioK+vXbBBlrpIHAaWW/Bj
        oQMBTPCIkBUrl2gn85NcmgBt4FaFevIEsQoQxlgnMvwj73lvQ1fLJCkJjmxlrM0v
        gGbKtiUhaao3TJsjwuvlDmR2qQnrWeT95Qo6Jb4N8jU9jCiQeMXWA1s/AoGBAMuT
        4RWPmTUWDKM2tdZmu97n+6KrB4BUQ94L1A7IJY3nqCu7Ja065yanjPkwzpL7o4OP
        R3SMdF63ldKb/nvM2pJWuCX0DF2HkPBbukOzOtST/sutGog4Q66pzKJ4qBQrGS0c
        s4E8mzgUJCi9FJYsAm2O8Rb6tHSZA2vzOHTvKz2pAoGAYaUWGdrxtMU3cKKGAizZ
        Otw6K7HktWms6NEtf+40p1vlKd6qEVXhBSS60Zg1GLUZxN6EsqZlyMEGtrvvCK/G
        tqLfNbCa0SJFAWDEQXr888UpiVLTP+cxd1dSN4Vl+YKs+CjnYHKB309ICAA/h7cp
        DTuqbGLCmIAnqjJ0xveagb0CgYAEh2uwgRtVdQIe926gMHTphpuwiMGH91fzLqwv
        EADV4Vt6bZVu/yp5T6zxNkbCOlru6FccnqtQGCF7KAFHW81ZCBjcr0s/IW72CfRg
        4THj3M8EVPuMIERRNHHbA3gpyrOqr0LHE0QYwUn0phA5Lw12xoFSk41EMstCsYyF
        /XQm0QJ/SQ6hJvNQ0kr4Zr8Lhf5xMUbXQeikvPWSPRdDd54HADV5TUTG7JMf5AxI
        k0yYH3JOcEvztiJdb3cY6qdVWZTQsk3CB2wySISpGBxZAjiByNgKyl1r/UL1lynP
        7NGrsaLVbdyfyZFD3Z1axRuI3FfGmb2exBdmEucyhmxw8G78xg==
        -----END RSA PRIVATE KEY-----
      - |
        -----BEGIN RSA PRIVATE KEY-----
        MIIEpAIBAAKCAQEA76I+E6u+JdTu8+X4Z2D+38WS/Cn84Ki6cJcTVui+tabkauf3
        /XKbXCxJhdPm7nwDrho1G/Xb9v7xB6sJ1aHqWmVmPz1kVf+EnyxEKuRqDMhNppMB
        NBpycMUD0mhOTCV7z3UUEKO6qktz3qva2exBBpHiGhoxeJWXq4OkqGj5KJ3UGewW
        Jqdq+qr2bsp2VqYk4QLVUKT0J0eMH2CU4AEND0YpOpxrD7AOj/JsigLvf/+n+Mv+
        1ioubRzstNTEfxW+Xr9HHJUlPfvUFaTNCrMPYSF+4cKiTNmIggZkHbbRqiCnuPlU
        fxCqkpygWrjyriGemLOCfDT0SxFsQTqr7hIGUwIDAQABAoIBAHQ7Ubjg2L4o5i5P
        IYmjNnz7rCu7gfjGXog1/x9sjPQ3GxvvoA3DBTBUGuVavux2IqLT+2awfhzz051Q
        jNieTLnD7TBHat97rKw4IGhdmkLQ9TkSnMbU/SVNqmjoRvIQTFl4BF99yxDGwFEF
        MoX5XiD9qZnXkp9Wj9aVZ8x3/kKAOxNZ0k0sf0fKPOpbLk/ylXLDk3GypPmJFlCK
        1glsUhwjLylF0ivJIARl2RhQwXoexYaD8lrEsRULEMyHoLZX/mKbrhsvUyX4c9E1
        wtc5ZD8tzdS6EsTjKj5WoNqzHEZLTmMVYFRNz80IeEHL21V23nNxspGP+drS9mtn
        naPjvsECgYEA+jpz6xKqWUwSNNqQCQAtlQv+1N1iAEemR0lK6/TYqPthpqpWELK1
        CEDyGk36tLrtwCnsz7sDFYkr02LzV6sNXaxlXBPZjd85BKs1yJfW1dxu5FsS6UZ8
        bJpSFo4s1/JbofFMVWuU21vP5IHJcbpuad9VPNB1TnmCVntVVdZZHKkCgYEA9Sk7
        HEza2tH8rS7iUWpvoKL63hm5QEAHMX6+qbCK5z89z63GPqWQJGI3t14AnN5jP0oT
        hhe2rHIx7f799MkCksy/5meOuz7XOBiREQlDR5dM7hE8sVWPmCweWyThcXGct9Yk
        ORQ1EWPEegyjHdpUkEnHoELPHWeJukSTJsZvzJsCgYEA7VWjvMLnb+sHGbp0AxV4
        JnZKLfwMh9dtjw+lUEfbd+t2o23MU+osareu6eQsdl8WQb2CL0Vhl3uTZdvkkrJa
        6w4o1Ty+jCG9IwCA8tGRoyaAx3baaQfB3ABC+8G+JtRotSD5FcwEVEqw1DuFpaj+
        MMzzO8s8eEInrX8tYUz9GIECgYAj01+g9hYxTehXwncuIJipZ8ezNx0cJ38lm3jv
        QS47NsGonKNQuk8DEhtEP4dlZRYpxIBv4v092/4x4kZoRAuNOkB8wftYn4lB2E0y
        qSDc0F5cl8Y/v9oZCbFx7kTHmCunrbJjaPGMVgD7OOeJUEN1RmLWp4yuple5EZZT
        X0ItKwKBgQDbags/0GaJasfG4gNTp0vpRzXeGhCNsVPm72VNodv5fAZGU6Vgfjpy
        0QlsHl7c148fkvjj3TxriqRWmEosI9vjVptTYjcctBDhhk+gD4ufokqhhtckbfRk
        EQeydeybKLW49Mewm42mjJMm+CAIpO+TVFYR+/UZxBZN3WhKePOXiA==
        -----END RSA PRIVATE KEY-----
  - git_clone:
      repo: git@github.com:vexor/vx-test-repo.git
      dest: "~/vexor/vx-test-repo"
      branch: test/pull-request
      sha: 8f53c077072674972e21c82a286acc07fada91f5
- name: init
  chdir: "~/vexor/vx-test-repo"
  environment:
    CI: '1'
    CI_JOB_ID: 1
    CI_JOB_NUMBER: 100
    CI_BUILD_ID: 12
    CI_BUILD_NUMBER: 101
    CI_PROJECT_NAME: vexor/vx-test-repo
    CI_BUILD_SHA: 8f53c077072674972e21c82a286acc07fada91f5
    CI_BRANCH: test/pull-request
    DISPLAY: ":99"
    CI_PARALLEL_JOBS: 3
    CI_PARALLEL_JOB_NUMBER: 0
    global: ''
    matrix: ''
    RAILS_ENV: test
    RACK_ENV: test
    GEM_HOME: "~/.rubygems"
    TRAVIS_PYTHON_VERSION: py_version
  tasks:
  - services:
    - rabbitmq-server
  - cache_fetch:
      url:
      - http://localhost:3001/test/pull-request/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
      - http://localhost:3001/master/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
  - cache_add:
      dir:
      - "~/.cache"
      - "~/.sbt"
      - "~/.ivy2"
      - "~/.rubygems"
      - node_modules
      - bower_components
      - "~/.pip-downloads"
- name: before_install
  tasks:
  - shell: echo before_install
- name: install
  environment:
    PATH: "${PATH}:${PWD}/node_modules/bin"
  tasks:
  - scala:
      action: install
      scala: 2.10.3
  - ruby:
      action: install
      ruby: 2.0.0
  - ruby: announce
  - vxvm: nodejs 0.10
  - shell: npm config set spin false
  - shell: node --version
  - shell: npm --version
  - vxvm: rust 0.11.0
  - shell: rustc --version
  - python:
      action: install
      python: '2.7'
  - python: virtualenv
  - python: announce
  - shell: echo install
- name: database
  tasks:
  - ruby: rails:database
- name: before_script
  tasks:
  - shell: echo before_script
- name: script
  tasks:
  - shell: RAILS_ENV=test ls -1 && echo DONE!
- name: after_success
  tasks:
  - shell: echo after success
- name: teardown
  tasks:
  - cache_push:
      url: http://localhost:3001/test/pull-request/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
 \
+echo ---
- name: clone
  tasks:
  - ssh_agent:
      key:
      - |
        -----BEGIN RSA PRIVATE KEY-----
        MIIEpAIBAAKCAQEApMkam+mhwCdCQdqtu7U9p5VRFmkrbi9HaA3vagphMvyryWqx
        C9sY+an8jCNRUpelyjJ8f6b6/V5h4WcnlwpOvVGGns4HObnYj89GKoBF+QpT28mp
        CMi0kzHNSWMRZg/d9x3Af2cDIgJhgGKdKLhOb+SJ2iRzKA6ywmyNTrUB4tJhpgJ/
        PA1lGlYXkGad2KRAfg7mTcuQrqLJ4qi2XdgAHctISN9wUdbE1x5HFPyzukwKuBAE
        h7m6VVrJzskKNrBsuOVSZuQ6rv9TiqWXVpAXgrWvKztlf3SNAttmABb5d2uPOa2+
        reCWEzHbWOFgMQDQsXsS3rqC3fzw4VMKRQwXIQIDAQABAoIBADgZOpTPkcBf3R+c
        Ob8IcYfmvmc5wI5PTCjxbYsVI4f/GuCEEOfvW+5K324568qJU+ilDVtL1nCBPCNH
        QeQanzm2UnUnwK/3Q/GZZ9K6PpgM2wWc/o29/jOKJdARCPBNAIzLNShqQlfGpbjW
        WZhuPk27aO65r/Z4IoUr/WNJHe5Akv5FMfseAZ+zlAHA32QqNggOeit65Gio2cIu
        YDKI5Nr1iiSq3JMfEZvmc/5QedU9U7DIeNWwji8pGzFkF8xhu6Ey9hpGR2U7gEqR
        +dySnwi8+qaspof8rguGeSUZVmoTGmfYUEnz1ZpJVaQiABkaVXwADahhve8td1Tr
        7h1b+Q0CgYEA1vDp7OklWyvFiePYu4rlnmjVKNv6kbUULtOix9yKWbApY6ljpYhS
        yigiqV6jiVorC1ClcXPWpWsHosd+p6DRaa0MiqD2WJPSXndComGRsOrCeO7DrLWl
        UCRHl1OlcRHcuxSqVDH+CCqW+NC4JxUKc22OzI+kaKTruj3s9XkefIMCgYEAxEN6
        B7xANY9ceb1Xoev3Z7AWIhLPQ8GPZ3KSSmz1Zdp11MNouxRJBzDS4k64Qv2n44JP
        U+kbXSjvnCyITCjTevDIsKxHtO0wOLEwB5LCBzpJTEsjwGZcTP0AOv6dqwJwLPpm
        ysiTrLFBH5SdVsTMt8UJFxZ33sDWHZvSo0p21IsCgYB688rMk72jvpE8RJLpDRY2
        nH865UMbcHsAIl4ed+DIV0YF1ZLD0QySyYyyWAmye1reGR7anEnvzB7NFdM0roC8
        M5pV/qeMmdqf4RbD7o45psDiDqruM+ZBxs8RGG8uE+qxNawNh59qKnq8ECEXcijN
        SKGEELMajSSvH9dZwBQZYwKBgQCcBhiI9bsF2UZm8YMtEm3IXE/8Hn/vGX1re8WY
        rS4ZHqb10bL8po+3y7SafII3n3dMgleWGYbLdLOnsC9afEpDPhANg6gtyTHAn/vS
        yXS+UjPbFxEA718JRUhdnfSx8mpDF32IUBQ2AWQIOxkp1aH5pgYn+JCq4RpWx32Y
        mqYFKQKBgQCbEsvYlfeWJDi+CBH+zhfkfWIY9SiyuHEUQa4hNbaS/DkDMgqN58Cu
        8gXGSftEiTcLat0a0P6veacgPKuhAHe1K7h84+R0rE/cv1QTBpW38RQgabLs+exy
        jyF5R1NHI/LXsDBNaiR05srXdiSZumL0awX7riC4DzIk6ZZYRdbnbQ==
        -----END RSA PRIVATE KEY-----
      - |
        -----BEGIN RSA PRIVATE KEY-----
        MIIEoQIBAAKCAQEAp+sIWk/X62Aa7FueZOJzXjRLRypKAmUC+wLLv2RsJTqFtLOr
        pFUfOcDuXYCPWcgxcbRDzt9LfTbOd51QIn9BzKytnlECWWeQs0/by25K7bLVJYh8
        VNmFohziPcl8GL+g0PPwfyZaaLeSXiIqYJ3/Cwy9CW7xog8XoWmW81nwiXaiIcpE
        Uktq48VRbGlzYiWaMy2St48uRaDKFatDkrchStkAktSf0bofiN5XFRiNfQ5pt0Ee
        5s3TXGhMYzPSO1ml88bxBDCkvJ8VciATLNSZ8KTYvbJGrgPbvGyclW1v9SBBcMXr
        WhZPL75h24zUKwtmgK0fvz13/bvXdxPlOYo/lwIDAQABAoIBAQCDgmidSpEBb9hG
        Ko8H1e6i5fPa/XzPGUtXSV5HPCASnB3hYyHXZy84bSiCJFCg8VAADD1bBLi7jTPw
        rEz5Z48h/E9RgYKEgL7sIGw0i+G0/e0/IwC091NYnqR13ZoKS/JoE9TT0DbYcoT4
        omtsFfGMNuLKQ5CM6qMIMIkfd94R2YnabnZ8o6OV6tevr3m3PZWXD9B9F8dIfNYL
        ycYJ/eQQ+J98u8UqUUOOugjn4NSC/ktdO2fAPbSH3+XK8W75Cnuh2Y/dbjTraIjp
        Me5nvQa8cPHNSonCCeqBodnDLpIJJ3AIbQmeqUrUMWxU7bypTvoD4HoNPFiih2C7
        +xciYDFRAoGBANMobQ+aMOPLU0EK/JwyCTjLULQgx0eioK+vXbBBlrpIHAaWW/Bj
        oQMBTPCIkBUrl2gn85NcmgBt4FaFevIEsQoQxlgnMvwj73lvQ1fLJCkJjmxlrM0v
        gGbKtiUhaao3TJsjwuvlDmR2qQnrWeT95Qo6Jb4N8jU9jCiQeMXWA1s/AoGBAMuT
        4RWPmTUWDKM2tdZmu97n+6KrB4BUQ94L1A7IJY3nqCu7Ja065yanjPkwzpL7o4OP
        R3SMdF63ldKb/nvM2pJWuCX0DF2HkPBbukOzOtST/sutGog4Q66pzKJ4qBQrGS0c
        s4E8mzgUJCi9FJYsAm2O8Rb6tHSZA2vzOHTvKz2pAoGAYaUWGdrxtMU3cKKGAizZ
        Otw6K7HktWms6NEtf+40p1vlKd6qEVXhBSS60Zg1GLUZxN6EsqZlyMEGtrvvCK/G
        tqLfNbCa0SJFAWDEQXr888UpiVLTP+cxd1dSN4Vl+YKs+CjnYHKB309ICAA/h7cp
        DTuqbGLCmIAnqjJ0xveagb0CgYAEh2uwgRtVdQIe926gMHTphpuwiMGH91fzLqwv
        EADV4Vt6bZVu/yp5T6zxNkbCOlru6FccnqtQGCF7KAFHW81ZCBjcr0s/IW72CfRg
        4THj3M8EVPuMIERRNHHbA3gpyrOqr0LHE0QYwUn0phA5Lw12xoFSk41EMstCsYyF
        /XQm0QJ/SQ6hJvNQ0kr4Zr8Lhf5xMUbXQeikvPWSPRdDd54HADV5TUTG7JMf5AxI
        k0yYH3JOcEvztiJdb3cY6qdVWZTQsk3CB2wySISpGBxZAjiByNgKyl1r/UL1lynP
        7NGrsaLVbdyfyZFD3Z1axRuI3FfGmb2exBdmEucyhmxw8G78xg==
        -----END RSA PRIVATE KEY-----
      - |
        -----BEGIN RSA PRIVATE KEY-----
        MIIEpAIBAAKCAQEA76I+E6u+JdTu8+X4Z2D+38WS/Cn84Ki6cJcTVui+tabkauf3
        /XKbXCxJhdPm7nwDrho1G/Xb9v7xB6sJ1aHqWmVmPz1kVf+EnyxEKuRqDMhNppMB
        NBpycMUD0mhOTCV7z3UUEKO6qktz3qva2exBBpHiGhoxeJWXq4OkqGj5KJ3UGewW
        Jqdq+qr2bsp2VqYk4QLVUKT0J0eMH2CU4AEND0YpOpxrD7AOj/JsigLvf/+n+Mv+
        1ioubRzstNTEfxW+Xr9HHJUlPfvUFaTNCrMPYSF+4cKiTNmIggZkHbbRqiCnuPlU
        fxCqkpygWrjyriGemLOCfDT0SxFsQTqr7hIGUwIDAQABAoIBAHQ7Ubjg2L4o5i5P
        IYmjNnz7rCu7gfjGXog1/x9sjPQ3GxvvoA3DBTBUGuVavux2IqLT+2awfhzz051Q
        jNieTLnD7TBHat97rKw4IGhdmkLQ9TkSnMbU/SVNqmjoRvIQTFl4BF99yxDGwFEF
        MoX5XiD9qZnXkp9Wj9aVZ8x3/kKAOxNZ0k0sf0fKPOpbLk/ylXLDk3GypPmJFlCK
        1glsUhwjLylF0ivJIARl2RhQwXoexYaD8lrEsRULEMyHoLZX/mKbrhsvUyX4c9E1
        wtc5ZD8tzdS6EsTjKj5WoNqzHEZLTmMVYFRNz80IeEHL21V23nNxspGP+drS9mtn
        naPjvsECgYEA+jpz6xKqWUwSNNqQCQAtlQv+1N1iAEemR0lK6/TYqPthpqpWELK1
        CEDyGk36tLrtwCnsz7sDFYkr02LzV6sNXaxlXBPZjd85BKs1yJfW1dxu5FsS6UZ8
        bJpSFo4s1/JbofFMVWuU21vP5IHJcbpuad9VPNB1TnmCVntVVdZZHKkCgYEA9Sk7
        HEza2tH8rS7iUWpvoKL63hm5QEAHMX6+qbCK5z89z63GPqWQJGI3t14AnN5jP0oT
        hhe2rHIx7f799MkCksy/5meOuz7XOBiREQlDR5dM7hE8sVWPmCweWyThcXGct9Yk
        ORQ1EWPEegyjHdpUkEnHoELPHWeJukSTJsZvzJsCgYEA7VWjvMLnb+sHGbp0AxV4
        JnZKLfwMh9dtjw+lUEfbd+t2o23MU+osareu6eQsdl8WQb2CL0Vhl3uTZdvkkrJa
        6w4o1Ty+jCG9IwCA8tGRoyaAx3baaQfB3ABC+8G+JtRotSD5FcwEVEqw1DuFpaj+
        MMzzO8s8eEInrX8tYUz9GIECgYAj01+g9hYxTehXwncuIJipZ8ezNx0cJ38lm3jv
        QS47NsGonKNQuk8DEhtEP4dlZRYpxIBv4v092/4x4kZoRAuNOkB8wftYn4lB2E0y
        qSDc0F5cl8Y/v9oZCbFx7kTHmCunrbJjaPGMVgD7OOeJUEN1RmLWp4yuple5EZZT
        X0ItKwKBgQDbags/0GaJasfG4gNTp0vpRzXeGhCNsVPm72VNodv5fAZGU6Vgfjpy
        0QlsHl7c148fkvjj3TxriqRWmEosI9vjVptTYjcctBDhhk+gD4ufokqhhtckbfRk
        EQeydeybKLW49Mewm42mjJMm+CAIpO+TVFYR+/UZxBZN3WhKePOXiA==
        -----END RSA PRIVATE KEY-----
  - git_clone:
      repo: git@github.com:vexor/vx-test-repo.git
      dest: "~/vexor/vx-test-repo"
      branch: test/pull-request
      sha: 8f53c077072674972e21c82a286acc07fada91f5
- name: init
  chdir: "~/vexor/vx-test-repo"
  environment:
    CI: '1'
    CI_JOB_ID: 1
    CI_JOB_NUMBER: 100
    CI_BUILD_ID: 12
    CI_BUILD_NUMBER: 101
    CI_PROJECT_NAME: vexor/vx-test-repo
    CI_BUILD_SHA: 8f53c077072674972e21c82a286acc07fada91f5
    CI_BRANCH: test/pull-request
    DISPLAY: ":99"
    CI_PARALLEL_JOBS: 3
    CI_PARALLEL_JOB_NUMBER: 0
    global: ''
    matrix: ''
    RAILS_ENV: test
    RACK_ENV: test
    GEM_HOME: "~/.rubygems"
    TRAVIS_PYTHON_VERSION: py_version
  tasks:
  - services:
    - rabbitmq-server
  - cache_fetch:
      url:
      - http://localhost:3001/read?file_name=test/pull-request/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
      - http://localhost:3001/read?file_name=master/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
  - cache_add:
      dir:
      - "~/.cache"
      - "~/.sbt"
      - "~/.ivy2"
      - "~/.rubygems"
      - node_modules
      - bower_components
      - "~/.pip-downloads"
- name: before_install
  tasks:
  - shell: echo before_install
- name: install
  environment:
    PATH: "${PATH}:${PWD}/node_modules/bin"
  tasks:
  - scala:
      action: install
      scala: 2.10.3
  - ruby:
      action: install
      ruby: 2.0.0
  - ruby: announce
  - vxvm: nodejs 0.10
  - shell: npm config set spin false
  - shell: node --version
  - shell: npm --version
  - vxvm: rust 0.11.0
  - shell: rustc --version
  - python:
      action: install
      python: '2.7'
  - python: virtualenv
  - python: announce
  - shell: echo install
- name: database
  tasks:
  - ruby: rails:database
- name: before_script
  tasks:
  - shell: echo before_script
- name: script
  tasks:
  - shell: RAILS_ENV=test ls -1 && echo DONE!
- name: after_success
  tasks:
  - shell: echo after success
- name: teardown
  tasks:
  - cache_push:
      url: http://localhost:3001/write?file_name=test/pull-request/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
 \
   | base64 --decode | ~/citool/bin/vx-citool -
 
 exit $?

data/spec/fixtures/script_builder_v2/simple.yml

@@ -2,7 +2,7 @@
 - name: clone
   tasks:
   - ssh_agent:
-      deploy_key:
+      key:
       - |
         -----BEGIN RSA PRIVATE KEY-----
         MIIEpAIBAAKCAQEApMkam+mhwCdCQdqtu7U9p5VRFmkrbi9HaA3vagphMvyryWqx
@@ -117,8 +117,8 @@
     - rabbitmq-server
   - cache_fetch:
       url:
-      - http://localhost:3001/test/pull-request/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
-      - http://localhost:3001/master/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
+      - http://localhost:3001/read?file_name=test/pull-request/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
+      - http://localhost:3001/read?file_name=master/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
   - cache_add:
       dir:
       - "~/.cache"
@@ -169,4 +169,4 @@
 - name: teardown
   tasks:
   - cache_push:
-      url: http://localhost:3001/test/pull-request/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz
+      url: http://localhost:3001/write?file_name=test/pull-request/scala-2.10.3-rvm-2.0.0-gemfile-nodejs-0.10-rust-0.11.0-python-2.7.tgz

data/spec/lib/builder/task_spec.rb

@@ -9,7 +9,8 @@ describe Vx::Builder::Task do
     its(:name)            { should eq 'vexor/vx-test-repo' }
     its(:sha)             { should eq '8f53c077072674972e21c82a286acc07fada91f5' }
     its(:ssh_keys)        { should be }
-    its(:cache_url_prefix){ should eq 'http://localhost:3001' }
+    its(:cache_read_url)  { should eq 'http://localhost:3001/read' }
+    its(:cache_write_url) { should eq 'http://localhost:3001/write' }
     its(:job_id)          { should eq 1 }
     its(:build_id)        { should eq 12 }
     its(:pull_request_id) { should eq 1 }

data/spec/support/create.rb

@@ -14,7 +14,8 @@ def create(name, options = {})
                          fixture("test_key1"),
                          fixture("test_key2")],
       branch:           options[:branch] || "test/pull-request",
-      cache_url_prefix: "http://localhost:3001",
+      cache_read_url:   "http://localhost:3001/read",
+      cache_write_url:  "http://localhost:3001/write",
       pull_request_id:  options[:pull_request_id],
       job_number:       100,
       build_number:     101,

metadata

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