vx-builder 0.2.2 → 0.3.0

data/spec/lib/builder/{script → script_builder}/cache_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Vx::Builder::Script::Cache do
+describe Vx::Builder::ScriptBuilder::Cache do
   let(:app)    { ->(env) { env } }
   let(:script) { described_class.new app }
   let(:env)    { create :env }

data/spec/lib/builder/{script → script_builder}/clojure_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Vx::Builder::Script::Clojure do
+describe Vx::Builder::ScriptBuilder::Clojure do
   let(:app)    { ->(env) { env } }
   let(:script) { described_class.new app }
   let(:source) { create :source, name: "clojure.yml" }

data/spec/lib/builder/{script → script_builder}/env_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Vx::Builder::Script::Env do
+describe Vx::Builder::ScriptBuilder::Env do
   let(:app)    { ->(_) { 0 } }
   let(:script) { described_class.new app }
   let(:env)    { create :env }

data/spec/lib/builder/{script → script_builder}/java_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Vx::Builder::Script::Java do
+describe Vx::Builder::ScriptBuilder::Java do
   let(:app)    { ->(env) { env } }
   let(:script) { described_class.new app }
   let(:source) { create :source, name: "scala.yml" }

data/spec/lib/builder/{script → script_builder}/prepare_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'tmpdir'
 require 'fileutils'
 
-describe Vx::Builder::Script::Prepare do
+describe Vx::Builder::ScriptBuilder::Prepare do
   let(:app)    { ->(_) { 0 } }
   let(:script) { described_class.new app }
   let(:env)    { create :env }
@@ -15,7 +15,7 @@ describe Vx::Builder::Script::Prepare do
 
   it { should eq 0 }
 
-  context "run it" do
+  context "run it", git: true do
     let(:command) { create :command_from_env, env: env }
     before { run }
 

data/spec/lib/builder/{script → script_builder}/ruby_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Vx::Builder::Script::Ruby do
+describe Vx::Builder::ScriptBuilder::Ruby do
   let(:app)    { ->(env) { env } }
   let(:script) { described_class.new app }
   let(:env)    { create :env }

data/spec/lib/builder/{script → script_builder}/scala_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Vx::Builder::Script::Scala do
+describe Vx::Builder::ScriptBuilder::Scala do
   let(:app)    { ->(env) { env } }
   let(:script) { described_class.new app }
   let(:source) { create :source, name: "scala.yml" }

