vx-builder 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfbe290e0979d13dc2247256846a0a7bbb4cffa3
-  data.tar.gz: 0ef71474e8232fcc4891dc752d4f28790d1652fb
+  metadata.gz: a0532b05f9d5890cad0fd2b6a4097f0a24434cb2
+  data.tar.gz: d7242c8f70bd18dc7cc41aafab1a2d28c927b03c
 SHA512:
-  metadata.gz: aab68e031514142fb618bb6dfd7a7125e900c36ea67021d2a550417251fd62241c93e4b119ecca3123ed62c6f7b58bab918b5449371e96b4c6ee8ee45798df0e
-  data.tar.gz: 790cc4d61325fba00d62b8fddafb752b2737fb076bd11c455a21a9e8eb5f35c35b275a5faab9669284910e77c9be262fa17339072916b1ecf84a963fc7a1d1f4
+  metadata.gz: 94987973aca134b0db7e094d415cfb34dd4190d4e3210a9eb2a079d28c9d5f308902b56d86d002317453fe6e9a0199f9fceef7c789f91687f893b81f93924ece
+  data.tar.gz: 78b318295d9eb7e4283e200c983999c8d750d4dd2be907a2203a1fbafd30802c70076401a740ccde00ad96ba91530f669ed405904eff68af97bcb3264dd8f581

data/lib/vx/builder/script/env.rb

@@ -7,11 +7,11 @@ module Vx
         include Helper::TraceShCommand
 
         def call(env)
+          env.init << "set -e"
           env.init << 'export LC_ALL=en_US.UTF8'
           env.source.global_env.each do |e|
             env.init << trace_sh_command("export #{e}")
           end
-          env.announce << trace_sh_command("env")
           app.call(env)
         end
 

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

@@ -13,21 +13,22 @@ module Vx
           name         = env.task.name
           deploy_key   = env.task.deploy_key
 
-          repo_path    = "code/#{name}"
-          data_path    = "data/#{name}"
+          repo_path    = "${VX_ROOT}/code/#{name}"
+          data_path    = "${VX_ROOT}/data/#{name}"
           key_file     = "#{data_path}/key"
           git_ssh_file = "#{data_path}/git_ssh"
 
           sha          = env.task.sha
           scm          = build_scm(env, sha, repo_path)
-          git_ssh      = scm.git_ssh.class.template(deploy_key && "$(dirname $0)/key")
+          git_ssh      = scm.git_ssh_content(deploy_key && "#{key_file}")
 
           env.init.tap do |i|
-            i << "mkdir -p  #{data_path}"
-            i << "mkdir -p  #{repo_path}"
+            i << 'export VX_ROOT=$(pwd)'
+
+            i << "mkdir -p #{data_path}"
+            i << "mkdir -p #{repo_path}"
 
             if deploy_key
-              i << "echo instaling keys"
               i << upload_sh_command(key_file, deploy_key)
               i << "chmod 0600 #{key_file}"
             end
@@ -35,9 +36,10 @@ module Vx
             i << upload_sh_command(git_ssh_file, git_ssh)
             i << "chmod 0750 #{git_ssh_file}"
 
-            i << "export GIT_SSH=$PWD/#{git_ssh_file}"
-            i << scm.make_fetch_command
+            i << "export GIT_SSH=#{git_ssh_file}"
+            i << scm.fetch_cmd
             i << "unset GIT_SSH"
+            i << "cd #{repo_path}"
           end
 
           app.call env
@@ -46,7 +48,7 @@ module Vx
         private
 
           def build_scm(env, sha, path)
-            SCM::Git.new(env.task.src,
+            Common::Git.new(env.task.src,
                          sha,
                          "$PWD/#{path}",
                          branch: env.task.branch,

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/lib/builder/script/env_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Vx::Builder::Script::Env do
+  let(:app)    { ->(_) { 0 } }
+  let(:script) { described_class.new app }
+  let(:env)    { create :env }
+  let(:run)    { script.call env }
+  subject { run }
+
+  it { should eq 0 }
+
+  context "run it" do
+    let(:command) { create :command_from_env, env: env }
+    before { run }
+
+    it "should be success" do
+      system( command )
+      expect($?.to_i).to eq 0
+    end
+  end
+
+end

data/spec/lib/builder/script/prepare_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'tmpdir'
+require 'fileutils'
+
+describe Vx::Builder::Script::Prepare do
+  let(:app)    { ->(_) { 0 } }
+  let(:script) { described_class.new app }
+  let(:env)    { create :env }
+  let(:run)    { script.call env }
+  let(:path)   { Dir.tmpdir }
+  subject { run }
+
+  before { FileUtils.rm_rf(path) }
+  after { FileUtils.rm_rf(path) }
+
+  it { should eq 0 }
+
+  context "run it" do
+    let(:command) { create :command_from_env, env: env }
+    before { run }
+
+    context "success" do
+      it "should return zero code" do
+        Dir.chdir(path) do
+          system( command )
+        end
+        expect($?.to_i).to eq 0
+      end
+    end
+  end
+
+end

data/spec/support/create.rb

@@ -1,15 +1,34 @@
+require 'ostruct'
+
 def create(name, options = {})
   case name
+  when :message
+    Vx::Message::PerformBuild.test_message
+
   when :task
+    msg = create(:message)
     Vx::Builder::Task.new(
       'name',
-      'src',
-      'sha',
-      deploy_key: 'deploy_key',
-      branch: 'master',
-      cache_url_prefix: "http://localhost"
+      msg.src,
+      msg.sha,
+      deploy_key: msg.deploy_key,
+      branch:     msg.branch
     )
+
   when :source
     Vx::Builder::Source.from_yaml(fixture("travis.yml"))
+
+  when :env
+    OpenStruct.new(
+      init:   [],
+      source: create(:source),
+      task:   create(:task)
+    )
+
+  when :command_from_env
+    env = options[:env]
+    a = ["set -e"]
+    a += env.init
+    a.join("\n")
   end
 end

data/vx-builder.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'vx-common'
+  spec.add_runtime_dependency 'vx-common', '0.3.0'
   spec.add_runtime_dependency 'vx-message'
   spec.add_runtime_dependency 'hashr'
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: vx-message
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,8 @@ files:
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
 - spec/lib/builder/configuration_spec.rb
+- spec/lib/builder/script/env_spec.rb
+- spec/lib/builder/script/prepare_spec.rb
 - spec/lib/builder/script_spec.rb
 - spec/lib/builder/source_matrix_spec.rb
 - spec/lib/builder/source_spec.rb
@@ -182,6 +184,8 @@ test_files:
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
 - spec/lib/builder/configuration_spec.rb
+- spec/lib/builder/script/env_spec.rb
+- spec/lib/builder/script/prepare_spec.rb
 - spec/lib/builder/script_spec.rb
 - spec/lib/builder/source_matrix_spec.rb
 - spec/lib/builder/source_spec.rb