vx-builder 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b01cd8a132faf22ac64d8ae7108b7f65e2cbe8e6
-  data.tar.gz: bb2d6983b7d3f3bdacf5317a85a9e81eb66874eb
+  metadata.gz: 19fed2245b7bc6158415420d22e10d41c231458f
+  data.tar.gz: fb2349baa6c1d91af563a1dd97976dbbbbd4ff2d
 SHA512:
-  metadata.gz: 78f08dfcfa31ebe767d5f7920a31f062f16bbadffce7baffb51fb8fe493f00e33ed4aacf15c14fec916b8c5e21e736c8842fd2115ab1819fd8a28f84a981b9f7
-  data.tar.gz: a1436dace186cfa10a075cc7856e219dc05beeb4cd715f79a3201a441f90cfcb005aad2a937ca72c023f0752c04aaa443cb55114fe67437c7227be15005ab316
+  metadata.gz: a2568782780b71ce7ce9b49a35f731e2c53c2d52f5eee3a13a4131302257e77823bfc38d7d14ae28f44791ae274713ccbd8bebe1f009e885d9c61b312bbe11e5
+  data.tar.gz: d019a55de45647050061c7e9e4230e1b2cdb02e0d39196818c878aa729aa931189273b98ea3bd9087903166e051cd38c1462104c9c5b349f1c5c01a4cad9b609

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

@@ -0,0 +1,42 @@
+module Vx
+  module Builder
+    class BuildConfiguration
+      class Vexor
+
+        attr_reader :attributes
+
+        def initialize(new_attributes)
+          normalize_attributes(new_attributes)
+        end
+
+        def timeout
+          tm = @attributes["timeout"].to_i
+          tm.to_i > 0 ? tm.to_i : nil
+        end
+
+        def read_timeout
+          tm = @attributes["read_timeout"].to_i
+          tm.to_i > 0 ? tm.to_i : nil
+        end
+
+        private
+
+          def normalize_attributes(new_attributes)
+
+            @attributes =
+              case new_attributes
+              when Hash
+                {
+                  "timeout"      => new_attributes["timeout"],
+                  "read_timeout" => new_attributes["read_timeout"],
+                }
+              else
+                {}
+              end
+
+          end
+
+      end
+    end
+  end
+end

data/lib/vx/builder/build_configuration.rb

@@ -49,13 +49,15 @@ module Vx
         end
       end
 
-      attr_reader :env, :cache, :deploy, :attributes, :deploy_modules
+      attr_reader :env, :cache, :deploy, :attributes, :deploy_modules, :vexor
 
       def initialize(new_attributes = {}, matrix_attributes = {})
         new_attributes = {} unless new_attributes.is_a?(Hash)
 
         @env               = Env.new       new_attributes.delete("env")
         @cache             = Cache.new     new_attributes.delete("cache")
+        @vexor             = Vexor.new     new_attributes.delete("vexor")
+
         @deploy            = Deploy.new    new_attributes.delete("deploy")
         @deploy_modules    = new_attributes.delete("deploy_modules") || []
         @deploy_modules    = Deploy.restore_modules(@deploy_modules)
@@ -106,6 +108,7 @@ module Vx
         attributes.merge(
           "env"            => env.attributes,
           "cache"          => cache.attributes,
+          "vexor"          => vexor.attributes,
           "deploy"         => deploy.attributes,
           "deploy_modules" => deploy_modules.map(&:to_hash)
         )

data/lib/vx/builder/script_builder.rb

@@ -85,6 +85,10 @@ module Vx
         a.join("\n")
       end
 
+      def vexor
+        source.vexor
+      end
+
       private
 
         def env

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

data/spec/fixtures/simple.yml

@@ -0,0 +1 @@
+language: ruby

data/spec/fixtures/travis.yml

@@ -37,3 +37,7 @@ after_deploy: echo after deploy
 before_deploy: echo before deploy
 
 bundler_args: --without development
