vx-builder 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45791c5eb7d09805bf54688cf7bad24381933750
-  data.tar.gz: 5d42c9ee4247cb9f94d2f8b884c8b9653d964082
+  metadata.gz: 7998b25a579c3f0454f0d8570e430a8160b277dd
+  data.tar.gz: 4db82b2386a234a21847bc238d246a7ee6a7b323
 SHA512:
-  metadata.gz: 0e43c8093cfe287c48236efe385063aa39b8740bfe1a4d0d8322c1255144af1335a87442e864eed7e4fdb23aa5fec4659cad6fb2dd3fc33b972ba1463cd9a6a8
-  data.tar.gz: ddcdb655878e2c165998d85ca057588e12b74e7048c7051e87513470a35f8a1726d0e657884f284ca424e63a1e2a31d48051915ecfced74619b72ecfa879d822
+  metadata.gz: 8092cff129181614b6c7508116de77fe34a48f52a8b09750b9958ceefb31a08710fe7255fcf5c205f3453af8e95db95e50f274130cdbab2be9c7e01be71eaea4
+  data.tar.gz: 84308df7403a76e3ba6da6782912dae15988a8c85a5ab76cc7f0392c4b36948c47ec6848ffcd83607035d8432734fb3cd6f2c6c4fa13b8385cb86e66af34ac48

data/lib/vx/builder/build_configuration/deploy/base.rb

@@ -43,7 +43,10 @@ module Vx
           end
 
           def branch?(name)
-            if branch.empty?
+            case
+            when branch.empty?
+              true
+            when !name
               true
             else
               branch.include?(name)

data/lib/vx/builder/build_configuration.rb

@@ -84,9 +84,12 @@ module Vx
       end
 
       def to_hash
-        attributes.merge("env"    => env.attributes)
-                  .merge("cache"  => cache.attributes)
-                  .merge("deploy" => deploy.attributes)
+        attributes.merge(
+          "env"            => env.attributes,
+          "cache"          => cache.attributes,
+          "deploy"         => deploy.attributes,
+          "deploy_modules" => deploy_modules.map(&:to_hash)
+        )
       end
 
       def to_yaml

data/lib/vx/builder/deploy_builder.rb

@@ -20,7 +20,7 @@ module Vx
 
       def build
         @build ||= begin
-          return false unless valid?
+          return [] unless valid?
 
           hash = matrix_build_configuration.to_hash
 
@@ -30,12 +30,13 @@ module Vx
 
           hash["env"]["matrix"] = []
 
