vx-builder 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f650bfd08d5d32ad96835d0d46fae32ba4b1134
-  data.tar.gz: 42bd4a8612afed0483a6c72279195e897d1777f7
+  metadata.gz: ce0dadf1e545f6b25be85c1bc67f77eb50462166
+  data.tar.gz: 674500ec89d62b497ef1096a0aa80718d84731bb
 SHA512:
-  metadata.gz: 3532ec962dcb4473ace04da98591787e9e26303658b07cfbc9f4f2765fa0fff130d5968c821ac7a458b741cd652d144d7b0875dfd8f220d660905baefbbc5b79
-  data.tar.gz: 16a9ba6bb7dc93fadaf811b27c6268bfe14d8f1f68e8047720f19812861044cae20e91b44cc80bca2fc94e38765beab43f38f2c53a423d122308dd61e15220bc
+  metadata.gz: c2d17b508d3ba8861ddcbfc5480c51b6177a696f2fb057a627223517eed62e42acbb4a31a6465d2c37b1d33d8cf3ffc56ab87246b59c7fe5726006dd73e8034f
+  data.tar.gz: e2e2c103a1594b81c02f3bd2bc5cc652d47695b7f3b3c19fec333863aa5a93d57b7e1965808ee4b5b04f9c021c39f702c3f3461c77c4d399fcdab46423a414a9

data/lib/vx/builder/build_configuration.rb

@@ -57,7 +57,8 @@ module Vx
         end
       end
 
-      attr_reader :env, :cache, :deploy, :attributes, :deploy_modules, :vexor
+      attr_reader :env, :cache, :deploy, :attributes, :deploy_modules, :vexor,
+        :matrix
 
       def initialize(new_attributes = {}, matrix_attributes = {})
         new_attributes = {} unless new_attributes.is_a?(Hash)
@@ -65,6 +66,7 @@ module Vx
         @env               = Env.new       new_attributes.delete("env")
         @cache             = Cache.new     new_attributes.delete("cache")
         @vexor             = Vexor.new     new_attributes.delete("vexor")
+        @matrix            = Matrix.new    new_attributes.delete("matrix")
 
         @deploy            = Deploy.new    new_attributes.delete("deploy")
         @deploy_modules    = new_attributes.delete("deploy_modules") || []
@@ -117,6 +119,7 @@ module Vx
           "env"            => env.attributes,
           "cache"          => cache.attributes,
           "vexor"          => vexor.attributes,
+          "matrix"         => matrix.attributes,
           "deploy"         => deploy.attributes,
           "deploy_modules" => deploy_modules.map(&:to_hash)
         )

data/lib/vx/builder/build_configuration/matrix.rb

@@ -0,0 +1,39 @@
+module Vx
+  module Builder
+    class BuildConfiguration
+      class Matrix
+
+        attr_reader :attributes
+
+        def initialize(new_env)
+          normalize_attributes(new_env)
+        end
+
+        def exclude
+          @attributes["exclude"] || []
+        end
+
+        private
+
+          def normalize_attributes(new_env)
+            @attributes = {}
+
+            if new_env.is_a?(Hash)
+              exclude = extract_exclude(new_env)
+              @attributes.merge!("exclude" => exclude) if exclude
+            end
+          end
+
+          def extract_exclude(env)
+            case env['exclude']
+            when Hash
+              [env['exclude']]
+            when Array
+              env['exclude'].select{|i| i.is_a?(Hash) }
+            end
+          end
+
+      end
+    end
+  end
+end

data/lib/vx/builder/matrix_builder.rb

@@ -9,6 +9,7 @@ module Vx
         jdk
         go
         node_js
+        rust
 
         image
         env_matrix:env
@@ -27,7 +28,12 @@ module Vx
               matrix_attributes
             )
           end
-          build_configurations.select{|bc| bc.any? }
+          filter_not_empty(
+            filter_exclude(
+              build_configuration.matrix.exclude,
+              build_configurations
+            )
+          )
         end
       end
 
@@ -90,6 +96,26 @@ module Vx
 
       private
 
+        def filter_not_empty(configurations)
+          configurations.select{|c| c.any? }
+        end
+
+        def filter_exclude(exclude, configurations)
+          configurations.select do |c|
+            !exclude.any? do |pair|
+              pair.all? do |k,v|
+                if k == 'env'
+                  k = 'env_matrix'
+                end
+
+                c.respond_to?(k)              &&
+                c.public_send(k).is_a?(Array) &&
+                c.public_send(k).include?(v)
+              end
+            end
+          end
+        end
+
         def not_matrix?(pairs)
           pairs.all?{|i| i.size == 1 }
         end

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.5"
+    VERSION = "0.5.6"
   end
 end

data/spec/fixtures/travis.yml

@@ -24,6 +24,10 @@ node_js: "0.10"
 
 rust: "0.11.0"
 
