vx-builder 0.0.29 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f04d4731464414b121f1418f4fada916c797e3b
-  data.tar.gz: 1d7c01fe5104d38d215cfb806245943376d8d39a
+  metadata.gz: 2fb1d69bf511942769e1f87e6bd993061f05307e
+  data.tar.gz: b2aa4557949a81e0a62e98f4f870facb09c9f657
 SHA512:
-  metadata.gz: 54df9e7aa3c473ae2564e07b4f8bf4acd6917d98c46bdd551bdbddda5c88b22bd2d5501891f66a0e8f916f84b2763336e85e6f0e862ff16594bdcaeb51c0bbb6
-  data.tar.gz: 527e9b0e283e7976ed50e04b7dede18412345711165f9bfbb9098624c823c282b31a507e3a5d68586e0693d816081152b440a8ae368afb283a2f1fcb268c2098
+  metadata.gz: c8aa727add24b3208c07ccb0db15eadfff5675049e03063b58eb7ede61903102aadc35ead9d076c0f965197a383b5b0aa2ea7466756d13e34f68f6e6253efa51
+  data.tar.gz: 8bb24fcbe8f1b88b65bffb1c29fa1612ece2b492bd038f80aaa84a548377a9044c020f744f9efd41d993c6c4ea762fbfdb4920c3b2c913109dcfb4846170e394

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

@@ -12,7 +12,7 @@ module Vx
           rs = app.call env
 
           if enabled?(env)
-            env.after_success << "echo"
+            env.after_script << "echo"
             env.source.artifacts.attributes.map{|a| compile(a) }.each do |artifact|
               find = FIND % artifact
               prefix = env.task.artifacts_url_prefix
@@ -22,9 +22,9 @@ module Vx
                   curl -s -S -X PUT -T $i #{prefix}/$i > /dev/null
                 done
               }
-              env.after_success << cmd
+              env.after_script << cmd
             end
-            env.after_success << "echo"
+            env.after_script << "echo"
           end
 
           rs

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

@@ -10,10 +10,10 @@ module Vx
           env.init << "set -e"
           env.init << "export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
           env.init << 'export LC_ALL=en_US.UTF8'
+          env.init << 'export DEBIAN_FRONTEND=noninteractive'
 
-          if b = env.task.branch
-            env.init << "export CI_BRANCH=#{b}"
-          end
+          export_vars(env, env.init)
+          export_vars(env, env.after_script_init)
 
           env.source.env.global.each do |e|
             env.init << trace_sh_command("export #{e}")
@@ -21,6 +21,17 @@ module Vx
           app.call(env)
         end
 
+        private
+
+          def export_vars(env, collection)
+            collection << "export CI_JOB_ID=#{env.task.job_id}"
+            collection << "export CI_BUILD_ID=#{env.task.build_id}"
+
+            if b = env.task.branch
+              collection << "export CI_BRANCH=#{b}"
+            end
+          end
+
       end
     end
   end

data/lib/vx/builder/script.rb

@@ -63,6 +63,8 @@ module Vx
 
       def to_after_script
         a = []
+        a << "\n# after script init"
+        a += env.after_script_init
         a << "\n# after script"
         a += env.after_script
         a.join("\n")
@@ -102,6 +104,8 @@ module Vx
             before_script:      [],
             script:             [],
             after_success:      [],
+
+            after_script_init:  [],
             after_script:       [],
 
             source:             source,

data/lib/vx/builder/task.rb

@@ -3,12 +3,14 @@ module Vx
     class Task
 
       attr_reader :name, :src, :sha, :deploy_key, :branch, :pull_request_id,
-        :cache_url_prefix, :artifacts_url_prefix
+        :cache_url_prefix, :artifacts_url_prefix, :job_id, :build_id
 
-      def initialize(name, src, sha, options = {})
-        @name                 = name
-        @src                  = src
-        @sha                  = sha
+      def initialize(options = {})
+        @name                 = options[:name]
+        @src                  = options[:src]
+        @sha                  = options[:sha]
+        @job_id               = options[:job_id]
+        @build_id             = options[:build_id]
         @deploy_key           = options[:deploy_key]
         @branch               = options[:branch]
         @pull_request_id      = options[:pull_request_id]
@@ -21,7 +23,7 @@ module Vx
       private
 
         def validate!
-          (name && src && sha && deploy_key && branch) or
+          (name && src && sha && deploy_key && branch && job_id && build_id) or
             raise(MissingKeys)
         end
 

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.0.29"
+    VERSION = "0.1.0"
   end
 end

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

@@ -12,7 +12,7 @@ describe Vx::Builder::Script::Artifacts do
 
   it "should create upload script" do
     subject
-    expect(env.after_success).to_not be_empty
+    expect(env.after_script).to_not be_empty
   end
 
 end

data/spec/lib/builder/task_spec.rb

@@ -2,26 +2,18 @@ require 'spec_helper'
 require 'vx/common'
 
 describe Vx::Builder::Task do
-  let(:task) {
-    described_class.new(
-      'name',
-      'source',
-      'sha',
-      deploy_key: 'deploy_key',
-      pull_request_id: '1',
-      cache_url_prefix: 'cache_url'
-    )
-  }
-
+  let(:task) { create :task, pull_request_id: 1 }
   subject { task }
 
   context "just created" do
-    let(:name)            { should eq 'name' }
-    let(:source)          { should eq 'source' }
-    let(:sha)             { should eq 'sha' }
-    let(:deploy_key)      { should eq 'deploy_key' }
-    let(:pull_request_id) { should eq '1' }
-    let(:cache_url_prefix){ should eq 'cache_url' }
+    its(:name)            { should eq 'name' }
+    its(:sha)             { should eq 'b665f90239563c030f1b280a434b3d84daeda1bd' }
+    its(:deploy_key)      { should be }
+    its(:cache_url_prefix){ should eq 'http://example.com' }
+    its(:artifacts_url_prefix){ should eq 'http://example.com' }
+    its(:job_id)          { should eq 1 }
+    its(:build_id)        { should eq 12 }
+    its(:pull_request_id) { should eq 1 }
   end
 
 end

data/spec/support/create.rb

@@ -8,13 +8,16 @@ def create(name, options = {})
   when :task
     msg = create(:message)
     Vx::Builder::Task.new(
-      'name',
-      msg.src,
-      msg.sha,
+      job_id:     1,
+      build_id:   12,
+      name:       'name',
+      src:        msg.src,
+      sha:        msg.sha,
       deploy_key: msg.deploy_key,
       branch:     msg.branch,
-      cache_url_prefix: "http://example.com/",
-      artifacts_url_prefix: "http://example.com/"
+      cache_url_prefix: "http://example.com",
+      artifacts_url_prefix: "http://example.com",
+      pull_request_id: options[:pull_request_id]
     )
 
   when :source
@@ -30,6 +33,7 @@ def create(name, options = {})
       before_script:  [],
       script:         [],
       after_script:   [],
+      after_script_init: [],
       source:         options[:source] || create(:source),
       after_success:  [],
       task:           create(:task),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.1.0
 platform: ruby
 authors:
 - Dmitry Galinsky