vx-builder 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f98b349ac5e5f3a102fcd18a48ff2ca2f4c981
-  data.tar.gz: 94227f045bda9344db2dd491f850fec6454713eb
+  metadata.gz: 4f388f5d51a408009ccf40e8f4d3d7a335e64e49
+  data.tar.gz: 90887f071d58925f1c82395380b43d6d20368cb7
 SHA512:
-  metadata.gz: ffd85365e4386368d2876160ce25ab21a0fd1e03c5036c12d95c16ffc75de84aef87855e1f8ab2c738a56c20b9c66f6bc7fbc53627a5b918cf497eb3022dc283
-  data.tar.gz: 70166faee2d5f3c6afd12180b547c27cdb1a2ccbcfc13f5e2a93440eedb044610bc00e9479b09e72508831df4e71efdc4a822dd46e4c34c24ea80045724d2e95
+  metadata.gz: 0f5f92fb3b91936043982b9f5c532d6058465f9f5b4df6f707e6fa358bb55157afedb5226b8c4e44de0732986bf78fae85009359a3dcdefe5f7d690e332a3d15
+  data.tar.gz: 46de92052fb9323fa78825693d568b78da5b03d2ce5e85ad0008ce4adadce5e9eb9c78e798f8185a809725ce3e89edc15b82be4b6c6b2dc46896faf5eadc5385

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
   - 2.0.0
-  - 2.1.0
+  - 2.1.2
 
 script: bundle exec rake

data/lib/vx/builder/build_configuration.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 
-Dir[File.expand_path("../build_configuration/*.rb", __FILE__)].each do |f|
+Dir[File.expand_path("../build_configuration/**/*.rb", __FILE__)].each do |f|
   require f
 end
 
@@ -23,6 +23,9 @@ module Vx
         before_script
         script
         after_success
+
+        before_deploy
+        after_deploy
       }
 
       class << self
@@ -38,7 +41,7 @@ module Vx
         end
       end
 
-      attr_reader :env, :cache, :artifacts, :deploy
+      attr_reader :env, :cache, :artifacts, :deploy, :attributes
 
       def initialize(new_attributes = {}, matrix_attributes = {})
         new_attributes = {} unless new_attributes.is_a?(Hash)
@@ -70,6 +73,10 @@ module Vx
         !deploy.attributes.empty?
       end
 
+      def deploy_attributes= (val)
+        @deploy = Deploy.new(val)
+      end
+
       # for tests
       def matrix_id
         matrix_attributes.to_a.map{|i| i.join(":") }.sort.join(", ")
@@ -106,10 +113,6 @@ module Vx
 
       private
 
-        def attributes
-          @attributes
-        end
-
         def build_attributes(new_attributes)
           @attributes = ATTRIBUTES.inject({}) do |ac, attribute_name|
             attribute = new_attributes[attribute_name]

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

@@ -6,17 +6,22 @@ module Vx
         attr_reader :attributes
 
         def initialize(new_env)
-          normalize_attributes(new_env)
+          normalize(new_env)
+        end
+
+        def attributes
+          @attributes
         end
 
         def providers
-          @providers
+          @providers ||= @attributes.map do |a|
+            Deploy::Provider.new(a)
+          end
         end
-        alias :attributes :providers
 
         private
 
-          def normalize_attributes(new_env)
+          def normalize(new_env)
             attrs =
               case new_env
               when Array
@@ -24,22 +29,26 @@ module Vx
               when Hash
                 [new_env]
               when String
-                [{"command" => new_env}]
+                [new_env]
               else
                 []
               end
 
-            extract_options_and_normalize_items(attrs)
+            normalize_each(attrs)
           end
 
-          def extract_options_and_normalize_items(new_env)
-            @providers = []
+          def normalize_each(new_env)
+            @attributes = []
             new_env.each do |env|
-              case
-              when env["provider"]
-                @providers.push env
-              when env["command"]
-                @providers.push env.merge("provider" => "shell")
+              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
           end

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

@@ -0,0 +1,58 @@
+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/configuration.rb

