vx-builder 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77885525e3428656f31703eadeaae66bada00a79
-  data.tar.gz: bb410c3d75561213d19d39b7406672fcddd35b96
+  metadata.gz: 4931a543965ca9828a090a0d2fee1cec1e7bedca
+  data.tar.gz: 916c04fd44e0df9dbb26ed7de24fe356fc58660a
 SHA512:
-  metadata.gz: 00e81d97fc6b8e3a19a3a7828f65c271667cf269f548e77753e39b6bdfd9e2a34acecd8b80568e7a0de15aaf89e76909db10fe88a451675a4063d12bc48ea11c
-  data.tar.gz: ac02d67d24d4e6869c8f27a137ea6cd22bdd4c89292bb3d311773fefee039bfaa7bd721d77e74827400b59a1cac3658c24fb54180ca052e4f63633a752a4e083
+  metadata.gz: fa0e9cc22069c4d13042252a10d08dbeb356ab81800d1dccae33e77504dfe57f062a9ba3b4c1565a8f09e71ce189f8112f0588b77d8542660eb1e6b83db4e44e
+  data.tar.gz: 1e7a835fbfbf8d4b254bfaab6de087b4ecec84ee16cf7407c1ff38c055254c17ca5648b54f264c97f2c1bd8ce161a2afcb1f03395dfbe8b3a6b5680d23379456

data/lib/vx/builder.rb

@@ -3,11 +3,12 @@ require File.expand_path("../builder/version", __FILE__)
 module Vx
   module Builder
     autoload :Source,             File.expand_path("../builder/source",              __FILE__)
-    autoload :Script,             File.expand_path("../builder/script",              __FILE__)
     autoload :Task,               File.expand_path("../builder/task",                __FILE__)
     autoload :Configuration,      File.expand_path("../builder/configuration",       __FILE__)
     autoload :BuildConfiguration, File.expand_path("../builder/build_configuration", __FILE__)
-    autoload :Matrix,             File.expand_path("../builder/matrix",              __FILE__)
+    autoload :MatrixBuilder,      File.expand_path("../builder/matrix_builder",      __FILE__)
+    autoload :DeployBuilder,      File.expand_path("../builder/deploy_builder",      __FILE__)
+    autoload :ScriptBuilder,      File.expand_path("../builder/script_builder",      __FILE__)
 
     module Helper
       autoload :Config, File.expand_path("../builder/helper/config", __FILE__)
@@ -31,5 +32,17 @@ module Vx
       @config = nil
     end
 
+    def matrix(build_configuration)
+      MatrixBuilder.new(build_configuration)
+    end
+
+    def deploy(matrix_builder, options = {})
+      DeployBuilder.new(matrix_builder, options)
+    end
+
+    def script(task, build_configuration)
+      ScriptBuilder.new task, build_configuration
+    end
+
   end
 end

data/lib/vx/builder/build_configuration.rb

@@ -41,15 +41,15 @@ module Vx
         end
       end
 
-      attr_reader :env, :cache, :artifacts, :deploy, :attributes
+      attr_reader :env, :cache, :deploy, :attributes, :deploy_modules
 
       def initialize(new_attributes = {}, matrix_attributes = {})
         new_attributes = {} unless new_attributes.is_a?(Hash)
 
-        @env       = Env.new(new_attributes["env"])
-        @cache     = Cache.new(new_attributes["cache"])
-        @artifacts = Artifacts.new(new_attributes["artifacts"])
-        @deploy    = Deploy.new(new_attributes["deploy"])
+        @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") || []
 
         @matrix_attributes = matrix_attributes
 
@@ -70,11 +70,11 @@ module Vx
       end
 
       def deploy?
-        !deploy.attributes.empty?
+        deploy.attributes.any?
       end
 
-      def deploy_attributes= (val)
-        @deploy = Deploy.new(val)
+      def deploy_modules?
+        deploy_modules.any?
       end
 
       # for tests
@@ -83,10 +83,9 @@ module Vx
       end
 
       def to_hash
-        attributes.merge("env"       => env.attributes)
-                  .merge("cache"     => cache.attributes)
-                  .merge("artifacts" => artifacts.attributes)
-                  .merge("deploy"    => deploy.attributes)
+        attributes.merge("env"    => env.attributes)
+                  .merge("cache"  => cache.attributes)
+                  .merge("deploy" => deploy.attributes)
       end
 
       def to_yaml
