vx-builder 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dfe8821a2dbcc3ee1ffcaab8735c41bafacd2b4
-  data.tar.gz: 570fe0d7926a01cb815cfb17f96ceae9a7f5598a
+  metadata.gz: b01cd8a132faf22ac64d8ae7108b7f65e2cbe8e6
+  data.tar.gz: bb2d6983b7d3f3bdacf5317a85a9e81eb66874eb
 SHA512:
-  metadata.gz: 394f85a75f76e416b51aa311b0a3425bca20733e354cd26b6388a54c0e13311eaaef8992b2ebdfd6d0d7f47f8382ad6423de643051fe98d10f8f8ad701e86c1e
-  data.tar.gz: 330d274952a14f064cae171fa88586d6b915223ce3be5b9231a893e72a889aa0fcb929f2b4e0415d22aa792a89d719e373e2330b0444e5d1b09676050a8bd192
+  metadata.gz: 78f08dfcfa31ebe767d5f7920a31f062f16bbadffce7baffb51fb8fe493f00e33ed4aacf15c14fec916b8c5e21e736c8842fd2115ab1819fd8a28f84a981b9f7
+  data.tar.gz: a1436dace186cfa10a075cc7856e219dc05beeb4cd715f79a3201a441f90cfcb005aad2a937ca72c023f0752c04aaa443cb55114fe67437c7227be15005ab316

data/lib/vx/builder/build_configuration.rb

@@ -54,11 +54,11 @@ module Vx
       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")
-        @deploy         = Deploy.new    new_attributes.delete("deploy")
-        @deploy_modules = new_attributes.delete("deploy_modules") || []
-        @deploy_modules = Deploy.restore_modules(@deploy_modules)
+        @env               = Env.new       new_attributes.delete("env")
+        @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
 
@@ -71,6 +71,11 @@ module Vx
         end
       end
 
+      # for deploy builder
+      def flat_matrix_attributes
+        @matrix_attributes
+      end
+
       def matrix_attributes
         @matrix_attributes.inject({}) do |a,pair|
           k,v = pair

data/lib/vx/builder/deploy_builder.rb

@@ -29,12 +29,18 @@ module Vx
           end
 
           hash["env"]["matrix"] = []
+          hash.merge!(
+            "deploy_modules" => deploy_modules.map(&:to_hash),
+            "deploy"         => nil
+          )
+
+          matrix_hash = matrix_build_configuration.flat_matrix_attributes
+          (BLACK_LIST + %w{ env }).each do |key|
+            matrix_hash.delete(key)
+          end
 
           build_configuration = BuildConfiguration.new(
-            hash.merge(
-              "deploy_modules" => deploy_modules.map(&:to_hash),
-              "deploy"         => nil
-            )
+            hash, matrix_hash
           )
           [build_configuration]
         end

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

@@ -35,23 +35,27 @@ module Vx
         end
 
         def do_deploy_script(env)
-          if env.source.deploy_modules?
+          if deploy?(env)
             yield env.script
           end
         end
 
         def do_before_deploy(env)
-          if env.source.deploy_modules?
+          if deploy?(env)
             yield env.before_script
           end
         end
 
         def do_after_deploy(env)
-          if env.source.deploy_modules?
+          if deploy?(env)
             yield env.after_success
           end
         end
 
+        def deploy?(env)
+          env.source.deploy_modules?
+        end
+
       end
 
     end

data/lib/vx/builder/script_builder/cache.rb

@@ -2,7 +2,7 @@ module Vx
   module Builder
     class ScriptBuilder
 
-      Cache = Struct.new(:app) do
+      class Cache < Base
 
         include Helper::Config
 
@@ -83,7 +83,7 @@ module Vx
           end
 
           def push(env)
-            if env.cache_push_url
+            if env.cache_push_url && !deploy?(env)
               env.after_script << "#{casher_cmd} push #{env.cache_push_url}"
             end
           end

data/lib/vx/builder/version.rb

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

data/spec/fixtures/integration/ruby/deploy/d.after_script.sh

