vx-builder 0.5.61 → 0.5.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76650145ebc75debb2b2ac541e2ee3997a72e844
-  data.tar.gz: 31eddffa0f442106ddcca5c6b7b50403e5b02dcb
+  metadata.gz: 276cdf41dcc654abb5ca5a3cafe61137e23a7695
+  data.tar.gz: c46def4d917dfc8f405df3037c7883912316e069
 SHA512:
-  metadata.gz: 6022f3b6f5746d4e0afb6786d25f4f273a02b4a5bb66d8f601a922994000bed474d7881c56c71518341245a96f42d0fd0151af2cbb944c406767a67024a6a474
-  data.tar.gz: ada9d2c483b2722c013bd65b5c42c1e02b558ccb86a944804d4b4290d4ba6e93f7323977d78ac084ebcf376ee42b4ae31659863d5d6735ead8f72c3c38d592ad
+  metadata.gz: 62617292288176935b4f53a490659bda82439d97163f0a72eef966616dfe3444d87b7f1fcaccbdeb37c8210ad1f01ac4199ef6fc4965ade1d227c2b0b7738068
+  data.tar.gz: d7e34b6f1e83b6ae2d6a8ed435510c5ab55b7a01ba00a7bf6556e9b52c82e942a1c76bd08a591e4fd050fcb8566afd98d3dadf470dff9345123debf726dbc870

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

@@ -9,9 +9,8 @@ module Vx
         def call(env)
 
           env.stage("clone").tap do |e|
-            e.add_var "ssh_key", env.task.deploy_key
+            e.add_task "ssh_agent", "key" => env.task.ssh_keys
 
-            e.add_task "ssh_agent", "key" => "$ssh_key"
             clone = {}
             clone["repo"] = env.task.src
             clone["dest"] = "~/#{env.task.name}"

data/lib/vx/builder/task.rb

@@ -2,7 +2,7 @@ module Vx
   module Builder
     class Task
 
-      attr_reader :name, :src, :sha, :deploy_key, :branch, :pull_request_id,
+      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
 
@@ -12,7 +12,7 @@ module Vx
         @sha                  = options[:sha]
         @job_id               = options[:job_id]
         @build_id             = options[:build_id]
-        @deploy_key           = options[:deploy_key]
+        @ssh_keys             = options[:ssh_keys]
         @branch               = options[:branch]
         @pull_request_id      = options[:pull_request_id]
         @cache_url_prefix     = options[:cache_url_prefix]
@@ -27,7 +27,7 @@ module Vx
       private
 
         def validate!
