vx-builder 0.5.56 → 0.5.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3171d4f52aee267606c4b30bf861e1a3b9dd75d2
-  data.tar.gz: 838d1f0f4b51f0a86f09a62cdc02ac6bc132b064
+  metadata.gz: 8800b04934fb573e19d603dd6222d2a6b06614ed
+  data.tar.gz: 2fe1a4fa5b1bf0742d28560759178e73cfa5da75
 SHA512:
-  metadata.gz: 92bf83267fa7ceac0aea6a8a317479b92827ccf36195d3646f44e7bb8c36c46b812a8c03263cc36acac922860d4fa9f796f4e4884b5b0abf53cda1e21b060468
-  data.tar.gz: cc89877b2bc8ba89a22738b00621029253803599912077e42c751eb5a73970b34d4087b3f518d19d3ddee0499c54dc27737ca57cf2ec03515fbf1b6e7c1b6d78
+  metadata.gz: 486059ef4bab695b13fff621a501ec93689874d32952879467e83874f8a016eb7914d03caeb67edbced75677d9d597206f8fa22024eee3bd4eb6fc4f24411d31
+  data.tar.gz: 484c5b4f0bb3c4e9a2b4572a582a001bb8366b79291829c5732bd2a7bf5640acf0da97a94be27512fdd45de274351a043835d66bbd7294c1ba1974952a64f12e

data/lib/vx/builder/build_configuration.rb

@@ -166,6 +166,10 @@ module Vx
         @attributes["parallel"].first.to_i
       end
 
+      def database?
+        @attributes['database'].first != false
+      end
+
       def parallel?
         parallel > 0
       end

data/lib/vx/builder/script_builder_v2/base.rb

@@ -33,7 +33,7 @@ module Vx
         end
 
         def do_database(env)
-          if env.source.database.empty?
+          if env.source.database.empty? && env.source.database?
             yield
           end
         end

data/lib/vx/builder/script_builder_v2/clojure.rb

@@ -6,9 +6,10 @@ module Vx
 
         def call(env)
           if enabled?(env)
+
             env.stage("install").tap do |i|
+              i.add_task "shell", "lein version"
               do_install(env) do
-                i.add_task "shell", "lein version"
                 i.add_task "shell", "lein deps"
               end
             end

data/lib/vx/builder/script_builder_v2/go.rb

@@ -15,20 +15,21 @@ module Vx
               end
             end
 
-            do_install(env) do
-              env.stage("install").tap do |i|
-                i.add_env 'GOPATH', '${HOME}/gopath:${GOPATH}'
-                i.add_env 'PATH', '${HOME}/gopath/bin:${PATH}'
-                i.add_env 'VX_ORIG_CODE_ROOT', '${PWD}'
-                i.add_env "VX_NEW_CODE_ROOT", "${HOME}/gopath/src/#{project_path env}"
-
-                i.add_task 'shell', 'mkdir -p $VX_NEW_CODE_ROOT'
-                i.add_task 'shell', 'rmdir $VX_NEW_CODE_ROOT'
-                i.add_task 'shell', 'cp -r $VX_ORIG_CODE_ROOT $VX_NEW_CODE_ROOT'
-                i.add_task 'chdir', '${VX_NEW_CODE_ROOT}'
-
-                i.add_task 'shell', 'go version'
-                i.add_task 'shell', 'go env'
+            env.stage("install").tap do |i|
+              i.add_env 'GOPATH', '${HOME}/gopath:${GOPATH}'
+              i.add_env 'PATH', '${HOME}/gopath/bin:${PATH}'
+              i.add_env 'VX_ORIG_CODE_ROOT', '${PWD}'
+              i.add_env "VX_NEW_CODE_ROOT", "${HOME}/gopath/src/#{project_path env}"
+
+              i.add_task 'shell', 'mkdir -p $VX_NEW_CODE_ROOT'
+              i.add_task 'shell', 'rmdir $VX_NEW_CODE_ROOT'
+              i.add_task 'shell', 'cp -r $VX_ORIG_CODE_ROOT $VX_NEW_CODE_ROOT'
+              i.add_task 'chdir', '${VX_NEW_CODE_ROOT}'
+
+              i.add_task 'shell', 'go version'
+              i.add_task 'shell', 'go env'
+
+              do_install(env) do
                 i.add_task 'shell', 'go get -v ./...'
               end
             end

