vx-builder 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7998b25a579c3f0454f0d8570e430a8160b277dd
-  data.tar.gz: 4db82b2386a234a21847bc238d246a7ee6a7b323
+  metadata.gz: 5dfe8821a2dbcc3ee1ffcaab8735c41bafacd2b4
+  data.tar.gz: 570fe0d7926a01cb815cfb17f96ceae9a7f5598a
 SHA512:
-  metadata.gz: 8092cff129181614b6c7508116de77fe34a48f52a8b09750b9958ceefb31a08710fe7255fcf5c205f3453af8e95db95e50f274130cdbab2be9c7e01be71eaea4
-  data.tar.gz: 84308df7403a76e3ba6da6782912dae15988a8c85a5ab76cc7f0392c4b36948c47ec6848ffcd83607035d8432734fb3cd6f2c6c4fa13b8385cb86e66af34ac48
+  metadata.gz: 394f85a75f76e416b51aa311b0a3425bca20733e354cd26b6388a54c0e13311eaaef8992b2ebdfd6d0d7f47f8382ad6423de643051fe98d10f8f8ad701e86c1e
+  data.tar.gz: 330d274952a14f064cae171fa88586d6b915223ce3be5b9231a893e72a889aa0fcb929f2b4e0415d22aa792a89d719e373e2330b0444e5d1b09676050a8bd192

data/lib/vx/builder/build_configuration.rb

@@ -8,6 +8,14 @@ module Vx
   module Builder
     class BuildConfiguration
 
+      REQUIRED_KEYS = %w{
+        rvm
+        scala
+        jdk
+        language
+        script
+      }
+
       ATTRIBUTES = %w{
         rvm
         scala
@@ -57,6 +65,12 @@ module Vx
         build_attributes new_attributes
       end
 
+      def any?
+        REQUIRED_KEYS.any? do |key|
+          attributes[key].any?
+        end
+      end
+
       def matrix_attributes
         @matrix_attributes.inject({}) do |a,pair|
           k,v = pair

data/lib/vx/builder/deploy_builder.rb

@@ -14,7 +14,7 @@ module Vx
 
       def initialize(matrix_builder, options = {})
         @base_build_configuration    = matrix_builder.build_configuration
-        @matrix_build_configuration  = matrix_builder.build.first
+        @matrix_build_configuration  = matrix_builder.build.first || matrix_builder.build_configuration
         @branch                      = options[:branch]
       end
 

data/lib/vx/builder/matrix_builder.rb

@@ -19,10 +19,11 @@ module Vx
       def build
         @build ||= begin
           new_attributes = build_configuration.to_hash.dup
-          attributes_for_new_build_configurations_with_merged_env.map do |matrix_attributes|
+          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
           end
+          build_configurations.select{|bc| bc.any? }
         end
       end
 

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/spec/lib/builder/build_configuration_spec.rb

@@ -78,4 +78,24 @@ describe Vx::Builder::BuildConfiguration do
       expect(config).to be_deploy_modules
     end
   end
+
+  context "any?" do
+    subject { config.any? }
+    %w{ rvm scala jdk language script }.each do |required_key|
+      context "when key #{required_key} exists" do
+        let(:content) { {
+          required_key => "value"
+        } }
+        it { should be }
+      end
+    end
+
+    context "when required keys does not exists" do
+      let(:content) { {
+        "before_script" => "value",
+        "deploy"        => "value"
+      } }
+      it { should_not be }
+    end
+  end
 end

data/spec/lib/builder/deploy_builder_spec.rb

@@ -61,6 +61,20 @@ describe Vx::Builder::DeployBuilder do
       expect(config.first).to be_deploy_modules
     end
 
+    it "should create build_configurations when matrix_build_configurations is empty" do
+      empty_config = Vx::Builder::BuildConfiguration.new("before_install" => "value", "deploy" => { "shell" => "value" })
+      matrix = Vx::Builder.matrix empty_config
+      deploy = Vx::Builder.deploy matrix
+      config = deploy.build
+
+      expect(matrix.build).to be_empty
+
+      expect(config).to have(1).item
+      expect(config.first).to_not be_deploy
+      expect(config.first).to be_deploy_modules
+      expect(config.first.before_install).to eq ["value"]
+    end
+
     it "should be empty if not valid" do
       deploy = described_class.new matrix, branch: "production"
       expect(deploy.build).to be_empty

data/spec/lib/builder/matrix_builder_spec.rb

@@ -48,6 +48,14 @@ describe Vx::Builder::MatrixBuilder do
       expect(subject.map(&:before_install).flatten).to eq ["echo before_install"] * 12
     end
 
+    context "when empty configuration" do
+      let(:attributes) { {
+        "deploy" => "value"
+      } }
+
+      it { should be_empty }
+    end
+
     context "without any matrix keys" do
       let(:attributes) { {
         "script" => %w{ /bin/true },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common