vx-builder 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3068ec11992c3b9bdabd2d4eb6ced778b23151d8
-  data.tar.gz: 6da22dba6cbf630e9c222885debf8c5b331cb152
+  metadata.gz: b7e243037d06ddcd7813166b70df4888db8100f7
+  data.tar.gz: e7528036e2fd80872a80ec530b31dc17e227393a
 SHA512:
-  metadata.gz: c047a1082e15e900f199222b642beb0dffdfe5c1f9b1ebbbff3982078c6825bf18fc1e1c604007841d619858c0149b36c43557fcdd5997cf027b692aa3127aef
-  data.tar.gz: 96118b65e5d3e14344f9dce70a3f67aa96555c7ac0c8e97328f1c41bd3df03d67b77231f6c2e89aeaa62607afaaa49cdcdd0316ef94469ac61c971a8a7f3b469
+  metadata.gz: 3c36922c4cbd5ab2d91994b1b211341d3fe030b2741387bff9e42e2f36c783b24e52e07111cd18adbcf11fedbd4faaa2407025b38e47a342d647e054655bec9a
+  data.tar.gz: 4f491e675307c9f892ce666dbe99e281c95a77ccb03fd63d7deac1592f671faa57f4fefafc8f6eab3d62f19ad00e6c056939fde3c743d94397f0ae858c015480

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

@@ -22,7 +22,6 @@ module Vx
         private
 
           def normalize_attributes(new_attributes)
-
             @attributes =
               case new_attributes
               when Hash

data/lib/vx/builder/matrix_builder.rb

@@ -20,8 +20,10 @@ module Vx
         @build ||= begin
           new_attributes = build_configuration.to_hash.dup
           build_configurations = attributes_for_new_build_configurations_with_merged_env.map do |matrix_attributes|
-            new_attributes.merge!(matrix_attributes)
-            BuildConfiguration.new new_attributes, matrix_attributes
+            BuildConfiguration.new(
+              new_attributes.merge(matrix_attributes),
+              matrix_attributes
+            )
           end
           build_configurations.select{|bc| bc.any? }
         end

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
   end
 end

data/spec/lib/builder/matrix_builder_spec.rb

@@ -34,7 +34,15 @@ describe Vx::Builder::MatrixBuilder do
 
     subject { matrix.build }
 
-    it { should have(12).items }
+    def create_matrix(attrs = nil)
+      described_class.new(
+        Vx::Builder::BuildConfiguration.new(attrs || attributes)
+      ).build
+    end
+
+    it "should generate 12 configurations" do
+      expect(create_matrix).to have(12).items
+    end
 
     it "should copy script from source" do
       expect(subject.map(&:script).flatten).to eq ["echo script"] * 12
@@ -52,12 +60,14 @@ describe Vx::Builder::MatrixBuilder do
       expect(subject.map(&:matrix_attributes).flatten).to have(12).items
     end
 
-    context "when empty configuration" do
-      let(:attributes) { {
-        "deploy" => "value"
-      } }
+    it "should copy vexor attributes to all matrixes" do
+      m = create_matrix("vexor" => {"timeout" => 20}, "rvm" => %w{ 2.1 2.0 })
+      expect(m).to have(2).items
+      expect(m.map(&:vexor).map(&:timeout)).to eq [20, 20]
+    end
 
-      it { should be_empty }
+    it "should be empty if configuration is empty" do
+      expect(create_matrix "deploy" => "value").to be_empty
     end
 
     context "without any matrix keys" do
@@ -65,23 +75,27 @@ describe Vx::Builder::MatrixBuilder do
         "script" => %w{ /bin/true },
       } }
 
-      it { should have(1).item }
-
-      context "attributes" do
-        subject { matrix.build.first.to_hash.select{|k,v| !v.empty? } }
+      it "should have one configuration" do
+        expect(create_matrix).to have(1).item
+      end
 
-        it { should eq(
+      it "should have valid attributes" do
+        m = create_matrix
+        m.map! do |c|
+          c.to_hash.select{ |k,v|  !v.empty? }
+        end
+        expect(m).to eq([{
           "env" => {
-            "matrix" => [],
-            "global" => []
-          },
+              "matrix" => [],
+              "global" => []
+            },
           "cache" => {
             "directories" => [],
             "enabled"     => true
           },
           "script" => ["/bin/true"],
           "vexor"  => {"timeout"=>nil, "read_timeout"=>nil}
-        ) }
+        }])
       end
     end
 

metadata

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