+matrix:
+  exclude:
+  - rvm: 2.1
+
 image:
   - one
   - two

data/spec/lib/builder/build_configuration/matrix_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Vx::Builder::BuildConfiguration::Matrix do
+  let(:params) { { 'matrix' => ['a', 'b'], 'global' => ['c', 'd'] } }
+  let(:env)    { described_class.new params }
+  subject { env }
+
+  it "should succeefuly work without matrix" do
+    matrix = described_class.new(nil)
+    expect(matrix.attributes).to be_empty
+
+    matrix = described_class.new({})
+    expect(matrix.attributes).to be_empty
+
+    matrix = described_class.new({"foo" => "bar"})
+    expect(matrix.attributes).to be_empty
+
+    matrix = described_class.new(%w{1})
+    expect(matrix.attributes).to be_empty
+
+    matrix = described_class.new('string')
+    expect(matrix.attributes).to be_empty
+  end
+
+  it "should build exclude attribute from Hash" do
+    attrs = {
+      "exclude" => {
+        "rvm" => "2.1"
+      }
+    }
+
+    matrix = described_class.new attrs
+    expect(matrix.attributes).to eq({
+      "exclude"=> [{"rvm" => "2.1"}]
+    })
+    expect(matrix.exclude).to eq([{'rvm' => '2.1'}])
+  end
+
+  it "should build exclude attribute from Array" do
+    attrs = {
+      "exclude" => [
+        {"rvm" => "2.1"},
+        'ignore'
+      ]
+    }
+    matrix = described_class.new attrs
+    expect(matrix.attributes).to eq({
+      "exclude"=> [{"rvm" => "2.1"}]
+    })
+    expect(matrix.exclude).to eq([{'rvm' => '2.1'}])
+  end
+end

data/spec/lib/builder/build_configuration_spec.rb

@@ -52,7 +52,8 @@ describe Vx::Builder::BuildConfiguration do
        "deploy_modules" => [],
        "bundler_args"   => ["--without development"],
        "before_deploy"  => ["echo before deploy"],
-       "after_deploy"   => ["echo after deploy"]
+       "after_deploy"   => ["echo after deploy"],
+       "matrix"         => {"exclude"=>[{"rvm"=>2.1}]}
       }
     ) }
   end

data/spec/lib/builder/matrix_builder_spec.rb

@@ -40,6 +40,25 @@ describe Vx::Builder::MatrixBuilder do
       ).build
     end
 
+    it "should exclude configurations" do
+      yaml = YAML.load %{
+        env:
+        - B=frontend
+        - B=backend
+        rvm:
+        - 2.0
+        - 2.1
+        matrix:
+          exclude:
+          - rvm: 2.1
+            env: B=frontend
+      }
+      configurations = create_matrix(yaml)
+      expect(configurations).to have(3).items
+      expect(configurations.map(&:rvm)).to eq [[2.0], [2.0], [2.1]]
+      expect(configurations.map(&:env_matrix)).to eq [["B=backend"], ["B=frontend"], ["B=backend"]]
+    end
+
     it "should generate 12 configurations" do
       expect(create_matrix).to have(12).items
     end
@@ -151,6 +170,7 @@ describe Vx::Builder::MatrixBuilder do
         it { should eq ['rvm:2.0.0'] }
       end
     end
+
   end
 
   context "attributes_for_new_confgurations_with_merged_env" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -129,6 +129,7 @@ files:
 - lib/vx/builder/build_configuration/deploy/base.rb
 - lib/vx/builder/build_configuration/deploy/shell.rb
 - lib/vx/builder/build_configuration/env.rb
+- lib/vx/builder/build_configuration/matrix.rb
 - lib/vx/builder/build_configuration/vexor.rb
 - lib/vx/builder/configuration.rb
 - lib/vx/builder/deploy_builder.rb
@@ -194,6 +195,7 @@ files:
 - spec/lib/builder/build_configuration/deploy/shell_spec.rb
 - spec/lib/builder/build_configuration/deploy_spec.rb
 - spec/lib/builder/build_configuration/env_spec.rb
+- spec/lib/builder/build_configuration/matrix_spec.rb
 - spec/lib/builder/build_configuration/vexor_spec.rb
 - spec/lib/builder/build_configuration_spec.rb
 - spec/lib/builder/configuration_spec.rb
@@ -278,6 +280,7 @@ test_files:
 - spec/lib/builder/build_configuration/deploy/shell_spec.rb
 - spec/lib/builder/build_configuration/deploy_spec.rb
 - spec/lib/builder/build_configuration/env_spec.rb
+- spec/lib/builder/build_configuration/matrix_spec.rb
 - spec/lib/builder/build_configuration/vexor_spec.rb
 - spec/lib/builder/build_configuration_spec.rb
 - spec/lib/builder/configuration_spec.rb