@@ -102,7 +101,7 @@ module Vx
       end
 
       def cached_directories
-        @cache.enabled? and @cache.directories
+        cache.enabled? and cache.directories
       end
 
       (ATTRIBUTES - %w{ language }).each do |attr|

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

@@ -13,10 +13,16 @@ module Vx
           @attributes
         end
 
-        def providers
-          @providers ||= @attributes.map do |a|
-            Deploy::Provider.new(a)
+        def find_modules(branch)
+          modules = []
+          Base.loaded.each do |l|
+            attributes.each do |attr|
+              if l.detect(attr)
+                modules << l.new(attr)
+              end
+            end
           end
+          modules.select{ |m| m.branch?(branch) }
         end
 
         private
@@ -28,8 +34,6 @@ module Vx
                 new_env
               when Hash
                 [new_env]
-              when String
-                [new_env]
               else
                 []
               end
@@ -39,18 +43,7 @@ module Vx
 
           def normalize_each(new_env)
             @attributes = []
-            new_env.each do |env|
-              case env
-              when Hash
-                if env["provider"]
-                  @attributes.push env
-                else
-                  @attributes.push env.merge("provider" => "shell")
-                end
-              when String
-                @attributes.push("provider" => "shell", "command" => env)
-              end
-            end
+            @attributes = new_env.select{|i| i.is_a?(Hash) }
           end
 
       end

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

@@ -0,0 +1,64 @@
+module Vx
+  module Builder
+    class BuildConfiguration
+      class Deploy
+
+        class Base
+
+          class << self
+
+            @@loaded = []
+
+            def loaded
+              @@loaded
+            end
+
+            def provide(val)
+              loaded.push self
+              @key = val
+            end
+
+            def key
+              @key
+            end
+
+            def detect(params)
+              params.key?(key.to_s) if key
+            end
+          end
+
+          attr_reader :params, :branch
+
+          def initialize(params)
+            @params = params.is_a?(Hash) ? params : {}
+            self.branch = params["branch"]
+          end
+
+          def branch=(value)
+            @branch = Array(value).map(&:to_s)
+          end
+
+          def branch?(name)
+            if branch.empty?
+              true
+            else
+              branch.include?(name)
+            end
+          end
+
+          def key
+            if self.class.key
+              Array(params[self.class.key.to_s])
+            end
+          end
+
+          def to_commands
+            nil
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require File.expand_path("../base", __FILE__)
+
+module Vx
+  module Builder
+    class BuildConfiguration
+      class Deploy
+
+        class Shell < Base
+
+          provide :shell
+
+          def to_commands
+            key.map(&:to_s)
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -23,16 +23,23 @@ module Vx
 
             @attributes =
               case new_env
+              when String
+                {
+                  "matrix" => [],
+                  "global" => Array(new_env)
+                }
               when Hash
                 {
                   "matrix" => Array(new_env['matrix']),
                   "global" => Array(new_env['global'])
                 }
               else
-                {
-                  "matrix" => Array(new_env).flatten.map(&:to_s),
-                  "global" => []
-                }
+                env = Array(new_env).flatten.map(&:to_s)
+                if env.size == 1
+                  { "matrix" => [], "global" => env }
+                else
+                  { "matrix" => env, "global" => [] }
+                end
               end
 
           end

data/lib/vx/builder/deploy_builder.rb

@@ -0,0 +1,59 @@
+module Vx
+  module Builder
+    class DeployBuilder
+
+      BLACK_LIST = %w{
+        image
+        before_script
+        after_success
+        script
+      }
+
+      attr_reader :base_build_configuration, :matrix_build_configuration, :branch
+
+      def initialize(matrix_builder, options = {})
+        @base_build_configuration    = matrix_builder.build_configuration
+        @matrix_build_configuration  = matrix_builder.build.first
+        @branch                      = options[:branch]
+      end
+
+      def build
+        @build ||= begin
+          return false unless valid?
+
+          hash = matrix_build_configuration.to_hash
+
+          BLACK_LIST.each do |key|
+            hash.delete key
+          end
+
+          hash["env"]["matrix"] = []
+
+          BuildConfiguration.new(
+            hash.merge(
+              "deploy_modules" => deploy_modules,
+              "deploy"         => nil
+            )
+          )
+        end
+      end
+
+      def valid?
+        deploy? and deploy_modules.any?
+      end
+
+      def deploy_modules
+        @deploy_modules ||= deploy.find_modules(branch)
+      end
+
+      def deploy
+        base_build_configuration.deploy
+      end
+
+      def deploy?
+        deploy.attributes.any?
+      end
+
+    end
+  end
+end