@@ -6,5 +6,4 @@ export CI_BRANCH=master
 export VX_ROOT=$(pwd)
 cd ${VX_ROOT}/code/name
 
-# after script
-test -f $HOME/.casher/bin/casher && /opt/rbenv/versions/1.9.3-p547/bin/ruby $HOME/.casher/bin/casher push http://example.com/master/rvm-1.9.3-gemfile.tgz
+# after script

data/spec/fixtures/integration/ruby/matrix/d.after_script.sh

@@ -6,5 +6,4 @@ export CI_BRANCH=master
 export VX_ROOT=$(pwd)
 cd ${VX_ROOT}/code/name
 
-# after script
-test -f $HOME/.casher/bin/casher && /opt/rbenv/versions/1.9.3-p547/bin/ruby $HOME/.casher/bin/casher push http://example.com/master/rvm-1.9.3-gemfile.tgz
+# after script

data/spec/lib/builder/deploy_builder_spec.rb

@@ -94,5 +94,10 @@ describe Vx::Builder::DeployBuilder do
       expect(config.env.global).to eq(['1'])
       expect(config.env.matrix).to eq([])
     end
+
+    it "should assign matrix_attributes to configuration" do
+      config = deploy.build.first
+      expect(config.matrix_attributes).to eq("rvm"=>"1.8.7", "scala"=>"2.10.1")
+    end
   end
 end

data/spec/lib/builder/matrix_builder_spec.rb

@@ -48,6 +48,10 @@ describe Vx::Builder::MatrixBuilder do
       expect(subject.map(&:before_install).flatten).to eq ["echo before_install"] * 12
     end
 