data/lib/vx/builder/script_builder_v2/nodejs.rb

@@ -20,14 +20,14 @@ module Vx
               i << BOWER_COMPONENTS
             end
 
-            do_install(env) do
-              env.stage("install").tap do |i|
-                i.add_env 'PATH', "${PATH}:${PWD}/#{NPM_PACKAGES}/bin"
-
-                i.add_task "vxvm", "nodejs #{node_version(env)}"
-                i.add_task "shell", 'npm config set spin false'
-                i.add_task 'shell', 'node --version'
-                i.add_task 'shell', 'npm --version'
+            env.stage("install").tap do |i|
+              i.add_env 'PATH', "${PATH}:${PWD}/#{NPM_PACKAGES}/bin"
+              i.add_task "vxvm", "nodejs #{node_version(env)}"
+              i.add_task "shell", 'npm config set spin false'
+              i.add_task 'shell', 'node --version'
+              i.add_task 'shell', 'npm --version'
+
+              do_install(env) do
                 i.add_task 'shell', 'npm install'
               end
             end

data/lib/vx/builder/script_builder_v2/python.rb

@@ -25,12 +25,12 @@ module Vx
               i.add_env 'TRAVIS_PYTHON_VERSION', "py_version"
             end
 
-            do_install(env) do
-              env.stage("install").tap do |i|
-                i.add_task "python", "action" => "install", "python" => DEFAULT_PYTHON
-                i.add_task "python", "virtualenv"
-                i.add_task "python", "announce"
+            env.stage("install").tap do |i|
+              i.add_task "python", "action" => "install", "python" => DEFAULT_PYTHON
+              i.add_task "python", "virtualenv"
+              i.add_task "python", "announce"
 
+              do_install(env) do
                 i.add_task "python", "action" => "pip:install", "pip_args" => PIP_OPTS
               end
             end

data/lib/vx/builder/script_builder_v2/ruby.rb

@@ -33,10 +33,11 @@ module Vx
             end
 
             env.stage("install").tap do |i|
+              i.add_task "ruby", "action" => "install", "ruby" => ruby_version(env)
+              i.add_task "ruby", "announce"
+
               do_install(env) do
                 i.add_env "BUNDLE_GEMFILE", "${PWD}/#{gemfile(env)}"
-                i.add_task "ruby", "action" => "install", "ruby" => ruby_version(env)
-                i.add_task "ruby", "announce"
                 if args = env.source.bundler_args.first
                   i.add_task "ruby", "action" => "bundle:install", "bundler_args" => args
                 else

data/lib/vx/builder/script_builder_v2/rust.rb

@@ -13,12 +13,13 @@ module Vx
               i << "rust-#{rust_version env}"
             end
 
-            do_install(env) do
-              env.stage("install").tap do |i|
-                i.add_task "vxvm", "rust #{rust_version(env)}"
+            env.stage("install").tap do |i|
+              i.add_task "vxvm", "rust #{rust_version(env)}"
+              i.add_task "shell", "rustc --version"
+
+              do_install(env) do
                 i.add_task "shell", "git submodule init"
                 i.add_task "shell", "git submodule update"
-                i.add_task "shell", "rustc --version"
               end
             end
 

data/lib/vx/builder/script_builder_v2/scala.rb

@@ -17,9 +17,9 @@ module Vx
               i << "~/.ivy2"
             end
 
-            do_install(env) do
-              env.stage("install").tap do |i|
-                i.add_task 'scala', 'action' => 'install', 'scala' => scala(env)
+            env.stage("install").tap do |i|
+              i.add_task 'scala', 'action' => 'install', 'scala' => scala(env)
+              do_install(env) do
                 i.add_task 'scala', "sbt:update"
               end
             end

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.56"
+    VERSION = "0.5.57"
   end
 end

data/spec/lib/builder/build_configuration_spec.rb

@@ -121,4 +121,16 @@ describe Vx::Builder::BuildConfiguration do
     end
 
   end
+
+  context "database?" do
+    let(:content) { {
+      "database" => false
+    } }
+
+    it "should not be" do
+      expect(subject).to_not be_database
+    end
+
+  end
+
 end

metadata

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