evrone-ci-router 0.2.0.pre3 → 0.2.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbdfc3042cc3a96d761347400e67482f9517fd19
-  data.tar.gz: 2f2e905f4511aa5da16dd819c6d25840568311af
+  metadata.gz: 5f07b623520997770118ec0c990da47e9307969f
+  data.tar.gz: 3bd64424754d66dffb5f17e7340ddc632d003c33
 SHA512:
-  metadata.gz: 9be6a237a177cc2b04d3df19189f4e47b202e26914eb3a1e942b454bed71b211a8666f095cecf6ac930eb645e5eff9230d517d76e042570af77e192601cbb8ef
-  data.tar.gz: 6fe0b6691129097ed73b6809ec5d1687036a45d1ae5d0f5297f48eca41cd5f03ae78bf86bc891e206d0de3d76d3c38b372c056f85deb04590af8038c22f296bf
+  metadata.gz: ffefbb4db637a63ac918df5aa001988f677d38a60c9af4d6735bbf23ec025150353ece55b2803be93e2e11830e7969580aa98653b1567bddd8f7d7d2953c11b1
+  data.tar.gz: 843ee07a50d637b045f38bcdf08621ab5dfc08991844e6fc6e5f3013a5e73e77c529e011af3b232b427790f6e089e674d821018c245cbc817ac04418c9c70d63

data/lib/evrone/ci/router/build.rb

@@ -30,7 +30,6 @@ module Evrone
             name:             message.name,
             src:              message.src,
             sha:              sha,
-            pull_request_id:  message.pull_request_id,
             deploy_key:       message.deploy_key,
             job_id:           job_id,
             before_script:    script_builder.to_before_script,
@@ -46,7 +45,6 @@ module Evrone
             build_id:   message.id,
             status:     status,
             tm:         tm.to_i,
-            tm_usec:    tm.usec,
             jobs_count: jobs_count || 0,
           }
 

data/lib/evrone/ci/router/build_matrix.rb

@@ -3,7 +3,7 @@ module Evrone
     class Router
       class BuildMatrix
 
-        KEYS = (Travis::LANGS + %w{ env }).freeze
+        KEYS = (Travis::LANGS + %w{ matrix_env:env }).freeze
         NOT_MATRIX_KEYS = %w{ script before_script }
 
         attr_reader :travis
@@ -17,16 +17,30 @@ module Evrone
         end
 
         def travises
-          attributes_for_new_travises.map do |attrs|
-            Travis.new attrs.merge(
+          attributes_for_new_travises_with_merged_env.map do |attrs|
+            attrs = attrs.merge(
               NOT_MATRIX_KEYS.inject({}) do |a,v|
                 a[v] = travis.public_send(v)
                 a
               end
             )
+            Travis.new attrs
           end
         end
 
+        def attributes_for_new_travises_with_merged_env
+          attrs = attributes_for_new_travises
+          attrs.map do |a|
+            e = a["env"]
+            a["env"] = {
+              "global" => Array(e) + travis.global_env,
+              "matrix" => e
+            }
+            a
+          end
+          attrs
+        end
+
         def attributes_for_new_travises
           permutate_and_build_values.inject([]) do |ac, values|
             ac << values.inject({}) do |a,val|
@@ -56,8 +70,11 @@ module Evrone
 
         def extract_pair_of_key_and_values
           KEYS.map.inject([]) do |a, k|
-            if (val = travis[k]) && !val.empty?
-              a << [k, val]
+            k_method, k_name = k.split(":")
+            k_name ||= k_method
+
+            if (val = travis[k_method]) && !val.empty?
+              a << [k_name, val]
             end
             a
           end

data/lib/evrone/ci/router/script_builder/env.rb

@@ -9,6 +9,9 @@ module Evrone
 
           def call(env)
             env.init << 'export LC_ALL=en_US.UTF8'
+            env.travis.global_env.each do |e|
+              env.init << trace_sh_command("export #{e}")
+            end
             env.before_install << trace_sh_command("env")
             app.call(env)
           end

data/lib/evrone/ci/router/travis.rb

@@ -25,9 +25,11 @@ module Evrone
         def matrix_keys
           @matrix_keys ||=
             BuildMatrix::KEYS.inject([]) do |a,k|
-              val = send(k)
+              k_method, k_name = k.split(":")
+              k_name ||= k_method
+              val = send(k_method)
               unless val.empty?
-                a << val.map{|v| "#{k}:#{v}" }
+                a << val.map{|v| "#{k_name}:#{v}" }
               end
               a
             end.flatten.sort
@@ -42,6 +44,10 @@ module Evrone
         end
 
         def env
+          attributes["env"]
+        end
+
+        def matrix_env
           attributes["env"]["matrix"]
         end
 

data/lib/evrone/ci/router/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     class Router
-      VERSION = "0.2.0.pre3"
+      VERSION = "0.2.0.pre4"
     end
   end
 end

data/spec/lib/build_matrix_spec.rb

@@ -74,6 +74,25 @@ describe Evrone::CI::Router::BuildMatrix do
     end
   end
 
+  context "attributes_for_new_travises_with_merged_env" do
+    subject { matrix.attributes_for_new_travises_with_merged_env }
+
+    before do
+      attributes.merge!(
+        env: {
+          "global" => "FOO=1",
+          "matrix" => %w{ BAR=1 BAR=2 }
+        }
+      )
+    end
+
+    it { should have(12).items }
+
+    it "should merge matrix env to global env" do
+      expect(subject.map{|i| i["env"]["global"] }.uniq.sort).to eq([["BAR=1", "FOO=1"], ["BAR=2", "FOO=1"]])
+    end
+  end
+
   context 'attributes_for_new_travises' do
     subject { matrix.attributes_for_new_travises }
 

data/spec/lib/build_spec.rb

@@ -39,7 +39,6 @@ describe Evrone::CI::Router::Build do
     its(:build_id)   { should eq build.message.id }
     its(:status)     { should eq 2 }
     its(:tm)         { should be }
-    its(:tm_usec)    { should be }
     its(:jobs_count) { should eq 1 }
 
     context "when commit_info exists" do

data/spec/lib/travis_spec.rb

@@ -145,17 +145,17 @@ describe Evrone::CI::Router::Travis do
 
     context "when attributes[env] is Array" do
       let(:env) { %w{ FOO=1 BAR=2 } }
-      it { should eq %w{ FOO=1 BAR=2 } }
+      it { should eq("matrix"=>["FOO=1", "BAR=2"], "global"=>[]) }
     end
 
     context "when attributes[env] is Hash" do
       let(:env) { { "matrix" => %w{ BAZ=1 } } }
-      it { should eq %w{ BAZ=1 } }
+      it { should eq("matrix"=>["BAZ=1"], "global"=>[]) }
     end
 
     context "when attributes[env] is empty" do
       let(:env) { {} }
-      it { should eq([]) }
+      it { should eq("matrix"=>[], "global"=>[]) }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-router
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre3
+  version: 0.2.0.pre4
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre3
+        version: 0.2.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre3
+        version: 0.2.0.pre4
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre3
+        version: 0.2.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre3
+        version: 0.2.0.pre4
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement