vx-builder 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4931a543965ca9828a090a0d2fee1cec1e7bedca
-  data.tar.gz: 916c04fd44e0df9dbb26ed7de24fe356fc58660a
+  metadata.gz: 45791c5eb7d09805bf54688cf7bad24381933750
+  data.tar.gz: 5d42c9ee4247cb9f94d2f8b884c8b9653d964082
 SHA512:
-  metadata.gz: fa0e9cc22069c4d13042252a10d08dbeb356ab81800d1dccae33e77504dfe57f062a9ba3b4c1565a8f09e71ce189f8112f0588b77d8542660eb1e6b83db4e44e
-  data.tar.gz: 1e7a835fbfbf8d4b254bfaab6de087b4ecec84ee16cf7407c1ff38c055254c17ca5648b54f264c97f2c1bd8ce161a2afcb1f03395dfbe8b3a6b5680d23379456
+  metadata.gz: 0e43c8093cfe287c48236efe385063aa39b8740bfe1a4d0d8322c1255144af1335a87442e864eed7e4fdb23aa5fec4659cad6fb2dd3fc33b972ba1463cd9a6a8
+  data.tar.gz: ddcdb655878e2c165998d85ca057588e12b74e7048c7051e87513470a35f8a1726d0e657884f284ca424e63a1e2a31d48051915ecfced74619b72ecfa879d822

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

@@ -25,6 +25,10 @@ module Vx
             def detect(params)
               params.key?(key.to_s) if key
             end
+
+            def module_by_key(val)
+              loaded.find{|i| i.key.to_s == val.to_s }
+            end
           end
 
           attr_reader :params, :branch
@@ -48,7 +52,15 @@ module Vx
 
           def key
             if self.class.key
-              Array(params[self.class.key.to_s])
+              @key ||= Array(params[self.class.key.to_s])
+            end
+          end
+
+          def to_hash
+            if key
+              { self.class.key.to_s => key }
+            else
+              {}
             end
           end
 

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

@@ -3,6 +3,18 @@ module Vx
     class BuildConfiguration
       class Deploy
 
+        class << self
+          def restore_modules(values)
+            (values || []).inject([]) do |ac, pair|
+              k = pair.keys.first
+              if it = Base.module_by_key(k)
+                ac << it.new(pair)
+              end
+              ac
+            end
+          end
+        end
+
         attr_reader :attributes
 
         def initialize(new_env)
@@ -13,8 +25,13 @@ module Vx
           @attributes
         end
 
+        def empty?
+          attributes.empty?
+        end
+
         def find_modules(branch)
           modules = []
+
           Base.loaded.each do |l|
             attributes.each do |attr|
               if l.detect(attr)

data/lib/vx/builder/build_configuration.rb

@@ -50,6 +50,7 @@ module Vx
         @cache          = Cache.new     new_attributes.delete("cache")
         @deploy         = Deploy.new    new_attributes.delete("deploy")
         @deploy_modules = new_attributes.delete("deploy_modules") || []
+        @deploy_modules = Deploy.restore_modules(@deploy_modules)
 
         @matrix_attributes = matrix_attributes
 

data/lib/vx/builder/deploy_builder.rb

@@ -7,6 +7,7 @@ module Vx
         before_script
         after_success
         script
+        deploy_modules
       }
 
       attr_reader :base_build_configuration, :matrix_build_configuration, :branch
@@ -31,7 +32,7 @@ module Vx
 
           BuildConfiguration.new(
             hash.merge(
-              "deploy_modules" => deploy_modules,
+              "deploy_modules" => deploy_modules.map(&:to_hash),
               "deploy"         => nil
             )
           )

data/lib/vx/builder/version.rb

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

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

@@ -30,4 +30,11 @@ describe Vx::Builder::BuildConfiguration::Deploy::Base do
     it { should have(1).items }
   end
 
+  context ".module_by_key" do
+    it "should find modules" do
+      expect(described_class.module_by_key :shell).to eq Vx::Builder::BuildConfiguration::Deploy::Shell
+      expect(described_class.module_by_key :not_shell).to be_nil
+    end
+  end
+
 end

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

@@ -47,4 +47,15 @@ describe Vx::Builder::BuildConfiguration::Deploy do
     end
   end
 
+  context "restore_modules" do
+    let(:attrs) { [
+      { "shell" => "/bin/true" }
+    ] }
+    it "should build deploy module instances" do
+      list = described_class.restore_modules(attrs)
+      expect(list).to have(1).item
+      expect(list.first).to be_an_instance_of(Vx::Builder::BuildConfiguration::Deploy::Shell)
+    end
+  end
+
 end

data/spec/lib/builder/build_configuration_spec.rb

@@ -65,4 +65,16 @@ describe Vx::Builder::BuildConfiguration do
     subject { config.deploy }
     it { should be }
   end
+
+  context "deploy_modules" do
+    let(:content) { {
+      "deploy_modules" => [
+        { "shell" => "/bin/true" }
+      ]
+    } }
+    it "should restore" do
+      expect(config).to have(1).deploy_modules
+      expect(config).to be_deploy_modules
+    end
+  end
 end

data/spec/lib/builder/deploy_builder_spec.rb

@@ -70,6 +70,7 @@ describe Vx::Builder::DeployBuilder do
       expect(config.image).to be_empty
       expect(config.before_script).to be_empty
       expect(config.script).to be_empty
+      expect(config.deploy).to be_empty
       expect(config.after_success).to be_empty
     end
 

metadata

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