data/lib/vx/builder/{matrix.rb → matrix_builder.rb}

@@ -1,6 +1,6 @@
 module Vx
   module Builder
-    Matrix = Struct.new(:build_configuration) do
+    MatrixBuilder = Struct.new(:build_configuration) do
 
       KEYS = %w{
         rvm
@@ -16,24 +16,12 @@ module Vx
         extract_keys_from_builds_configuration.map(&:first).sort
       end
 
-      def build_configurations
-        new_attributes = build_configuration.to_hash.dup
-        attributes_for_new_build_configurations_with_merged_env.map do |matrix_attributes|
-          new_attributes.merge!(matrix_attributes)
-          BuildConfiguration.new new_attributes, matrix_attributes
-        end
-      end
-
-      def deploy_configuration(branch)
-        return unless build_configuration.deploy?
-
-        availabled_providers = build_configuration.deploy.providers.select do |provider|
-          provider.branch?(branch)
-        end
-
-        unless availabled_providers.empty?
-          build_configurations.first.dup.tap do |config|
-            config.deploy_attributes = availabled_providers.map(&:to_hash)
+      def build
+        @build ||= begin
+          new_attributes = build_configuration.to_hash.dup
+          attributes_for_new_build_configurations_with_merged_env.map do |matrix_attributes|
+            new_attributes.merge!(matrix_attributes)
+            BuildConfiguration.new new_attributes, matrix_attributes
           end
         end
       end
@@ -44,7 +32,7 @@ module Vx
         attrs.map! do |a|
           env = a["env"]
           a["env"] = {
-            "global" => Array(env) + build_configuration.env.global,
+            "global" => build_configuration.env.global,
             "matrix" => Array(env)
           }
           a

data/lib/vx/builder/script_builder.rb

@@ -0,0 +1,127 @@
+require 'vx/common'
+
+module Vx
+  module Builder
+    class ScriptBuilder
+
+      autoload :Base,         File.expand_path("../script_builder/base",      __FILE__)
+      autoload :Env,          File.expand_path("../script_builder/env",       __FILE__)
+      autoload :Ruby,         File.expand_path("../script_builder/ruby",      __FILE__)
+      autoload :Java,         File.expand_path("../script_builder/java",      __FILE__)
+      autoload :Scala,        File.expand_path("../script_builder/scala",     __FILE__)
+      autoload :Clojure,      File.expand_path("../script_builder/clojure",   __FILE__)
+      autoload :Script,       File.expand_path("../script_builder/script",    __FILE__)
+      autoload :Prepare,      File.expand_path("../script_builder/prepare",   __FILE__)
+      autoload :Databases,    File.expand_path("../script_builder/databases", __FILE__)
+      autoload :Cache,        File.expand_path("../script_builder/cache",     __FILE__)
+      autoload :Services,     File.expand_path("../script_builder/services",  __FILE__)
+      autoload :Deploy,       File.expand_path("../script_builder/deploy",    __FILE__)
+
+      include Common::Helper::Middlewares
+
+      middlewares do
+        use Builder::ScriptBuilder::Cache
+        use Builder::ScriptBuilder::Env
+        use Builder::ScriptBuilder::Services
+        use Builder::ScriptBuilder::Prepare
+        use Builder::ScriptBuilder::Java
+        use Builder::ScriptBuilder::Scala
+        use Builder::ScriptBuilder::Clojure
+        use Builder::ScriptBuilder::Ruby
+        use Builder::ScriptBuilder::Deploy
+        use Builder::ScriptBuilder::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
+
+        a << "\n# before script"
+        a += env.before_script
+
+        a.join("\n")
+      end
+
+      def to_after_script
+        a = []
+        a << "\n# after script init"
+        a += env.after_script_init
+
+        a << "\n# after script"
+        a += env.after_script
+        a.join("\n")
+      end
+
+      def to_script
+        a = []
+
+        a << "\n# script"
+        a += env.script
+
+        a << "\n# after success"
+        a += env.after_success
+
+        a.join("\n")
+      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