+    it "should assign matrix_attributes" do
+      expect(subject.map(&:matrix_attributes).flatten).to have(12).items
+    end
+
     context "when empty configuration" do
       let(:attributes) { {
         "deploy" => "value"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -136,27 +136,16 @@ files:
 - lib/vx/builder/matrix_builder.rb
 - lib/vx/builder/script_builder.rb
 - lib/vx/builder/script_builder/base.rb
-- lib/vx/builder/script_builder/base.rb-e
 - lib/vx/builder/script_builder/cache.rb
-- lib/vx/builder/script_builder/cache.rb-e
 - lib/vx/builder/script_builder/clojure.rb
-- lib/vx/builder/script_builder/clojure.rb-e
 - lib/vx/builder/script_builder/deploy.rb
-- lib/vx/builder/script_builder/deploy.rb-e
 - lib/vx/builder/script_builder/env.rb
-- lib/vx/builder/script_builder/env.rb-e
 - lib/vx/builder/script_builder/java.rb
-- lib/vx/builder/script_builder/java.rb-e
 - lib/vx/builder/script_builder/prepare.rb
-- lib/vx/builder/script_builder/prepare.rb-e
 - lib/vx/builder/script_builder/ruby.rb
-- lib/vx/builder/script_builder/ruby.rb-e
 - lib/vx/builder/script_builder/scala.rb
-- lib/vx/builder/script_builder/scala.rb-e
 - lib/vx/builder/script_builder/script.rb
-- lib/vx/builder/script_builder/script.rb-e
 - lib/vx/builder/script_builder/services.rb
-- lib/vx/builder/script_builder/services.rb-e
 - lib/vx/builder/task.rb
 - lib/vx/builder/version.rb
 - spec/fixtures/clojure.yml

data/lib/vx/builder/script_builder/base.rb-e

@@ -1,59 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      Base = Struct.new(:app) do
-
-        include Helper::TraceShCommand
-
-        def do_cache_key(env)
-          yield env.cache_key
-        end
-
-        def do_script(env)
-          if env.source.script.empty? && !env.source.deploy_modules?
-            yield env.script
-          end
-        end
-
-        def do_cached_directories(env)
-          if env.source.cached_directories != false
-            yield env.cached_directories
-          end
-        end
-
-        def do_announce(env)
-          yield env.announce
-        end
-
-        def do_before_install(env)
-          yield env.before_install
-        end
-
-        def do_install(env)
-          yield env.install
-        end
-
-        def do_deploy_script(env)
-          if env.source.deploy_modules?
-            yield env.script
-          end
-        end
-
-        def do_before_deploy(env)
-          if env.source.deploy_modules?
-            yield env.before_script
-          end
-        end
-
-        def do_after_deploy(env)
-          if env.source.deploy_modules?
-            yield env.after_success
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/vx/builder/script_builder/cache.rb-e

@@ -1,94 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      Cache = Struct.new(:app) do
-
-        include Helper::Config
-
-        CASHER_URL = "https://raw2.github.com/dima-exe/casher/master/bin/casher"
-        CASHER_BIN = "$HOME/.casher/bin/casher"
-
-        def call(env)
-          rs = app.call env
-
-          if env.task.cache_url_prefix && enabled?(env)
-            assign_url_to_env(env)
-            prepare(env)
-            fetch(env)
-            add(env)
-            push(env)
-          end
-
-          rs
-        end
-
-        private
-
-          def enabled?(env)
-            !env.cached_directories.empty?
-          end
-
-          def casher_cmd
-            "test -f #{CASHER_BIN} && #{config.casher_ruby} #{CASHER_BIN}"
-          end
-
-          def assign_url_to_env(env)
-            urls   = []
-            branch = env.task.branch
-            if branch != 'master'
-              urls << url_for(env, branch)
-            end
-            urls << url_for(env, 'master')
-
-            env.cache_fetch_url = urls
-            env.cache_push_url  = url_for(env, branch)
-            env
-          end
-
-          def url_for(env, branch)
-            name = branch
-
-            key =
-              if env.cache_key.empty?
-                "cache"
-              else
-                env.cache_key.join("-").downcase.gsub(/[^a-z0-9_\-.]/, '-')
-              end
-
-            "#{env.task.cache_url_prefix}/#{name}/#{key}.tgz"
-          end
-
-          def prepare(env)
-            cmd = %{
-              export CASHER_DIR=$HOME/.casher &&
-              ( mkdir -p $CASHER_DIR/bin &&
-                /usr/bin/curl #{CASHER_URL} -s -o #{CASHER_BIN} &&
-                chmod +x #{CASHER_BIN} ) ||
-              true
-            }.gsub(/\n/, ' ').gsub(/ +/, ' ')
-            env.init << cmd
-          end
-
-          def fetch(env)
-            urls = env.cache_fetch_url.join(" ")
-            env.init << "#{casher_cmd} fetch #{urls} || true"
-          end
-
-          def add(env)
-            env.cached_directories.each do |d|
-              env.init << "#{casher_cmd} add #{d} || true"
-            end
-            env.init << "unset CASHER_DIR"
-          end
-
-          def push(env)
-            if env.cache_push_url
-              env.after_script << "#{casher_cmd} push #{env.cache_push_url}"
-            end
-          end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/clojure.rb-e

@@ -1,34 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      class Clojure < Base
-
-        def call(env)
-          if enabled?(env)
-            do_announce(env) do |i|
-              i << trace_sh_command("lein version")
-            end
-
-            do_install(env) do |i|
-              i << trace_sh_command("lein deps")
-            end
-
-            do_script(env) do |i|
-              i << trace_sh_command("lein test")
-            end
-          end
-
-          app.call(env)
-        end
-
-        private
-
-          def enabled?(env)
-            env.source.language == 'clojure'
-          end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/deploy.rb-e

@@ -1,34 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      class Deploy < Base
-
-        def call(env)
-          do_before_deploy(env) do |e|
-            env.source.before_deploy.each do |c|
-              e << trace_sh_command(c)
-            end
-          end
-
-          do_deploy_script(env) do |e|
-            env.source.deploy_modules.each do |m|
-              m.to_commands.each do |c|
-                e << trace_sh_command(c)
-              end
-            end
-          end
-
-          do_after_deploy(env) do |e|
-            env.source.after_deploy.each do |c|
-              e << trace_sh_command(c)
-            end
-          end
-
-          app.call(env)
-        end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/env.rb-e

@@ -1,36 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      class Env < Base
-
-        def call(env)
-          env.init << "set -e"
-          env.init << "export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          env.init << 'export LC_ALL=en_US.UTF8'
-          env.init << 'export DEBIAN_FRONTEND=noninteractive'
-
-          export_vars(env, env.init)
-          export_vars(env, env.after_script_init)
-
-          env.source.env.global.each do |e|
-            env.init << trace_sh_command("export #{e}")
-          end
-          app.call(env)
-        end
-
-        private
-
-          def export_vars(env, collection)
-            collection << "export CI_JOB_ID=#{env.task.job_id}"
-            collection << "export CI_BUILD_ID=#{env.task.build_id}"
-
-            if b = env.task.branch
-              collection << "export CI_BRANCH=#{b}"
-            end
-          end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/java.rb-e

@@ -1,31 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      class Java < Base
-
-        def call(env)
-          if java(env)
-            do_cache_key(env) do |i|
-              i << "jdk-#{java env}"
-            end
-
-            do_before_install(env) do |i|
-              i << "source $(which jdk_switcher.sh)"
-              i << trace_sh_command("jdk_switcher use #{java env}")
-            end
-          end
-
-          app.call(env)
-        end
-
-        private
-
-          def java(env)
-            env.source.jdk.first
-          end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/prepare.rb-e

@@ -1,72 +0,0 @@
-require 'vx/common'
-
-module Vx
-  module Builder
-    class Script
-
-      Prepare = Struct.new(:app) do
-
-        include Helper::TraceShCommand
-        include Common::Helper::UploadShCommand
-
-        def call(env)
-          name         = env.task.name
-          deploy_key   = env.task.deploy_key
-
-          repo_path    = "${VX_ROOT}/code/#{name}"
-          data_path    = "${VX_ROOT}/data/#{name}"
-          key_file     = "#{data_path}/key"
-          git_ssh_file = "#{data_path}/git_ssh"
-
-          sha          = env.task.sha
-          scm          = build_scm(env, sha, repo_path)
-          git_ssh      = scm.git_ssh_content(deploy_key && "#{key_file}")
-
-          env.init.tap do |i|
-            i << 'export VX_ROOT=$(pwd)'
-
-            i << "mkdir -p #{data_path}"
-            i << "mkdir -p #{repo_path}"
-
-            if deploy_key
-              i << upload_sh_command(key_file, deploy_key)
-              i << "chmod 0600 #{key_file}"
-              i << "export VX_PRIVATE_KEY=#{key_file}"
-            end
-
-            i << upload_sh_command(git_ssh_file, git_ssh)
-            i << "chmod 0750 #{git_ssh_file}"
-
-            i << "export GIT_SSH=#{git_ssh_file}"
-            i << scm.fetch_cmd
-            i << "unset GIT_SSH"
-
-            i << 'echo "Starting SSH Agent"'
-            i << 'eval "$(ssh-agent)"'
-            i << "ssh-add $VX_PRIVATE_KEY"
-
-            i << "cd #{repo_path}"
-          end
-
-          env.after_script_init.tap do |i|
-            i << 'export VX_ROOT=$(pwd)'
-            i << "cd #{repo_path}"
-          end
-
-          app.call env
-        end
-
-        private
-
-          def build_scm(env, sha, path)
-            Common::Git.new(env.task.src,
-                         sha,
-                         path,
-                         branch: env.task.branch,
-                         pull_request_id: env.task.pull_request_id)
-          end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/ruby.rb-e

@@ -1,80 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      class Ruby < Base
-
-        DEFAULT_RUBY = '1.9.3'
-
-        def call(env)
-          if enabled?(env)
-            do_cache_key(env) do |i|
-              i << "rvm-#{ruby env}"
-              i << gemfile(env)
-            end
-
-            do_before_install(env) do |i|
-              i << 'eval "$(rbenv init -)" || true'
-              i << "rbenv shell #{make_rbenv_version_command env}"
-              i << trace_sh_command("export BUNDLE_GEMFILE=${PWD}/#{gemfile(env)}")
-              i << trace_sh_command('export GEM_HOME=~/.rubygems')
-            end
-
-            do_announce(env) do |i|
-              i << trace_sh_command("ruby --version")
-              i << trace_sh_command("gem --version")
-              i << trace_sh_command("bundle --version")
-            end
-
-            do_install(env) do |i|
-              bundler_args = env.source.bundler_args.first
-              i << trace_sh_command("bundle install #{bundler_args}")
-              i << trace_sh_command("bundle clean --force")
-            end
-
-            do_script(env) do |i|
-              script = "if [ -f Rakefile ] ; then \n #{trace_sh_command "bundle exec rake"}\nfi"
-              i << script
-            end
-
-            do_cached_directories(env) do |i|
-              i << "~/.rubygems"
-            end
-          end
-
-          app.call(env)
-        end
-
-        private
-
-          def enabled?(env)
-            env.source.rvm.first || env.source.language == 'ruby'
-          end
-
-          def ruby(env)
-            env.source.rvm.first || DEFAULT_RUBY
-          end
-
-          def gemfile(env)
-            env.source.gemfile.first || "Gemfile"
-          end
-
-          def make_rbenv_version_command(env)
-            select_rbenv_version(env)
-          end
-
-          def select_rbenv_version(env)
-            %{
-              $(rbenv versions |
-                sed -e 's/^\*/ /' |
-                awk '{print $1}' |
-                grep -v 'system' |
-                grep '#{ruby env}' |
-                tail -n1)
-            }.gsub(/\n/, ' ').gsub(/ +/, ' ').strip
-          end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/scala.rb-e

@@ -1,50 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      class Scala < Base
-
-        DEFAULT_SCALA = '2.10.3'
-
-        def call(env)
-          if enabled?(env)
-            do_cache_key(env) do |i|
-              i << "scala-#{scala env}"
-            end
-
-            do_announce(env) do |i|
-              i << trace_sh_command("export SCALA_VERSION=#{scala env}")
-            end
-
-            do_install(env) do |i|
-              i << "if [[ -d project || -f build.sbt ]] ; then #{trace_sh_command "sbt ++#{scala env} update"} ; fi"
-            end
-
-            do_script(env) do |i|
-              i << "if [[ -d project || -f build.sbt ]] ; then #{trace_sh_command "sbt ++#{scala env} test"} ; fi"
-            end
-
-            do_cached_directories(env) do |i|
-              i << "~/.sbt"
-              i << "~/.ivy2"
-            end
-          end
-
-          app.call(env)
-        end
-
-        private
-
-          def enabled?(env)
-            env.source.scala.first || env.source.language == 'scala'
-          end
-
-          def scala(env)
-            env.source.scala.first || DEFAULT_SCALA
-          end
-
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/script.rb-e

@@ -1,32 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      Script = Struct.new(:app) do
-
-        include Helper::TraceShCommand
-
-        def call(env)
-          env.source.before_install.each do |c|
-            env.before_install << trace_sh_command(c)
-          end
-
-          env.source.before_script.each do |c|
-            env.before_script << trace_sh_command(c)
-          end
-
-          env.source.script.each do |c|
-            env.script << trace_sh_command(c)
-          end
-
-          env.source.after_success.each do |c|
-            env.after_success << trace_sh_command(c)
-          end
-
-          app.call(env)
-        end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script_builder/services.rb-e

@@ -1,26 +0,0 @@
-module Vx
-  module Builder
-    class Script
-
-      class Services < Base
-
-        ALIASES = {
-          'rabbitmq' => 'rabbitmq-server'
-        }
-
-        def call(env)
-          env.source.services.each do |srv|
-            srv = ALIASES[srv] || srv
-            env.init << trace_sh_command("sudo service #{srv} start")
-          end
-          unless env.source.services.empty?
-            env.init << trace_sh_command("sleep 3")
-          end
-
-          app.call(env)
-        end
-
-      end
-    end
-  end
-end