+
+vexor:
+  timeout: 10
+  read_timeout: 20

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Vx::Builder::BuildConfiguration::Vexor do
+  let(:params) { {
+    "timeout"      => "1",
+    "read_timeout" => "2"
+  } }
+  let(:env) { described_class }
+
+  it "should successfuly normalize attributes" do
+    p = params
+    expect(env.new(p).timeout).to eq 1
+    expect(env.new(p).read_timeout).to eq 2
+
+    p = {}
+    expect(env.new(p).timeout).to be_nil
+    expect(env.new(p).read_timeout).to be_nil
+
+    p = nil
+    expect(env.new(p).timeout).to be_nil
+    expect(env.new(p).read_timeout).to be_nil
+
+    p = "foo"
+    expect(env.new(p).timeout).to be_nil
+    expect(env.new(p).read_timeout).to be_nil
+
+    p = %w{ foo }
+    expect(env.new(p).timeout).to be_nil
+    expect(env.new(p).read_timeout).to be_nil
+  end
+
+end

data/spec/lib/builder/build_configuration_spec.rb

@@ -43,6 +43,7 @@ describe Vx::Builder::BuildConfiguration do
        "scala"          => ['2.10.3'],
        "script"         => ["RAILS_ENV=test ls -1 && echo DONE!"],
        "services"       => ['rabbitmq'],
+       "vexor"          => {"timeout"=>10, "read_timeout"=>20},
        "deploy"         => [{"shell"=>"cap deploy production"}],
        "deploy_modules" => [],
        "bundler_args"   => ["--without development"],

data/spec/lib/builder/matrix_builder_spec.rb

@@ -79,7 +79,8 @@ describe Vx::Builder::MatrixBuilder do
             "directories" => [],
             "enabled"     => true
           },
-          "script" => ["/bin/true"]
+          "script" => ["/bin/true"],
+          "vexor"  => {"timeout"=>nil, "read_timeout"=>nil}
         ) }
       end
     end

data/spec/lib/builder/script_builder_spec.rb

@@ -16,6 +16,19 @@ describe Vx::Builder::ScriptBuilder do
     it { should eq 'one' }
   end
 
+  context "vexor" do
+    it "should avaialble timeout and read_timeout attributes" do
+      expect(script.vexor.timeout).to eq 10
+      expect(script.vexor.read_timeout).to eq 20
+
+      simple_source = create :source, name: "simple.yml"
+      simple_script = described_class.new task, simple_source
+      expect(simple_script.vexor.timeout).to be_nil
+      expect(simple_script.vexor.read_timeout).to be_nil
+    end
+
+  end
+
   context "#to_before_script" do
     subject { script.to_before_script }
     it { should be }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -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/vexor.rb
 - lib/vx/builder/configuration.rb
 - lib/vx/builder/deploy_builder.rb
 - lib/vx/builder/helper/config.rb
@@ -168,6 +169,7 @@ files:
 - spec/fixtures/integration/ruby/matrix/d.before_script.sh
 - spec/fixtures/integration/ruby/matrix/d.script.sh
 - spec/fixtures/scala.yml
+- spec/fixtures/simple.yml
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
@@ -177,6 +179,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/vexor_spec.rb
 - spec/lib/builder/build_configuration_spec.rb
 - spec/lib/builder/configuration_spec.rb
 - spec/lib/builder/deploy_builder_spec.rb
@@ -240,6 +243,7 @@ test_files:
 - spec/fixtures/integration/ruby/matrix/d.before_script.sh
 - spec/fixtures/integration/ruby/matrix/d.script.sh
 - spec/fixtures/scala.yml
+- spec/fixtures/simple.yml
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
@@ -249,6 +253,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/vexor_spec.rb
 - spec/lib/builder/build_configuration_spec.rb
 - spec/lib/builder/configuration_spec.rb
 - spec/lib/builder/deploy_builder_spec.rb