-          (name && src && sha && deploy_key && branch && job_id && build_id &&
+          (name && src && sha && ssh_keys && branch && job_id && build_id &&
             build_number && job_number && project_host) or
             raise(MissingKeys)
         end

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.61"
+    VERSION = "0.5.62"
   end
 end

data/lib/vx/builder.rb

@@ -8,7 +8,6 @@ module Vx
     autoload :BuildConfiguration, File.expand_path("../builder/build_configuration", __FILE__)
     autoload :MatrixBuilder,      File.expand_path("../builder/matrix_builder",      __FILE__)
     autoload :DeployBuilder,      File.expand_path("../builder/deploy_builder",      __FILE__)
-    autoload :ScriptBuilder,      File.expand_path("../builder/script_builder",      __FILE__)
     autoload :ScriptBuilderV2,    File.expand_path("../builder/script_builder_v2",   __FILE__)
 
     module Helper
@@ -42,10 +41,6 @@ module Vx
       DeployBuilder.new(matrix_builder, options)
     end
 
-    def script(task, build_configuration)
-      ScriptBuilder.new task, build_configuration
-    end
-
     def script_v2(task, build_configuration)
       ScriptBuilderV2.new task, build_configuration
     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 LS0tCi0gbmFtZTogY2xvbmUKICB2YXJzOgogICAgc3NoX2tleTogfAogICAgICAtLS0tLUJFR0lOIFJTQSBQUklWQVRFIEtFWS0tLS0tCiAgICAgIE1JSUVwQUlCQUFLQ0FRRUFwTWthbSttaHdDZENRZHF0dTdVOXA1VlJGbWtyYmk5SGFBM3ZhZ3BoTXZ5cnlXcXgKICAgICAgQzlzWSthbjhqQ05SVXBlbHlqSjhmNmI2L1Y1aDRXY25sd3BPdlZHR25zNEhPYm5Zajg5R0tvQkYrUXBUMjhtcAogICAgICBDTWkwa3pITlNXTVJaZy9kOXgzQWYyY0RJZ0poZ0dLZEtMaE9iK1NKMmlSektBNnl3bXlOVHJVQjR0SmhwZ0ovCiAgICAgIFBBMWxHbFlYa0dhZDJLUkFmZzdtVGN1UXJxTEo0cWkyWGRnQUhjdElTTjl3VWRiRTF4NUhGUHl6dWt3S3VCQUUKICAgICAgaDdtNlZWckp6c2tLTnJCc3VPVlNadVE2cnY5VGlxV1hWcEFYZ3JXdkt6dGxmM1NOQXR0bUFCYjVkMnVQT2EyKwogICAgICByZUNXRXpIYldPRmdNUURRc1hzUzNycUMzZnp3NFZNS1JRd1hJUUlEQVFBQkFvSUJBRGdaT3BUUGtjQmYzUitjCiAgICAgIE9iOEljWWZtdm1jNXdJNVBUQ2p4YllzVkk0Zi9HdUNFRU9mdlcrNUszMjQ1NjhxSlUraWxEVnRMMW5DQlBDTkgKICAgICAgUWVRYW56bTJVblVud0svM1EvR1paOUs2UHBnTTJ3V2MvbzI5L2pPS0pkQVJDUEJOQUl6TE5TaHFRbGZHcGJqVwogICAgICBXWmh1UGsyN2FPNjVyL1o0SW9Vci9XTkpIZTVBa3Y1Rk1mc2VBWit6bEFIQTMyUXFOZ2dPZWl0NjVHaW8yY0l1CiAgICAgIFlES0k1TnIxaWlTcTNKTWZFWnZtYy81UWVkVTlVN0RJZU5Xd2ppOHBHekZrRjh4aHU2RXk5aHBHUjJVN2dFcVIKICAgICAgK2R5U253aTgrcWFzcG9mOHJndUdlU1VaVm1vVEdtZllVRW56MVpwSlZhUWlBQmthVlh3QURhaGh2ZTh0ZDFUcgogICAgICA3aDFiK1EwQ2dZRUExdkRwN09rbFd5dkZpZVBZdTRybG5talZLTnY2a2JVVUx0T2l4OXlLV2JBcFk2bGpwWWhTCiAgICAgIHlpZ2lxVjZqaVZvckMxQ2xjWFBXcFdzSG9zZCtwNkRSYWEwTWlxRDJXSlBTWG5kQ29tR1JzT3JDZU83RHJMV2wKICAgICAgVUNSSGwxT2xjUkhjdXhTcVZESCtDQ3FXK05DNEp4VUtjMjJPekkra2FLVHJ1ajNzOVhrZWZJTUNnWUVBeEVONgogICAgICBCN3hBTlk5Y2ViMVhvZXYzWjdBV0loTFBROEdQWjNLU1NtejFaZHAxMU1Ob3V4UkpCekRTNGs2NFF2Mm40NEpQCiAgICAgIFUra2JYU2p2bkN5SVRDalRldkRJc0t4SHRPMHdPTEV3QjVMQ0J6cEpURXNqd0daY1RQMEFPdjZkcXdKd0xQcG0KICAgICAgeXNpVHJMRkJINVNkVnNUTXQ4VUpGeFozM3NEV0hadlNvMHAyMUlzQ2dZQjY4OHJNazcyanZwRThSSkxwRFJZMgogICAgICBuSDg2NVVNYmNIc0FJbDRlZCtESVYwWUYxWkxEMFF5U3lZeXlXQW15ZTFyZUdSN2FuRW52ekI3TkZkTTByb0M4CiAgICAgIE01cFYvcWVNbWRxZjRSYkQ3bzQ1cHNEaURxcnVNK1pCeHM4UkdHOHVFK3F4TmF3Tmg1OXFLbnE4RUNFWGNpak4KICAgICAgU0tHRUVMTWFqU1N2SDlkWndCUVpZd0tCZ1FDY0JoaUk5YnNGMlVabThZTXRFbTNJWEUvOEhuL3ZHWDFyZThXWQogICAgICByUzRaSHFiMTBiTDhwbyszeTdTYWZJSTNuM2RNZ2xlV0dZYkxkTE9uc0M5YWZFcERQaEFOZzZndHlUSEFuL3ZTCiAgICAgIHlYUytValBiRnhFQTcxOEpSVWhkbmZTeDhtcERGMzJJVUJRMkFXUUlPeGtwMWFINXBnWW4rSkNxNFJwV3gzMlkKICAgICAgbXFZRktRS0JnUUNiRXN2WWxmZVdKRGkrQ0JIK3poZmtmV0lZOVNpeXVIRVVRYTRoTmJhUy9Ea0RNZ3FONThDdQogICAgICA4Z1hHU2Z0RWlUY0xhdDBhMFA2dmVhY2dQS3VoQUhlMUs3aDg0K1IwckUvY3YxUVRCcFczOFJRZ2FiTHMrZXh5CiAgICAgIGp5RjVSMU5ISS9MWHNEQk5haVIwNXNyWGRpU1p1bUwwYXdYN3JpQzREeklrNlpaWVJkYm5iUT09CiAgICAgIC0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCiAgdGFza3M6CiAgLSBzc2hfYWdlbnQ6CiAgICAgIGtleTogIiRzc2hfa2V5IgogIC0gZ2l0X2Nsb25lOgogICAgICByZXBvOiBnaXRAZ2l0aHViLmNvbTp2ZXhvci92eC10ZXN0LXJlcG8uZ2l0CiAgICAgIGRlc3Q6ICJ+L3ZleG9yL3Z4LXRlc3QtcmVwbyIKICAgICAgYnJhbmNoOiB0ZXN0L3B1bGwtcmVxdWVzdAogICAgICBzaGE6IDhmNTNjMDc3MDcyNjc0OTcyZTIxYzgyYTI4NmFjYzA3ZmFkYTkxZjUKLSBuYW1lOiBpbml0CiAgY2hkaXI6ICJ+L3ZleG9yL3Z4LXRlc3QtcmVwbyIKICBlbnZpcm9ubWVudDoKICAgIENJOiAnMScKICAgIENJX0pPQl9JRDogMQogICAgQ0lfSk9CX05VTUJFUjogMTAwCiAgICBDSV9CVUlMRF9JRDogMTIKICAgIENJX0JVSUxEX05VTUJFUjogMTAxCiAgICBDSV9QUk9KRUNUX05BTUU6IHZleG9yL3Z4LXRlc3QtcmVwbwogICAgQ0lfQlVJTERfU0hBOiA4ZjUzYzA3NzA3MjY3NDk3MmUyMWM4MmEyODZhY2MwN2ZhZGE5MWY1CiAgICBDSV9CUkFOQ0g6IHRlc3QvcHVsbC1yZXF1ZXN0CiAgICBESVNQTEFZOiAiOjk5IgogICAgQ0lfUEFSQUxMRUxfSk9CUzogMwogICAgQ0lfUEFSQUxMRUxfSk9CX05VTUJFUjogMAogICAgZ2xvYmFsOiAnJwogICAgbWF0cml4OiAnJwogICAgUkFJTFNfRU5WOiB0ZXN0CiAgICBSQUNLX0VOVjogdGVzdAogICAgR0VNX0hPTUU6ICJ+Ly5ydWJ5Z2VtcyIKICAgIFRSQVZJU19QWVRIT05fVkVSU0lPTjogcHlfdmVyc2lvbgogIHRhc2tzOgogIC0gc2VydmljZXM6CiAgICAtIHJhYmJpdG1xLXNlcnZlcgogIC0gY2FjaGVfZmV0Y2g6CiAgICAgIHVybDoKICAgICAgLSBodHRwOi8vbG9jYWxob3N0OjMwMDEvdGVzdC9wdWxsLXJlcXVlc3Qvc2NhbGEtMi4xMC4zLXJ2bS0yLjAuMC1nZW1maWxlLW5vZGVqcy0wLjEwLXJ1c3QtMC4xMS4wLXB5dGhvbi0yLjcudGd6CiAgICAgIC0gaHR0cDovL2xvY2FsaG9zdDozMDAxL21hc3Rlci9zY2FsYS0yLjEwLjMtcnZtLTIuMC4wLWdlbWZpbGUtbm9kZWpzLTAuMTAtcnVzdC0wLjExLjAtcHl0aG9uLTIuNy50Z3oKICAtIGNhY2hlX2FkZDoKICAgICAgZGlyOgogICAgICAtICJ+Ly5jYWNoZSIKICAgICAgLSAifi8uc2J0IgogICAgICAtICJ+Ly5pdnkyIgogICAgICAtICJ+Ly5ydWJ5Z2VtcyIKICAgICAgLSBub2RlX21vZHVsZXMKICAgICAgLSBib3dlcl9jb21wb25lbnRzCiAgICAgIC0gIn4vLnBpcC1kb3dubG9hZHMiCi0gbmFtZTogYmVmb3JlX2luc3RhbGwKICB0YXNrczoKICAtIHNoZWxsOiBlY2hvIGJlZm9yZV9pbnN0YWxsCi0gbmFtZTogaW5zdGFsbAogIGVudmlyb25tZW50OgogICAgUEFUSDogIiR7UEFUSH06JHtQV0R9L25vZGVfbW9kdWxlcy9iaW4iCiAgdGFza3M6CiAgLSBzY2FsYToKICAgICAgYWN0aW9uOiBpbnN0YWxsCiAgICAgIHNjYWxhOiAyLjEwLjMKICAtIHJ1Ynk6CiAgICAgIGFjdGlvbjogaW5zdGFsbAogICAgICBydWJ5OiAyLjAuMAogIC0gcnVieTogYW5ub3VuY2UKICAtIHZ4dm06IG5vZGVqcyAwLjEwCiAgLSBzaGVsbDogbnBtIGNvbmZpZyBzZXQgc3BpbiBmYWxzZQogIC0gc2hlbGw6IG5vZGUgLS12ZXJzaW9uCiAgLSBzaGVsbDogbnBtIC0tdmVyc2lvbgogIC0gdnh2bTogcnVzdCAwLjExLjAKICAtIHNoZWxsOiBydXN0YyAtLXZlcnNpb24KICAtIHB5dGhvbjoKICAgICAgYWN0aW9uOiBpbnN0YWxsCiAgICAgIHB5dGhvbjogJzIuNycKICAtIHB5dGhvbjogdmlydHVhbGVudgogIC0gcHl0aG9uOiBhbm5vdW5jZQogIC0gc2hlbGw6IGVjaG8gaW5zdGFsbAotIG5hbWU6IGRhdGFiYXNlCiAgdGFza3M6CiAgLSBydWJ5OiByYWlsczpkYXRhYmFzZQotIG5hbWU6IGJlZm9yZV9zY3JpcHQKICB0YXNrczoKICAtIHNoZWxsOiBlY2hvIGJlZm9yZV9zY3JpcHQKLSBuYW1lOiBzY3JpcHQKICB0YXNrczoKICAtIHNoZWxsOiBSQUlMU19FTlY9dGVzdCBscyAtMSAmJiBlY2hvIERPTkUhCi0gbmFtZTogYWZ0ZXJfc3VjY2VzcwogIHRhc2tzOgogIC0gc2hlbGw6IGVjaG8gYWZ0ZXIgc3VjY2VzcwotIG5hbWU6IHRlYXJkb3duCiAgdGFza3M6CiAgLSBjYWNoZV9wdXNoOgogICAgICB1cmw6IGh0dHA6Ly9sb2NhbGhvc3Q6MzAwMS90ZXN0L3B1bGwtcmVxdWVzdC9zY2FsYS0yLjEwLjMtcnZtLTIuMC4wLWdlbWZpbGUtbm9kZWpzLTAuMTAtcnVzdC0wLjExLjAtcHl0aG9uLTIuNy50Z3oK \
+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
 \
   | base64 --decode | ~/citool/bin/vx-citool -
 
 exit $?

data/spec/fixtures/script_builder_v2/simple.yml

@@ -1,37 +1,92 @@
 ---
 - name: clone
-  vars:
-    ssh_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-----
   tasks:
   - ssh_agent:
-      key: "$ssh_key"
+      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"

data/spec/fixtures/test_key1

@@ -0,0 +1,27 @@
+-----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-----

data/spec/fixtures/test_key2

@@ -0,0 +1,27 @@
+-----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-----

data/spec/lib/builder/task_spec.rb

@@ -8,7 +8,7 @@ describe Vx::Builder::Task do
   context "just created" do
     its(:name)            { should eq 'vexor/vx-test-repo' }
     its(:sha)             { should eq '8f53c077072674972e21c82a286acc07fada91f5' }
-    its(:deploy_key)      { should be }
+    its(:ssh_keys)        { should be }
     its(:cache_url_prefix){ should eq 'http://localhost:3001' }
     its(:job_id)          { should eq 1 }
     its(:build_id)        { should eq 12 }

data/spec/support/create.rb

@@ -10,7 +10,9 @@ def create(name, options = {})
       name:             'vexor/vx-test-repo',
       src:              "git@github.com:vexor/vx-test-repo.git",
       sha:              options[:sha] || "8f53c077072674972e21c82a286acc07fada91f5",
-      deploy_key:       fixture("vx_test_repo_insecure_key"),
+      ssh_keys:         [fixture("vx_test_repo_insecure_key"),
+                         fixture("test_key1"),
+                         fixture("test_key2")],
       branch:           options[:branch] || "test/pull-request",
       cache_url_prefix: "http://localhost:3001",
       pull_request_id:  options[:pull_request_id],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.61
+  version: 0.5.62
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -145,24 +145,6 @@ files:
 - lib/vx/builder/helper/trace_sh_command.rb
 - lib/vx/builder/helper/vxvm_install.rb
 - lib/vx/builder/matrix_builder.rb
-- lib/vx/builder/script_builder.rb
-- lib/vx/builder/script_builder/base.rb
-- lib/vx/builder/script_builder/cache.rb
-- lib/vx/builder/script_builder/clojure.rb
-- lib/vx/builder/script_builder/defaults.rb
-- lib/vx/builder/script_builder/deploy.rb
-- lib/vx/builder/script_builder/env.rb
-- lib/vx/builder/script_builder/go.rb
-- lib/vx/builder/script_builder/java.rb
-- lib/vx/builder/script_builder/nodejs.rb
-- lib/vx/builder/script_builder/parallel.rb
-- lib/vx/builder/script_builder/prepare.rb
-- lib/vx/builder/script_builder/python.rb
-- lib/vx/builder/script_builder/ruby.rb
-- lib/vx/builder/script_builder/rust.rb
-- lib/vx/builder/script_builder/scala.rb
-- lib/vx/builder/script_builder/services.rb
-- lib/vx/builder/script_builder/timeouts.rb
 - lib/vx/builder/script_builder_v2.rb
 - lib/vx/builder/script_builder_v2/base.rb
 - lib/vx/builder/script_builder_v2/cache.rb
@@ -210,6 +192,8 @@ files:
 - spec/fixtures/script_builder_v2/simple.sh
 - spec/fixtures/script_builder_v2/simple.yml
 - spec/fixtures/simple.yml
+- spec/fixtures/test_key1
+- spec/fixtures/test_key2
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
@@ -232,15 +216,6 @@ files:
 - spec/lib/builder/configuration_spec.rb
 - spec/lib/builder/deploy_builder_spec.rb
 - spec/lib/builder/matrix_builder_spec.rb
-- spec/lib/builder/script_builder/cache_spec.rb
-- spec/lib/builder/script_builder/clojure_spec.rb
-- spec/lib/builder/script_builder/env_spec.rb
-- spec/lib/builder/script_builder/java_spec.rb
-- spec/lib/builder/script_builder/prepare_spec.rb
-- spec/lib/builder/script_builder/python_spec.rb
-- spec/lib/builder/script_builder/ruby_spec.rb
-- spec/lib/builder/script_builder/scala_spec.rb
-- spec/lib/builder/script_builder_spec.rb
 - spec/lib/builder/script_builder_v2_spec.rb
 - spec/lib/builder/task_spec.rb
 - spec/lib/builder_spec.rb
@@ -301,6 +276,8 @@ test_files:
 - spec/fixtures/script_builder_v2/simple.sh
 - spec/fixtures/script_builder_v2/simple.yml
 - spec/fixtures/simple.yml
+- spec/fixtures/test_key1
+- spec/fixtures/test_key2
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
@@ -323,15 +300,6 @@ test_files:
 - spec/lib/builder/configuration_spec.rb
 - spec/lib/builder/deploy_builder_spec.rb
 - spec/lib/builder/matrix_builder_spec.rb
-- spec/lib/builder/script_builder/cache_spec.rb
-- spec/lib/builder/script_builder/clojure_spec.rb
-- spec/lib/builder/script_builder/env_spec.rb
-- spec/lib/builder/script_builder/java_spec.rb
-- spec/lib/builder/script_builder/prepare_spec.rb
-- spec/lib/builder/script_builder/python_spec.rb
-- spec/lib/builder/script_builder/ruby_spec.rb
-- spec/lib/builder/script_builder/scala_spec.rb
-- spec/lib/builder/script_builder_spec.rb
 - spec/lib/builder/script_builder_v2_spec.rb
 - spec/lib/builder/task_spec.rb
 - spec/lib/builder_spec.rb

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

@@ -1,77 +0,0 @@
-module Vx
-  module Builder
-    class ScriptBuilder
-
-      Base = Struct.new(:app) do
-
-        include Helper::TraceShCommand
-        include Common::Helper::UploadShCommand
-        include Helper::VxvmInstall
-
-        def do_cache_key(env)
-          yield env.cache_key
-        end
-
-        def do_script(env)
-          if env.source.script.empty? && !env.source.deploy_modules?
-            yield env.script
-          end
-        end
-
-        def do_cached_directories(env)
-          if env.source.cached_directories != false
-            yield env.cached_directories
-          end
-        end
-
-        def do_init(env)
-          yield env.init
-        end
-
-        def do_announce(env)
-          yield env.announce
-        end
-
-        def do_before_install(env)
-          yield env.before_install
-        end
-
-        def do_install(env)
-          if env.source.install.empty?
-            yield env.install
-          end
-        end
-
-        def do_before_script(env)
-          if env.source.before_script.empty? && !deploy?(env)
-            yield env.before_script
-          end
-        end
-
-        def do_deploy_script(env)
-          if deploy?(env)
-            yield env.script
-          end
-        end
-
-        def do_before_deploy(env)
-          if deploy?(env)
-            yield env.before_script
-          end
-        end
-
-        def do_after_deploy(env)
-          if deploy?(env)
-            yield env.after_success
-          end
-        end
-
-        def deploy?(env)
-          env.source.deploy_modules?
-        end
-
-      end
-
-    end
-  end
-end

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

@@ -1,95 +0,0 @@
-module Vx
-  module Builder
-    class ScriptBuilder
-
-      class Cache < Base
-
-        include Helper::Config
-
-        CASHER_URL = "https://raw.githubusercontent.com/dima-exe/casher/master/bin/casher"
-        CASHER_BIN = "$HOME/.casher/bin/casher"
-
-        def call(env)
-          rs = app.call env
-
-          if env.task.cache_url_prefix && enabled?(env)
-
-            assign_url_to_env(env)
-            prepare(env)
-            fetch(env)
-            add(env)
-            push(env)
-          end
-
-          rs
-        end
-
-        private
-
-          def enabled?(env)
-            env.source.cache.enabled? && !env.cached_directories.empty?
-          end
-
-          def casher_cmd
-            "test -f #{CASHER_BIN} && #{config.casher_ruby} #{CASHER_BIN}"
-          end
-
-          def assign_url_to_env(env)
-            urls   = []
-            branch = env.task.branch
-            if branch != 'master'
-              urls << url_for(env, branch)
-            end
-            urls << url_for(env, 'master')
-
-            env.cache_fetch_url = urls
-            env.cache_push_url  = url_for(env, branch)
-            env
-          end
-
-          def url_for(env, branch)
-            name = branch
-
-            key =
-              if env.cache_key.empty?
-                "cache"
-              else
-                env.cache_key.join("-").downcase.gsub(/[^a-z0-9_\-.]/, '-')
-              end
-
-            "#{env.task.cache_url_prefix}/#{name}/#{key}.tgz"
-          end
-
-          def prepare(env)
-            cmd = %{
-              export CASHER_DIR=$HOME/.casher &&
-              ( mkdir -p $CASHER_DIR/bin &&
-                /usr/bin/curl #{CASHER_URL} --tcp-nodelay --retry 3 --fail --silent --show-error -o #{CASHER_BIN} &&
-                chmod +x #{CASHER_BIN} ) ||
-              true
-            }.gsub(/\n/, ' ').gsub(/ +/, ' ')
-            env.init << cmd
-          end
-
-          def fetch(env)
-            urls = env.cache_fetch_url.join(" ")
-            env.init << "#{casher_cmd} fetch #{urls} || true"
-          end
-
-          def add(env)
-            env.cached_directories.each do |d|
-              env.init << "#{casher_cmd} add #{d} || true"
-            end
-            env.init << "unset CASHER_DIR"
-          end
-
-          def push(env)
-            if env.cache_push_url && !deploy?(env)
-              env.after_script << "#{casher_cmd} push #{env.cache_push_url}"
-            end
-          end
-
-      end
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-module Vx
-  module Builder
-    class ScriptBuilder
-
-      class Clojure < Base
-
-        def call(env)
-          if enabled?(env)
-            do_announce(env) do |i|
-              i << trace_sh_command("lein version")
-            end
-
-            do_install(env) do |i|
-              i << trace_sh_command("lein deps")
-            end
-
-            do_script(env) do |i|
-              i << trace_sh_command("lein test")
-            end
-          end
-
-          app.call(env)
-        end
-
-        private
-
-          def enabled?(env)
-            env.source.language == 'clojure'
-          end
-
-      end
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-module Vx
-  module Builder
-    class ScriptBuilder
-
-      class Defaults < Base
-
-        def call(env)
-          env.source.before_install.each do |c|
-            env.before_install << trace_sh_command(c)
-          end
-
-          env.source.install.each do |c|
-            env.install << trace_sh_command(c)
-          end
-
-          env.source.before_script.each do |c|
-            env.before_script << trace_sh_command(c)
-          end
-
-          env.source.script.each do |c|
-            env.script << trace_sh_command(c)
-          end
-
-          env.source.after_success.each do |c|
-            env.after_success << trace_sh_command(c)
-          end
-
-          app.call env
-        end
-
-      end
-    end
-  end
-end