vx-builder 0.4.0 → 0.5.0

data/spec/support/create.rb

@@ -7,11 +7,11 @@ def create(name, options = {})
     Vx::Builder::Task.new(
       job_id:           1,
       build_id:         12,
-      name:             'project/name',
-      src:              "git@github.com:dima-exe/ci-worker-test-repo.git",
-      sha:              "b665f90239563c030f1b280a434b3d84daeda1bd",
-      deploy_key:       fixture("insecure_private_key"),
-      branch:           "master",
+      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"),
+      branch:           options[:branch] || "test/pull-request",
       cache_url_prefix: "http://example.com",
       pull_request_id:  options[:pull_request_id],
       job_number:       100,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -134,6 +134,7 @@ files:
 - lib/vx/builder/deploy_builder.rb
 - lib/vx/builder/helper/config.rb
 - 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
@@ -152,15 +153,14 @@ files:
 - lib/vx/builder/task.rb
 - lib/vx/builder/version.rb
 - spec/fixtures/clojure.yml
-- spec/fixtures/insecure_private_key
 - spec/fixtures/integration/go/language/after_script.sh
 - spec/fixtures/integration/go/language/before_script.sh
 - spec/fixtures/integration/go/language/config.yml
 - spec/fixtures/integration/go/language/script.sh
+- spec/fixtures/integration/ruby/deploy/after_script.sh
+- spec/fixtures/integration/ruby/deploy/before_script.sh
 - spec/fixtures/integration/ruby/deploy/config.yml
-- spec/fixtures/integration/ruby/deploy/d.after_script.sh
-- spec/fixtures/integration/ruby/deploy/d.before_script.sh
-- spec/fixtures/integration/ruby/deploy/d.script.sh
+- spec/fixtures/integration/ruby/deploy/script.sh
 - spec/fixtures/integration/ruby/language/after_script.sh
 - spec/fixtures/integration/ruby/language/before_script.sh
 - spec/fixtures/integration/ruby/language/config.yml
@@ -180,6 +180,9 @@ files:
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
+- spec/fixtures/vx_test_repo_insecure_key
+- spec/fixtures/vx_test_repo_insecure_key.pub
+- spec/integration/clojure_spec.rb
 - spec/integration/go_spec.rb
 - spec/integration/ruby_spec.rb
 - spec/lib/builder/build_configuration/cache_spec.rb
@@ -232,15 +235,14 @@ specification_version: 4
 summary: Write a gem summary
 test_files:
 - spec/fixtures/clojure.yml
-- spec/fixtures/insecure_private_key
 - spec/fixtures/integration/go/language/after_script.sh
 - spec/fixtures/integration/go/language/before_script.sh
 - spec/fixtures/integration/go/language/config.yml
 - spec/fixtures/integration/go/language/script.sh
+- spec/fixtures/integration/ruby/deploy/after_script.sh
+- spec/fixtures/integration/ruby/deploy/before_script.sh
 - spec/fixtures/integration/ruby/deploy/config.yml
-- spec/fixtures/integration/ruby/deploy/d.after_script.sh
-- spec/fixtures/integration/ruby/deploy/d.before_script.sh
-- spec/fixtures/integration/ruby/deploy/d.script.sh
+- spec/fixtures/integration/ruby/deploy/script.sh
 - spec/fixtures/integration/ruby/language/after_script.sh
 - spec/fixtures/integration/ruby/language/before_script.sh
 - spec/fixtures/integration/ruby/language/config.yml
@@ -260,6 +262,9 @@ test_files:
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
+- spec/fixtures/vx_test_repo_insecure_key
+- spec/fixtures/vx_test_repo_insecure_key.pub
+- spec/integration/clojure_spec.rb
 - spec/integration/go_spec.rb
 - spec/integration/ruby_spec.rb
 - spec/lib/builder/build_configuration/cache_spec.rb

data/spec/fixtures/insecure_private_key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAveiqzr0nxJA48fk/T7qFrODmdT94lvt7ontGLhqNT7Z+GbqL
-t45F4/5BxNgyMbSQfaJw1sGMunQfjKRdWfuKUQp0y6bNhAjtnCnoVel3SMBaXE2r
-896GkhNXc1/lz1v/1T8blc/chVeKZvQT+hDvC/KECF/+vd7yL6NRloayZdv0ks7z
-CwoIeeTfEu2hd3rXDELgoiM+AAEciYe08VuytFjbONy28Ey3SGHURN418FJrJHDs
-7B5x3P89glkSta1TY4JOQtoWuxza7ylS8G1k+ss+TDB+ET3sqjDe1mxosRAfqSA7
-apEZK3ALbZru3nYd26x+CE84dvH7GiKoBl0TSQIDAQABAoIBAEEAgnaBCDufod4x
-EhqYHWkvEbLQJtaG/ap/x2XAcN33+PGViH0rlYCUZq6Z0ZRx2YMnNrhLR4AKf0IE
-gG9sScuzaIbMcUvgQnRRY9UENHASZttxOooegLE/LY+wI1j2hHrZPvfoTfLWI+lZ
-Yf0WDrxoJgk30lnrFbp4jFSZhjaWmsm1XQ4htt9bfGOBle/gJ6UTr32wF0EyOpv4
-erci1RSUzyDWz0q7Tjaq6SHlwQ2JwcLG0vnrZq+YnMJUwjLhC4JAMZEKF/61KnsM
-zwR9nuOE2ZDI1xH5xAA+0pNkwzxWcqryoKBrOMatDa+7ZOJEobOiq+glqmoprov4
-gXXR2IECgYEA+wP1SZM7E0WntQyPgRiZ7D9TSioV+x51RPw9Puw8KG3TuGOLqaMz
-rMwscbToejiZFSv2lHGDbSfWsw76MYj+vK3RF5ed8Mxy3gSfVFxVzSD50efpJcVq
-kV6n/ua3AJYGVbneaj56BljxHbxVvcyXXFGnaml8ICPJ2jyR8RE1848CgYEAwa4S
-jgnmReY+Tuu7U0xd6Oo0X9tjkqkyyGq+stQ3I2OfYzmtQveFlWsfecnbCmEMylLy
-nGVxYSiRNcigMoZ7eurgdmGD/O4mDG80Dy4PJ7lF8/8Xx701V7YjgGnII2/Vwp1k
-vlR9xTJ5lVpANXqSYq1kwyeSPn1KLKt0E42VP6cCgYEA2l4OJCyOJuzgwbMkoET7
-mrdYSNul9akAkbvxt+yhRPaOSglndXMBwGB6hYzA9ZqJKg7t2yOJFwuiTnFIHJG2
-MgPwM1r1zoa9owFYbnZJOkNmsUHT5MUCOWakNS8Wos7gwfEJWVnyo9T6JUkzOgNi
-5bAvOXZ8wiUAM/efapzzV2cCgYBbKtY/F/fV1VBlE9+EkUDvPzdSG9IeGhj2cBC9
-2tjthppjOaYODLdLozYYvOSnWRGNN0hOSA37nv3jZEHMJrN/I4pvDu3zJCKy3bGS
-p6qolzSPavdFpRGz7N9/Ncvoql7jkfT3BoyBQ4YpwGbTBZRccKQqnLjhQ1aj+jzU
-a2PipwKBgQCCLuOrhO37UovMnmNrRzXnwu9C+VCB4oGf6QtjEehMx/J+6ehvSYub
-lLOxeZQHzVkC3I6rVMbK1qx0t8Qnb+5jHRAkR4x/JaTojpZYqngdLrtY4/qLKJq7
-4aOLYjJyL3YB09g3r68wcnTUHbcZYj+Q7xT1Y/ntXNp3pdbYc47NUQ==
------END RSA PRIVATE KEY-----

data/spec/fixtures/integration/ruby/deploy/d.after_script.sh

@@ -1,14 +0,0 @@
-
-# after script init
-export CI=1
-export CI_JOB_ID=1
-export CI_JOB_NUMBER=100
-export CI_BUILD_ID=12
-export CI_BUILD_NUMBER=101
-export CI_PROJECT_NAME=project/name
-export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
-export CI_BRANCH=master
-export VX_ROOT=$(pwd)
-cd ${VX_ROOT}/code/project/name
-
-# after script

data/spec/fixtures/integration/ruby/deploy/d.before_script.sh

@@ -1,69 +0,0 @@
-
-# init
-set -e
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-export LC_ALL=en_US.UTF8
-export DEBIAN_FRONTEND=noninteractive
-export CI=1
-export CI_JOB_ID=1
-export CI_JOB_NUMBER=100
-export CI_BUILD_ID=12
-export CI_BUILD_NUMBER=101
-export CI_PROJECT_NAME=project/name
-export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
-export CI_BRANCH=master
-echo \$\ export\ FOO
-export FOO
-export VX_ROOT=$(pwd)
-export PATH=$VX_ROOT/bin:$PATH
-mkdir -p $VX_ROOT/bin
-mkdir -p ${VX_ROOT}/data/project/name
-mkdir -p ${VX_ROOT}/code/project/name
-(echo LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBdmVpcXpyMG54SkE0OGZrL1Q3cUZyT0RtZFQ5NGx2dDdvbnRHTGhxTlQ3WitHYnFMCnQ0NUY0LzVCeE5neU1iU1FmYUp3MXNHTXVuUWZqS1JkV2Z1S1VRcDB5NmJOaEFqdG5Dbm9WZWwzU01CYVhFMnIKODk2R2toTlhjMS9sejF2LzFUOGJsYy9jaFZlS1p2UVQraER2Qy9LRUNGLyt2ZDd5TDZOUmxvYXlaZHYwa3M3egpDd29JZWVUZkV1MmhkM3JYREVMZ29pTStBQUVjaVllMDhWdXl0RmpiT055MjhFeTNTR0hVUk40MThGSnJKSERzCjdCNXgzUDg5Z2xrU3RhMVRZNEpPUXRvV3V4emE3eWxTOEcxaytzcytUREIrRVQzc3FqRGUxbXhvc1JBZnFTQTcKYXBFWkszQUxiWnJ1M25ZZDI2eCtDRTg0ZHZIN0dpS29CbDBUU1FJREFRQUJBb0lCQUVFQWduYUJDRHVmb2Q0eApFaHFZSFdrdkViTFFKdGFHL2FwL3gyWEFjTjMzK1BHVmlIMHJsWUNVWnE2WjBaUngyWU1uTnJoTFI0QUtmMElFCmdHOXNTY3V6YUliTWNVdmdRblJSWTlVRU5IQVNadHR4T29vZWdMRS9MWSt3STFqMmhIclpQdmZvVGZMV0krbFoKWWYwV0RyeG9KZ2szMGxuckZicDRqRlNaaGphV21zbTFYUTRodHQ5YmZHT0JsZS9nSjZVVHIzMndGMEV5T3B2NAplcmNpMVJTVXp5RFd6MHE3VGphcTZTSGx3UTJKd2NMRzB2bnJacStZbk1KVXdqTGhDNEpBTVpFS0YvNjFLbnNNCnp3UjludU9FMlpESTF4SDV4QUErMHBOa3d6eFdjcXJ5b0tCck9NYXREYSs3Wk9KRW9iT2lxK2dscW1vcHJvdjQKZ1hYUjJJRUNnWUVBK3dQMVNaTTdFMFdudFF5UGdSaVo3RDlUU2lvVit4NTFSUHc5UHV3OEtHM1R1R09McWFNegpyTXdzY2JUb2VqaVpGU3YybEhHRGJTZldzdzc2TVlqK3ZLM1JGNWVkOE14eTNnU2ZWRnhWelNENTBlZnBKY1ZxCmtWNm4vdWEzQUpZR1ZibmVhajU2QmxqeEhieFZ2Y3lYWEZHbmFtbDhJQ1BKMmp5UjhSRTE4NDhDZ1lFQXdhNFMKamdubVJlWStUdXU3VTB4ZDZPbzBYOXRqa3FreXlHcStzdFEzSTJPZll6bXRRdmVGbFdzZmVjbmJDbUVNeWxMeQpuR1Z4WVNpUk5jaWdNb1o3ZXVyZ2RtR0QvTzRtREc4MER5NFBKN2xGOC84WHg3MDFWN1lqZ0duSUkyL1Z3cDFrCnZsUjl4VEo1bFZwQU5YcVNZcTFrd3llU1BuMUtMS3QwRTQyVlA2Y0NnWUVBMmw0T0pDeU9KdXpnd2JNa29FVDcKbXJkWVNOdWw5YWtBa2J2eHQreWhSUGFPU2dsbmRYTUJ3R0I2aFl6QTlacUpLZzd0MnlPSkZ3dWlUbkZJSEpHMgpNZ1B3TTFyMXpvYTlvd0ZZYm5aSk9rTm1zVUhUNU1VQ09XYWtOUzhXb3M3Z3dmRUpXVm55bzlUNkpVa3pPZ05pCjViQXZPWFo4d2lVQU0vZWZhcHp6VjJjQ2dZQmJLdFkvRi9mVjFWQmxFOStFa1VEdlB6ZFNHOUllR2hqMmNCQzkKMnRqdGhwcGpPYVlPRExkTG96WVl2T1NuV1JHTk4waE9TQTM3bnYzalpFSE1Kck4vSTRwdkR1M3pKQ0t5M2JHUwpwNnFvbHpTUGF2ZEZwUkd6N045L05jdm9xbDdqa2ZUM0JveUJRNFlwd0diVEJaUmNjS1FxbkxqaFExYWoranpVCmEyUGlwd0tCZ1FDQ0x1T3JoTzM3VW92TW5tTnJSelhud3U5QytWQ0I0b0dmNlF0akVlaE14L0orNmVodlNZdWIKbExPeGVaUUh6VmtDM0k2clZNYksxcXgwdDhRbmIrNWpIUkFrUjR4L0phVG9qcFpZcW5nZExydFk0L3FMS0pxNwo0YU9MWWpKeUwzWUIwOWczcjY4d2NuVFVIYmNaWWorUTd4VDFZL250WE5wM3BkYlljNDdOVVE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= | base64 --decode) > ${VX_ROOT}/data/project/name/key
-chmod 0600 ${VX_ROOT}/data/project/name/key
-export VX_PRIVATE_KEY=${VX_ROOT}/data/project/name/key
-(echo IyEvYmluL3NoCmV4ZWMgL3Vzci9iaW4vc3NoIC1BIC1vIExvZ0xldmVsPXF1aWV0IC1vIFN0cmljdEhvc3RLZXlDaGVja2luZz1ubyAtbyBVc2VyS25vd25Ib3N0c0ZpbGU9L2Rldi9udWxsIC1pICR7VlhfUk9PVH0vZGF0YS9wcm9qZWN0L25hbWUva2V5ICRACg== | base64 --decode) > ${VX_ROOT}/data/project/name/git_ssh
-chmod 0750 ${VX_ROOT}/data/project/name/git_ssh
-export GIT_SSH=${VX_ROOT}/data/project/name/git_ssh
- echo "$ git clone --depth=50 --branch=master git@github.com:dima-exe/ci-worker-test-repo.git ${VX_ROOT}/code/project/name" 
-git clone --depth=50 --branch=master git@github.com:dima-exe/ci-worker-test-repo.git ${VX_ROOT}/code/project/name
- echo "$ git checkout -qf b665f90239563c030f1b280a434b3d84daeda1bd" 
- ( cd ${VX_ROOT}/code/project/name && git checkout -qf b665f90239563c030f1b280a434b3d84daeda1bd ) 
-unset GIT_SSH
-echo "starting SSH Agent"
-eval "$(ssh-agent)" > /dev/null
-ssh-add $VX_PRIVATE_KEY 2> /dev/null
-cd ${VX_ROOT}/code/project/name
-echo "download latest version of vxvm"
-curl --fail --silent --show-error https://raw.githubusercontent.com/vexor/vx-packages/master/vxvm > $VX_ROOT/bin/vxvm
-chmod +x $VX_ROOT/bin/vxvm
- export CASHER_DIR=$HOME/.casher && ( mkdir -p $CASHER_DIR/bin && /usr/bin/curl https://raw2.github.com/dima-exe/casher/master/bin/casher -s -o $HOME/.casher/bin/casher && chmod +x $HOME/.casher/bin/casher ) || true 
-test -f $HOME/.casher/bin/casher && /opt/rbenv/versions/1.9.3-p547/bin/ruby $HOME/.casher/bin/casher fetch http://example.com/master/rvm-1.9.3-gemfile.tgz || true
-test -f $HOME/.casher/bin/casher && /opt/rbenv/versions/1.9.3-p547/bin/ruby $HOME/.casher/bin/casher add ~/.rubygems || true
-unset CASHER_DIR
-
-# before install
-eval "$(rbenv init -)" || true
-rbenv shell $(rbenv versions | sed -e 's/^*/ /' | awk '{print $1}' | grep -v 'system' | grep '1.9.3' | tail -n1)
-echo \$\ export\ BUNDLE_GEMFILE\=\$\{PWD\}/Gemfile
-export BUNDLE_GEMFILE=${PWD}/Gemfile
-echo \$\ export\ GEM_HOME\=\~/.rubygems
-export GEM_HOME=~/.rubygems
-
-# announce
-echo \$\ ruby\ --version
-ruby --version
-echo \$\ gem\ --version
-gem --version
-echo \$\ bundle\ --version
-bundle --version
-
-# install
-echo \$\ bundle\ install\ 
-bundle install 
-echo \$\ bundle\ clean\ --force
-bundle clean --force
-
-# before script
-echo \$\ echo\ before\ deploy
-echo before deploy

data/spec/fixtures/integration/ruby/deploy/d.script.sh

@@ -1,8 +0,0 @@
-
-# script
-echo \$\ cap\ staging\ deploy
-cap staging deploy
-
-# after success
-echo \$\ echo\ after\ deploy
-echo after deploy