vx-builder 0.3.9 → 0.3.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +1 -1
  3. data/lib/vx/builder/script_builder/env.rb +2 -0
  4. data/lib/vx/builder/task.rb +5 -2
  5. data/lib/vx/builder/version.rb +1 -1
  6. data/spec/fixtures/integration/ruby/deploy/d.after_script.sh +2 -0
  7. data/spec/fixtures/integration/ruby/deploy/d.before_script.sh +2 -0
  8. data/spec/fixtures/integration/ruby/language/after_script.sh +2 -0
  9. data/spec/fixtures/integration/ruby/language/before_script.sh +2 -0
  10. data/spec/fixtures/integration/ruby/matrix/0.after_script.sh +2 -0
  11. data/spec/fixtures/integration/ruby/matrix/0.before_script.sh +2 -0
  12. data/spec/fixtures/integration/ruby/matrix/1.after_script.sh +2 -0
  13. data/spec/fixtures/integration/ruby/matrix/1.before_script.sh +2 -0
  14. data/spec/fixtures/integration/ruby/matrix/d.after_script.sh +2 -0
  15. data/spec/fixtures/integration/ruby/matrix/d.before_script.sh +2 -0
  16. data/spec/support/create.rb +3 -1
  17. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a1f383694898968e3dd295d873d6904ce218ddd8
4
- data.tar.gz: 71db5fa86dc4ea0b68fbc7d18d458415815921db
3
+ metadata.gz: 5768f28336b42af9dde0653a324d2f035afa65a1
4
+ data.tar.gz: e6576b7421d5458f74d11d921a12965fa3ccfc68
5
5
  SHA512:
6
- metadata.gz: badf8b759b75cbed107c207969530d6463e8157da6242497f270e1d8eb7cc26ddbb1ab9d5c3bd80d34140cee1b475ec21f3c7955701da5a0169247245a69b5f4
7
- data.tar.gz: 897ef19fe8c428f583386bea7d38d485988a4f9ff3c4393216f9e351f6ac7b8d44bbbf29644c67a8ac3d11f4d29d77c5c24d6eb7c832d29b21eeb20b829982b2
6
+ metadata.gz: 5af26473f17135353caa1fbba7c0d72e301de5b36dfdb3f4076249771d0a59faca0cb1a7306fda1b4047e2148d4ac211f6086a221442607d9ad7bd14e536a6fa
7
+ data.tar.gz: 548d756a4a9792a1f4ab2ce700825b75b85ab7068886087e672a925ba2c66c0eecd3e63d7a71f329eb8d364dbbec6cfa068596545504097da4202f2d87efdf03
data/Rakefile CHANGED
@@ -23,7 +23,7 @@ namespace :print do
23
23
  task = create :task
24
24
  source = create :source
25
25
 
26
- builder = Vx::Builder::Script.new(task, source)
26
+ builder = Vx::Builder::ScriptBuilder.new(task, source)
27
27
 
28
28
  puts "\n#===> BEGIN BEFORE SCRIPT"
29
29
  puts builder.to_before_script
data/lib/vx/builder/script_builder/env.rb CHANGED
@@ -27,7 +27,9 @@ module Vx
27
27
  def export_vars(env, collection)
28
28
  collection << "export CI=1"
29
29
  collection << "export CI_JOB_ID=#{env.task.job_id}"
30
+ collection << "export CI_JOB_NUMBER=#{env.task.job_number}"
30
31
  collection << "export CI_BUILD_ID=#{env.task.build_id}"
32
+ collection << "export CI_BUILD_NUMBER=#{env.task.build_number}"
31
33
  collection << "export CI_PROJECT_NAME=#{env.task.name}"
32
34
  collection << "export CI_BUILD_SHA=#{env.task.sha}"
33
35
 
data/lib/vx/builder/task.rb CHANGED
@@ -3,7 +3,7 @@ module Vx
3
3
  class Task
4
4
 
5
5
  attr_reader :name, :src, :sha, :deploy_key, :branch, :pull_request_id,
6
- :cache_url_prefix, :job_id, :build_id
6
+ :cache_url_prefix, :job_id, :build_id, :build_number, :job_number
7
7
 
8
8
  def initialize(options = {})
9
9
  @name = options[:name]
@@ -15,6 +15,8 @@ module Vx
15
15
  @branch = options[:branch]
16
16
  @pull_request_id = options[:pull_request_id]
17
17
  @cache_url_prefix = options[:cache_url_prefix]
18
+ @build_number = options[:build_number]
19
+ @job_number = options[:job_number]
18
20
 
19
21
  validate!
20
22
  end
@@ -22,7 +24,8 @@ module Vx
22
24
  private
23
25
 
24
26
  def validate!
25
- (name && src && sha && deploy_key && branch && job_id && build_id) or
27
+ (name && src && sha && deploy_key && branch && job_id && build_id &&
28
+ build_number && job_number) or
26
29
  raise(MissingKeys)
27
30
  end
28
31
 
data/lib/vx/builder/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Vx
2
2
  module Builder
3
- VERSION = "0.3.9"
3
+ VERSION = "0.3.10"
4
4
  end
5
5
  end
data/spec/fixtures/integration/ruby/deploy/d.after_script.sh CHANGED
@@ -2,7 +2,9 @@
2
2
  # after script init
