vx-builder 0.5.45 → 0.5.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e444e7970d55768c02e05dc15184f478d0b6305f
-  data.tar.gz: 02496744214b2cf5af907a8bba59f41e3bec0dbe
+  metadata.gz: 3f218880e3d7bec636acf3812cb233051afc371f
+  data.tar.gz: b965ce4e4b9dc625839074ca3f7e6a38213098b8
 SHA512:
-  metadata.gz: 38649a2707077f66fe50e9076b8265831f81d930e986cd8834db8cd060736f82d7c69d6a9f8416727c7aec3c86bf171cd81a9a4de2906be47c60701e77e44a33
-  data.tar.gz: 375bfe1ad70db0ab2dfed78a28f75c8d53895dac5176c9e247722fecc35e8cb7b412130b43a1cdc1f4420abf8f3a4bafff17b391e467e79c77facc555bdf8422
+  metadata.gz: 916e80529296c68c5fc7aef7377c3ee2c839a25355692d71c267b3cc675026db80ebb8d686773a75c8e4a6500bff3db56a18fca8c5cbcd5f37dd590e0816a61a
+  data.tar.gz: df44aeaffebafc094f85423fe9e684825c649763ac8bed57499908826816541546dd798c1c2d47cdea16f1c75a6c5377b644e57cf1db2878fbd29706fed615fb

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

@@ -16,11 +16,11 @@ module Vx
           repo_path    = "${VX_ROOT}/code/#{name}"
           data_path    = "${VX_ROOT}/data/#{name}"
           key_file     = "#{data_path}/key"
-          git_ssh_file = "#{data_path}/git_ssh"
+          #git_ssh_file = "#{data_path}/git_ssh"
 
           sha          = env.task.sha
           scm          = build_scm(env, sha, repo_path)
-          git_ssh      = scm.git_ssh_content(deploy_key && "#{key_file}")
+          #git_ssh      = scm.git_ssh_content(deploy_key && "#{key_file}")
 
           env.init.tap do |i|
             i << 'export VX_ROOT=$(pwd)'
@@ -38,22 +38,22 @@ module Vx
               i << "chmod 0750 #{dst}"
             end
 
+            i << 'echo "starting SSH Agent"'
+            i << 'eval "$(ssh-agent)" > /dev/null'
+
             if deploy_key
               i << upload_sh_command(key_file, deploy_key)
               i << "chmod 0600 #{key_file}"
               i << "export VX_PRIVATE_KEY=#{key_file}"
+              i << "ssh-add $VX_PRIVATE_KEY 2> /dev/null"
             end
 
-            i << upload_sh_command(git_ssh_file, git_ssh)
-            i << "chmod 0750 #{git_ssh_file}"
+            #i << upload_sh_command(git_ssh_file, git_ssh)
+            #i << "chmod 0750 #{git_ssh_file}"
 
-            i << "export GIT_SSH=#{git_ssh_file}"
+            #i << "export GIT_SSH=#{git_ssh_file}"
             i << "#{scm.fetch_cmd} || exit 1"
-            i << "unset GIT_SSH"
-
-            i << 'echo "starting SSH Agent"'
-            i << 'eval "$(ssh-agent)" > /dev/null'
-            i << "ssh-add $VX_PRIVATE_KEY 2> /dev/null"
+            #i << "unset GIT_SSH"
 
             i << "cd #{repo_path}"
 

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.45"
+    VERSION = "0.5.46"
   end
 end

metadata

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