@@ -9,7 +9,7 @@ module Vx
       self.env_namespace      = 'vx'
       self.raise_missing_keys = true
 
-      define casher_ruby: "/opt/rbenv/versions/1.9.3-p545/bin/ruby"
+      define casher_ruby: "/opt/rbenv/versions/1.9.3-p547/bin/ruby"
 
     end
   end

data/lib/vx/builder/matrix.rb

@@ -24,6 +24,20 @@ module Vx
         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)
+          end
+        end
+      end
+
       def attributes_for_new_build_configurations_with_merged_env
         attrs = attributes_for_new_build_configurations
         attrs = [{}] if attrs.empty?

data/lib/vx/builder/script.rb

@@ -4,6 +4,7 @@ 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__)
@@ -15,6 +16,7 @@ module Vx
       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
 
@@ -28,6 +30,7 @@ module Vx
         use Builder::Script::Scala
         use Builder::Script::Clojure
         use Builder::Script::Ruby
+        use Builder::Script::Deploy
         use Builder::Script::Script
       end
 
@@ -56,8 +59,13 @@ module Vx
         a << "\n# install"
         a += env.install
 
-        a << "\n# before script"
+        if deploy?
+          a << "\n# before deploy"
+        else
+          a << "\n# before script"
+        end
         a += env.before_script
+
         a.join("\n")
       end
 
@@ -65,22 +73,36 @@ module Vx
         a = []
         a << "\n# after script init"
         a += env.after_script_init
-        a << "\n# after script"
+
+        if deploy?
+          a << "\n# after deploy"
+        else
+          a << "\n# after script"
+        end
         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
+        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
@@ -108,6 +130,9 @@ module Vx
             after_script_init:  [],
             after_script:       [],
 
+            before_deploy:      [],
+            deploy:             [],
+
             source:             source,
             task:               task,
             cache_key:          [],

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

@@ -2,9 +2,7 @@ module Vx
   module Builder
     class Script
 
-      Artifacts = Struct.new(:app) do
-
-        include Helper::TraceShCommand
+      class Artifacts < Base
 
         FIND='find . -type f -path "./%s" | sed "s/^\.\///g"'
 

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

@@ -0,0 +1,56 @@
+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?
+            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_before_deploy(env)
+          yield env.before_deploy
+        end
+
+        def do_after_deploy(env)
+          yield env.after_deploy
+        end
+
+        def do_deploy(env)
+          yield env.deploy
+        end
+
+        def deploy?
+          env.task.deploy?
+        end
+      end
+
+    end
+  end
+end

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

@@ -2,24 +2,20 @@ module Vx
   module Builder
     class Script
 
-      Clojure = Struct.new(:app) do
-
-        include Helper::TraceShCommand
+      class Clojure < Base
 
         def call(env)
           if enabled?(env)
-            env.announce.tap do |i|
+            do_announce(env) do |i|
               i << trace_sh_command("lein version")
             end
 
-            env.install.tap do |i|
+            do_install(env) do |i|
               i << trace_sh_command("lein deps")
             end
 
-            if env.source.script.empty?
-              env.script.tap do |i|
-                i << trace_sh_command("lein test")
-              end
+            do_script(env) do |i|
+              i << trace_sh_command("lein test")
             end
           end
 

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

@@ -0,0 +1,40 @@
+module Vx
+  module Builder
+    class Script
+
+      class Deploy < Base
+
+        def call(env)
+          if enabled?(env)
+            env.source.deploy.providers.each do |provider|
+              if provider.shell?
+                deploy_using_shell(env, provider)
+              end
+            end
+          end
+
+          do_before_deploy(env) do |i|
+            i += env.source.before_deploy
+          end
+
+          app.call(env)
+        end
+
+        private
+
+          def enabled?(env)
+            env.task.deploy? && env.source.deploy?
+          end
+
+          def deploy_using_shell(env, provider)
+            do_deploy(env) do |i|
+              provider.command.each do |cmd|
+                i << trace_sh_command(cmd)
+              end
+            end
+          end
+
+      end
+    end
+  end
+end