3
3
  export CI=1
4
4
  export CI_JOB_ID=1
5
+ export CI_JOB_NUMBER=100
5
6
  export CI_BUILD_ID=12
7
+ export CI_BUILD_NUMBER=101
6
8
  export CI_PROJECT_NAME=name
7
9
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
8
10
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/deploy/d.before_script.sh CHANGED
@@ -6,7 +6,9 @@ export LC_ALL=en_US.UTF8
6
6
  export DEBIAN_FRONTEND=noninteractive
7
7
  export CI=1
8
8
  export CI_JOB_ID=1
9
+ export CI_JOB_NUMBER=100
9
10
  export CI_BUILD_ID=12
11
+ export CI_BUILD_NUMBER=101
10
12
  export CI_PROJECT_NAME=name
11
13
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
12
14
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/language/after_script.sh CHANGED
@@ -2,7 +2,9 @@
2
2
  # after script init
3
3
  export CI=1
4
4
  export CI_JOB_ID=1
5
+ export CI_JOB_NUMBER=100
5
6
  export CI_BUILD_ID=12
7
+ export CI_BUILD_NUMBER=101
6
8
  export CI_PROJECT_NAME=name
7
9
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
8
10
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/language/before_script.sh CHANGED
@@ -6,7 +6,9 @@ export LC_ALL=en_US.UTF8
6
6
  export DEBIAN_FRONTEND=noninteractive
7
7
  export CI=1
8
8
  export CI_JOB_ID=1
9
+ export CI_JOB_NUMBER=100
9
10
  export CI_BUILD_ID=12
11
+ export CI_BUILD_NUMBER=101
10
12
  export CI_PROJECT_NAME=name
11
13
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
12
14
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/matrix/0.after_script.sh CHANGED
@@ -2,7 +2,9 @@
2
2
  # after script init
3
3
  export CI=1
4
4
  export CI_JOB_ID=1
5
+ export CI_JOB_NUMBER=100
5
6
  export CI_BUILD_ID=12
7
+ export CI_BUILD_NUMBER=101
6
8
  export CI_PROJECT_NAME=name
7
9
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
8
10
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/matrix/0.before_script.sh CHANGED
@@ -6,7 +6,9 @@ export LC_ALL=en_US.UTF8
6
6
  export DEBIAN_FRONTEND=noninteractive
7
7
  export CI=1
8
8
  export CI_JOB_ID=1
9
+ export CI_JOB_NUMBER=100
9
10
  export CI_BUILD_ID=12
11
+ export CI_BUILD_NUMBER=101
10
12
  export CI_PROJECT_NAME=name
11
13
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
12
14
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/matrix/1.after_script.sh CHANGED
@@ -2,7 +2,9 @@
2
2
  # after script init
3
3
  export CI=1
4
4
  export CI_JOB_ID=1
5
+ export CI_JOB_NUMBER=100
5
6
  export CI_BUILD_ID=12
7
+ export CI_BUILD_NUMBER=101
6
8
  export CI_PROJECT_NAME=name
7
9
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
8
10
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/matrix/1.before_script.sh CHANGED
@@ -6,7 +6,9 @@ export LC_ALL=en_US.UTF8
6
6
  export DEBIAN_FRONTEND=noninteractive
7
7
  export CI=1
8
8
  export CI_JOB_ID=1
9
+ export CI_JOB_NUMBER=100
9
10
  export CI_BUILD_ID=12
11
+ export CI_BUILD_NUMBER=101
10
12
  export CI_PROJECT_NAME=name
11
13
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
12
14
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/matrix/d.after_script.sh CHANGED
@@ -2,7 +2,9 @@
2
2
  # after script init
3
3
  export CI=1
4
4
  export CI_JOB_ID=1
5
+ export CI_JOB_NUMBER=100
5
6
  export CI_BUILD_ID=12
7
+ export CI_BUILD_NUMBER=101
6
8
  export CI_PROJECT_NAME=name
7
9
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
8
10
  export CI_BRANCH=master
data/spec/fixtures/integration/ruby/matrix/d.before_script.sh CHANGED
@@ -6,7 +6,9 @@ export LC_ALL=en_US.UTF8
6
6
  export DEBIAN_FRONTEND=noninteractive
7
7
  export CI=1
8
8
  export CI_JOB_ID=1
9
+ export CI_JOB_NUMBER=100
9
10
  export CI_BUILD_ID=12
11
+ export CI_BUILD_NUMBER=101
10
12
  export CI_PROJECT_NAME=name
11
13
  export CI_BUILD_SHA=b665f90239563c030f1b280a434b3d84daeda1bd
12
14
  export CI_BRANCH=master
data/spec/support/create.rb CHANGED
@@ -13,7 +13,9 @@ def create(name, options = {})
13
13
  deploy_key: fixture("insecure_private_key"),
14
14
  branch: "master",
15
15
  cache_url_prefix: "http://example.com",
16
- pull_request_id: options[:pull_request_id]
16
+ pull_request_id: options[:pull_request_id],
17
+ job_number: 100,
18
+ build_number: 101,
17
19
  )
18
20
 
19
21
  when :source
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vx-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.9
4
+ version: 0.3.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Galinsky