data/spec/lib/builder/{script_spec.rb → script_builder_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Vx::Builder::Script do
+describe Vx::Builder::ScriptBuilder do
   let(:task)   { create :task }
   let(:source) { create :source }
   let(:script) { described_class.new task, source }

data/spec/lib/builder/task_spec.rb

@@ -10,11 +10,9 @@ describe Vx::Builder::Task do
     its(:sha)             { should eq 'b665f90239563c030f1b280a434b3d84daeda1bd' }
     its(:deploy_key)      { should be }
     its(:cache_url_prefix){ should eq 'http://example.com' }
-    its(:artifacts_url_prefix){ should eq 'http://example.com' }
     its(:job_id)          { should eq 1 }
     its(:build_id)        { should eq 12 }
     its(:pull_request_id) { should eq 1 }
-    its(:deploy?)         { should be_true }
   end
 
 end

data/spec/support/create.rb

@@ -8,17 +8,15 @@ def create(name, options = {})
   when :task
     msg = create(:message)
     Vx::Builder::Task.new(
-      job_id:                1,
-      build_id:              12,
-      name:                  'name',
-      src:                   msg.src,
-      sha:                   msg.sha,
-      deploy_key:            msg.deploy_key,
-      branch:                msg.branch,
-      cache_url_prefix:      "http://example.com",
-      artifacts_url_prefix:  "http://example.com",
-      pull_request_id:       options[:pull_request_id],
-      deploy:                options[:deploy]
+      job_id:           1,
+      build_id:         12,
+      name:             'name',
+      src:              msg.src,
+      sha:              msg.sha,
+      deploy_key:       msg.deploy_key,
+      branch:           msg.branch,
+      cache_url_prefix: "http://example.com",
+      pull_request_id:  options[:pull_request_id]
     )
 
   when :source
@@ -49,5 +47,20 @@ def create(name, options = {})
     a = ["set -e"]
     a += env.init
     a.join("\n")
+
+  when :build_configuration_with_matrix_values
+    attributes = {
+      "env"            => %w{ FOO=1 BAR=2 },
+      "rvm"            => %w{ 1.8.7 1.9.3 2.0.0 },
+      "scala"          => %w{ 2.9.2 2.10.1 },
+      "before_script"  => "echo before_script",
+      "before_install" => "echo before_install",
+      "script"         => "echo script",
+    }.merge(options)
+    Vx::Builder::BuildConfiguration.new attributes
+
+  when :matrix_builder
+    Vx::Builder::MatrixBuilder.new create(:build_configuration_with_matrix_values, options)
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -124,28 +124,39 @@ files:
 - Rakefile
 - lib/vx/builder.rb
 - lib/vx/builder/build_configuration.rb
-- lib/vx/builder/build_configuration/artifacts.rb
 - lib/vx/builder/build_configuration/cache.rb
 - lib/vx/builder/build_configuration/deploy.rb
-- lib/vx/builder/build_configuration/deploy/provider.rb
+- 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/configuration.rb
+- lib/vx/builder/deploy_builder.rb
 - lib/vx/builder/helper/config.rb
 - lib/vx/builder/helper/trace_sh_command.rb
-- lib/vx/builder/matrix.rb
-- lib/vx/builder/script.rb
-- lib/vx/builder/script/artifacts.rb
-- lib/vx/builder/script/base.rb
-- lib/vx/builder/script/cache.rb
-- lib/vx/builder/script/clojure.rb
-- lib/vx/builder/script/deploy.rb
-- lib/vx/builder/script/env.rb
-- lib/vx/builder/script/java.rb
-- lib/vx/builder/script/prepare.rb
-- lib/vx/builder/script/ruby.rb
-- lib/vx/builder/script/scala.rb
-- lib/vx/builder/script/script.rb
-- lib/vx/builder/script/services.rb
+- 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
@@ -172,18 +183,23 @@ files:
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
 - spec/integration/ruby_spec.rb
+- spec/lib/builder/build_configuration/cache_spec.rb
+- spec/lib/builder/build_configuration/deploy/base_spec.rb
+- 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_spec.rb
 - spec/lib/builder/configuration_spec.rb
-- spec/lib/builder/matrix_spec.rb
-- spec/lib/builder/script/artifacts_spec.rb
-- spec/lib/builder/script/cache_spec.rb
-- spec/lib/builder/script/clojure_spec.rb
-- spec/lib/builder/script/env_spec.rb
-- spec/lib/builder/script/java_spec.rb
-- spec/lib/builder/script/prepare_spec.rb
-- spec/lib/builder/script/ruby_spec.rb
-- spec/lib/builder/script/scala_spec.rb
-- spec/lib/builder/script_spec.rb
+- spec/lib/builder/deploy_builder_spec.rb
+- spec/lib/builder/matrix_builder_spec.rb
+- spec/lib/builder/script_builder/cache_spec.rb
+- spec/lib/builder/script_builder/clojure_spec.rb
+- spec/lib/builder/script_builder/env_spec.rb
+- spec/lib/builder/script_builder/java_spec.rb
+- spec/lib/builder/script_builder/prepare_spec.rb
+- spec/lib/builder/script_builder/ruby_spec.rb
+- spec/lib/builder/script_builder/scala_spec.rb
+- spec/lib/builder/script_builder_spec.rb
 - spec/lib/builder/task_spec.rb
 - spec/lib/builder_spec.rb
 - spec/spec_helper.rb
@@ -239,18 +255,23 @@ test_files:
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
 - spec/integration/ruby_spec.rb
+- spec/lib/builder/build_configuration/cache_spec.rb
+- spec/lib/builder/build_configuration/deploy/base_spec.rb
+- 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_spec.rb
 - spec/lib/builder/configuration_spec.rb
-- spec/lib/builder/matrix_spec.rb
-- spec/lib/builder/script/artifacts_spec.rb
-- spec/lib/builder/script/cache_spec.rb
-- spec/lib/builder/script/clojure_spec.rb
-- spec/lib/builder/script/env_spec.rb
-- spec/lib/builder/script/java_spec.rb
-- spec/lib/builder/script/prepare_spec.rb
-- spec/lib/builder/script/ruby_spec.rb
-- spec/lib/builder/script/scala_spec.rb
-- spec/lib/builder/script_spec.rb
+- spec/lib/builder/deploy_builder_spec.rb
+- spec/lib/builder/matrix_builder_spec.rb
+- spec/lib/builder/script_builder/cache_spec.rb
+- spec/lib/builder/script_builder/clojure_spec.rb
+- spec/lib/builder/script_builder/env_spec.rb
+- spec/lib/builder/script_builder/java_spec.rb
+- spec/lib/builder/script_builder/prepare_spec.rb
+- spec/lib/builder/script_builder/ruby_spec.rb
+- spec/lib/builder/script_builder/scala_spec.rb
+- spec/lib/builder/script_builder_spec.rb
 - spec/lib/builder/task_spec.rb
 - spec/lib/builder_spec.rb
 - spec/spec_helper.rb

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

@@ -1,68 +0,0 @@
-module Vx
-  module Builder
-    class BuildConfiguration
-      class Artifacts
-
-        attr_reader :attributes
-
-        def initialize(new_env)
-          normalize_attributes(new_env)
-        end
-
-        def attributes
-          @attributes
-        end
-
-        def files
-          @files
-        end
-
-        def prefix
-          @options[:prefix]
-        end
-
-        private
-
-          def normalize_attributes(new_env)
-            attrs =
-              case new_env
-              when Array
-                new_env
-              else
-                Array(new_env)
-              end
-
-            extract_options_and_normalize_items(attrs)
-          end
-
-          def extract_options_and_normalize_items(new_env)
-            opts = {}
-            @attributes = []
-            @files      = []
-            env = new_env.inject([]) do |a, e|
-              if e.is_a?(Hash)
-                opts = e
-                @attributes.push e
-              else
-                a.push e.to_s.gsub(/^\.*(\/)/, '')
-                @attributes.push a.last
-                @files.push a.last
-              end
-              a
-            end
-
-            if opts && opts["prefix"]
-              @options = { prefix: opts["prefix"] }
-            else
-              @options = {}
-            end
-
-            [opts, env]
-
-          end
-
-      end
-    end
-  end
-end
-

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

@@ -1,58 +0,0 @@
-module Vx
-  module Builder
-    class BuildConfiguration
-      class Deploy
-
-        class Provider
-
-          attr_reader :name, :options, :on
-
-          def initialize(new_attributes)
-            normalize new_attributes.dup
-          end
-
-          def branch?(branch)
-            return true if on.empty?
-            on.include?(branch)
-          end
-
-          def to_hash
-            options.merge(
-              "provider" => @name,
-              "branch"   => on
-            )
-          end
-
-          def shell?
-            @name == 'shell'
-          end
-
-          def command
-            Array(options["command"])
-          end
-
-          private
-
-            def normalize(new_attributes)
-              @name    = new_attributes.delete("provider")
-              @on      = new_attributes.delete("branch")
-              @options = new_attributes
-
-              @on =
-                case @on
-                when String
-                  [@on]
-                when Array
-                  @on.map(&:to_s)
-                else
-                  []
-                end
-
-            end
-
-        end
-
-      end
-    end
-  end
-end

data/lib/vx/builder/script.rb

@@ -1,145 +0,0 @@
-require 'vx/common'
-
-module Vx
-  module Builder
-    class Script
-
-      autoload :Base,         File.expand_path("../script/base",          __FILE__)
-      autoload :Env,          File.expand_path("../script/env",           __FILE__)
-      autoload :Ruby,         File.expand_path("../script/ruby",          __FILE__)
-      autoload :Java,         File.expand_path("../script/java",          __FILE__)
-      autoload :Scala,        File.expand_path("../script/scala",         __FILE__)
-      autoload :Clojure,      File.expand_path("../script/clojure",       __FILE__)
-      autoload :Script,       File.expand_path("../script/script",        __FILE__)
-      autoload :Prepare,      File.expand_path("../script/prepare",       __FILE__)
-      autoload :Databases,    File.expand_path("../script/databases",     __FILE__)
-      autoload :Cache,        File.expand_path("../script/cache",         __FILE__)
-      autoload :Services,     File.expand_path("../script/services",      __FILE__)
-      autoload :Artifacts,    File.expand_path("../script/artifacts",     __FILE__)
-      autoload :Deploy,       File.expand_path("../script/deploy",        __FILE__)
-
-      include Common::Helper::Middlewares
-
-      middlewares do
-        use Builder::Script::Cache
-        use Builder::Script::Artifacts
-        use Builder::Script::Env
-        use Builder::Script::Services
-        use Builder::Script::Prepare
-        use Builder::Script::Java
-        use Builder::Script::Scala
-        use Builder::Script::Clojure
-        use Builder::Script::Ruby
-        use Builder::Script::Deploy
-        use Builder::Script::Script
-      end
-
-      attr_reader :source, :task
-
-      def initialize(task, source)
-        @source = source
-        @task   = task
-      end
-
-      def image
-        source.image.first
-      end
-
-      def to_before_script
-        a = []
-        a << "\n# init"
-        a += env.init
-
-        a << "\n# before install"
-        a += env.before_install
-
-        a << "\n# announce"
-        a += env.announce
-
-        a << "\n# install"
-        a += env.install
-
-        if deploy?
-          a << "\n# before deploy"
-        else
-          a << "\n# before script"
-        end
-        a += env.before_script
-
-        a.join("\n")
-      end
-
-      def to_after_script
-        a = []
-        a << "\n# after script init"
-        a += env.after_script_init
-
-        if deploy?
-          a << "\n# after deploy"
-        else
-          a << "\n# after script"
-        end
-        a += env.after_script
-        a.join("\n")
-      end
-
-      def to_script
-        a = []
-        if deploy?
-          a << "\n# deploy"
-          a += env.deploy
-        else
-          a << "\n# script"
-          a += env.script
-
-          a << "\n# after success"
-          a += env.after_success
-        end
-
-        a.join("\n")
-      end
-
-      def deploy?
-        task.deploy?
-      end
-
-      private
-
-        def env
-          @env ||= run_middlewares(default_env) {|_| _ }
-        end
-
-        def default_env
-          OpenStruct.new(
-            # initialization, repo does not exists
-            init:               [],
-
-            # before instalation, using for system setup
-            before_install:     [],
-
-            # instalation, using for application setup
-            install:            [],
-
-            # announce software and services version
-            announce:           [],
-
-            before_script:      [],
-            script:             [],
-            after_success:      [],
-
-            after_script_init:  [],
-            after_script:       [],
-
-            before_deploy:      [],
-            deploy:             [],
-
-            source:             source,
-            task:               task,
-            cache_key:          [],
-            cached_directories: []
-          )
-        end
-
-    end
-  end
-end