-          BuildConfiguration.new(
+          build_configuration = BuildConfiguration.new(
             hash.merge(
               "deploy_modules" => deploy_modules.map(&:to_hash),
               "deploy"         => nil
             )
           )
+          [build_configuration]
         end
       end
 

data/lib/vx/builder/version.rb

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

data/spec/integration/ruby_spec.rb

@@ -44,19 +44,22 @@ describe "(integration) ruby" do
     let(:config) { fixture("integration/ruby/deploy/config.yml") }
 
     context "configuration" do
-      let(:task)   { create :task, deploy: true }
-      let(:source) { Vx::Builder.deploy(matrix, branch: "master").build }
-      subject { script }
-
-      before { write_script_to_filter "deploy/d." }
+      let(:task)    { create :task, deploy: true }
+      let(:sources) { Vx::Builder.deploy(matrix, branch: "master").build }
 
       it "should have source" do
-        expect(source).to be
+        expect(sources).to have(1).item
       end
 
-      its(:to_before_script) { should eq fixture("integration/ruby/deploy/d.before_script.sh") }
-      its(:to_script)        { should eq fixture("integration/ruby/deploy/d.script.sh") }
-      its(:to_after_script)  { should eq fixture("integration/ruby/deploy/d.after_script.sh") }
+      context "first deploy configuration" do
+        let(:source) { sources.first }
+        before { write_script_to_filter "deploy/d." }
+        subject { script }
+
+        its(:to_before_script) { should eq fixture("integration/ruby/deploy/d.before_script.sh") }
+        its(:to_script)        { should eq fixture("integration/ruby/deploy/d.script.sh") }
+        its(:to_after_script)  { should eq fixture("integration/ruby/deploy/d.after_script.sh") }
+      end
     end
   end
 
@@ -88,20 +91,22 @@ describe "(integration) ruby" do
     end
 
     context "deploy configuration" do
-      let(:task)   { create :task }
-      let(:source) { Vx::Builder.deploy(matrix, branch: "master").build }
-      subject { script }
-
-      before { write_script_to_filter "matrix/d." }
+      let(:task)    { create :task }
+      let(:sources) { Vx::Builder.deploy(matrix, branch: "master").build }
 
       it "should have source" do
-        expect(source).to be
+        expect(sources).to have(1).item
       end
 
-      its(:to_before_script) { should eq fixture("integration/ruby/matrix/d.before_script.sh") }
-      its(:to_script) { should eq fixture("integration/ruby/matrix/d.script.sh") }
-      its(:to_after_script) { should eq fixture("integration/ruby/matrix/d.after_script.sh") }
+      context "first deploy configuration" do
+        let(:source) { sources.first }
+        subject { script }
+        before { write_script_to_filter "matrix/d." }
 
+        its(:to_before_script) { should eq fixture("integration/ruby/matrix/d.before_script.sh") }
+        its(:to_script) { should eq fixture("integration/ruby/matrix/d.script.sh") }
+        its(:to_after_script) { should eq fixture("integration/ruby/matrix/d.after_script.sh") }
+      end
     end
   end
 end

data/spec/lib/builder/build_configuration/deploy/base_spec.rb

@@ -8,6 +8,7 @@ describe Vx::Builder::BuildConfiguration::Deploy::Base do
   subject { described_class.new params }
 
   context "#branch" do
+
     it "should be empty if key 'branch' is not exists" do
       expect(get_branch nil).to eq []
     end

data/spec/lib/builder/build_configuration_spec.rb

@@ -44,6 +44,7 @@ describe Vx::Builder::BuildConfiguration do
        "script"         => ["RAILS_ENV=test ls -1 && echo DONE!"],
        "services"       => ['rabbitmq'],
        "deploy"         => [{"shell"=>"cap deploy production"}],
+       "deploy_modules" => [],
        "bundler_args"   => ["--without development"],
        "before_deploy"  => ["echo before deploy"],
        "after_deploy"   => ["echo after deploy"]

data/spec/lib/builder/deploy_builder_spec.rb

@@ -54,19 +54,20 @@ describe Vx::Builder::DeployBuilder do
 
   context "build" do
 
-    it "should create build_configuration with deploy_modules and without deploy" do
-      expect(deploy.build).to be
-      expect(deploy.build).to_not be_deploy
-      expect(deploy.build).to be_deploy_modules
+    it "should create build_configurations with deploy_modules and without deploy" do
+      config = deploy.build
+      expect(config).to have(1).item
+      expect(config.first).to_not be_deploy
+      expect(config.first).to be_deploy_modules
     end
 
-    it "should be false if not valid" do
+    it "should be empty if not valid" do
       deploy = described_class.new matrix, branch: "production"
-      expect(deploy.build).to be_false
+      expect(deploy.build).to be_empty
     end
 
     it "should remove attributes from BLACK_LIST" do
-      config = deploy.build
+      config = deploy.build.first
       expect(config.image).to be_empty
       expect(config.before_script).to be_empty
       expect(config.script).to be_empty
@@ -75,7 +76,7 @@ describe Vx::Builder::DeployBuilder do
     end
 
     it "should remove matrix env" do
-      config = deploy.build
+      config = deploy.build.first
       expect(config.env.global).to eq(['1'])
       expect(config.env.matrix).to eq([])
     end

metadata

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