vx-builder 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b253cffa5e036ddd0fb814840cf117f33f282f
-  data.tar.gz: d2d046cb4c403a212810654fd4b9dfe7a35a07e1
+  metadata.gz: 2f04d4731464414b121f1418f4fada916c797e3b
+  data.tar.gz: 1d7c01fe5104d38d215cfb806245943376d8d39a
 SHA512:
-  metadata.gz: 05d0a7efa18bd2bd798703874cc8604e33e0debf81df8219bb082a576f01984ee747247c8200560994a05d5df0d3052a38d5dde190657c52696d031e71444edf
-  data.tar.gz: e95b0904223534d3ae08b96cf7c51429d1a337ce1a109bd0191598245dde5738744948aed6a96e4c6252967796ffa0301f828055f15648ee47292f7cda0188d3
+  metadata.gz: 54df9e7aa3c473ae2564e07b4f8bf4acd6917d98c46bdd551bdbddda5c88b22bd2d5501891f66a0e8f916f84b2763336e85e6f0e862ff16594bdcaeb51c0bbb6
+  data.tar.gz: 527e9b0e283e7976ed50e04b7dede18412345711165f9bfbb9098624c823c282b31a507e3a5d68586e0693d816081152b440a8ae368afb283a2f1fcb268c2098

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

@@ -0,0 +1,38 @@
+module Vx
+  module Builder
+    class BuildConfiguration
+      class Artifacts
+
+        attr_reader :attributes
+
+        def initialize(new_env)
+          normalize_attributes(new_env)
+        end
+
+        def artifacts
+          @attributes
+        end
+
+        private
+
+          def normalize_attributes(new_env)
+
+            @attributes =
+              case new_env
+              when Array
+                new_env.map(&:to_s)
+              else
+                Array(new_env).map(&:to_s)
+              end
+
+            @attributes.map! do |attr|
+              attr.gsub(/^\.*(\/)/, '')
+            end
+
+          end
+
+      end
+    end
+  end
+end
+

data/lib/vx/builder/build_configuration.rb

@@ -37,13 +37,15 @@ module Vx
         end
       end
 
-      attr_reader :env, :cache
+      attr_reader :env, :cache, :artifacts
 
       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"])
+        @env       = Env.new(new_attributes["env"])
+        @cache     = Cache.new(new_attributes["cache"])
+        @artifacts = Artifacts.new(new_attributes["artifacts"])
+
         @matrix_attributes = matrix_attributes
 
         build_attributes new_attributes
@@ -68,8 +70,9 @@ module Vx
       end
 
       def to_hash
-        attributes.merge("env"   => env.attributes)
-                  .merge("cache" => cache.attributes)
+        attributes.merge("env"       => env.attributes)
+                  .merge("cache"     => cache.attributes)
+                  .merge("artifacts" => artifacts.attributes)
       end
 
       def to_yaml

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

@@ -0,0 +1,111 @@
+module Vx
+  module Builder
+    class Script
+
+      Artifacts = Struct.new(:app) do
+
+        include Helper::TraceShCommand
+
+        FIND='find . -type f -path "./%s" | sed "s/^\.\///g"'
+
+        def call(env)
+          rs = app.call env
+
+          if enabled?(env)
+            env.after_success << "echo"
+            env.source.artifacts.attributes.map{|a| compile(a) }.each do |artifact|
+              find = FIND % artifact
+              prefix = env.task.artifacts_url_prefix
+              cmd = %{
+                for i in $(#{find}) ; do
+                  echo "upload artifact $i"
+                  curl -s -S -X PUT -T $i #{prefix}/$i > /dev/null
+                done
+              }
+              env.after_success << cmd
+            end
+            env.after_success << "echo"
+          end
+
+          rs
+        end
+
+        private
+
+          def compile(artifact)
+            case
+            when artifact.end_with?("/")
+              "#{artifact}*"
+            else
+              artifact
+            end
+          end
+
+          def enabled?(env)
+            !env.source.artifacts.attributes.empty? &&
+              env.task.artifacts_url_prefix
+          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/script.rb

@@ -17,7 +17,7 @@ module Vx
             env.script << trace_sh_command(c)
           end
           env.source.after_success.each do |c|
-            env.script << trace_sh_command(c)
+            env.after_success << trace_sh_command(c)
           end
           app.call(env)
         end

data/lib/vx/builder/script.rb

@@ -14,11 +14,13 @@ module Vx
       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__)
 
       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
@@ -70,6 +72,10 @@ module Vx
         a = []
         a << "\n# script"
         a += env.script
+
+        a << "\n# after success"
+        a += env.after_success
+
         a.join("\n")
       end
 
@@ -95,6 +101,7 @@ module Vx
 
             before_script:      [],
             script:             [],
+            after_success:      [],
             after_script:       [],
 
             source:             source,

data/lib/vx/builder/task.rb

@@ -3,16 +3,17 @@ module Vx
     class Task
 
       attr_reader :name, :src, :sha, :deploy_key, :branch, :pull_request_id,
-        :cache_url_prefix
+        :cache_url_prefix, :artifacts_url_prefix
 
       def initialize(name, src, sha, options = {})
-        @name             = name
-        @src              = src
-        @sha              = sha
-        @deploy_key       = options[:deploy_key]
-        @branch           = options[:branch]
-        @pull_request_id  = options[:pull_request_id]
-        @cache_url_prefix = options[:cache_url_prefix]
+        @name                 = name
+        @src                  = src
+        @sha                  = sha
+        @deploy_key           = options[:deploy_key]
+        @branch               = options[:branch]
+        @pull_request_id      = options[:pull_request_id]
+        @cache_url_prefix     = options[:cache_url_prefix]
+        @artifacts_url_prefix = options[:artifacts_url_prefix]
 
         validate!
       end

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.0.28"
+    VERSION = "0.0.29"
   end
 end

data/spec/fixtures/travis.yml

@@ -30,3 +30,7 @@ cache:
   directories:
   - ~/.cache
 
+artifacts:
+  - ../app/foo.txt
+  - /app/*.txt
+  - app/

data/spec/lib/builder/build_configuration_spec.rb

@@ -42,7 +42,8 @@ describe Vx::Builder::BuildConfiguration do
        "rvm"            => ["2.0.0"],
        "scala"          => ['2.10.3'],
        "script"         => ["RAILS_ENV=test ls -1 && echo DONE!"],
-       "services"       => ['rabbitmq']
+       "services"       => ['rabbitmq'],
+       "artifacts"      => ["app/foo.txt", "app/*.txt", "app/"]
       }
     ) }
   end
@@ -96,4 +97,13 @@ describe Vx::Builder::BuildConfiguration do
     end
   end
 
+  context "artifacts" do
+    subject { config.artifacts }
+
+    context "when is empty" do
+      let(:content) { {} }
+      its(:attributes) { should eq [] }
+    end
+  end
+
 end

data/spec/lib/builder/script/artifacts_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Vx::Builder::Script::Artifacts do
+  let(:app)    { ->(env) { 0 } }
+  let(:script) { described_class.new app }
+  let(:task)   {  }
+  let(:env)    { create :env }
+  let(:run)    { script.call env }
+  subject { run }
+
+  it { should eq 0 }
+
+  it "should create upload script" do
+    subject
+    expect(env.after_success).to_not be_empty
+  end
+
+end

data/spec/support/create.rb

@@ -13,7 +13,8 @@ def create(name, options = {})
       msg.sha,
       deploy_key: msg.deploy_key,
       branch:     msg.branch,
-      cache_url_prefix: "http://example.com/"
+      cache_url_prefix: "http://example.com/",
+      artifacts_url_prefix: "http://example.com/"
     )
 
   when :source
@@ -30,6 +31,7 @@ def create(name, options = {})
       script:         [],
       after_script:   [],
       source:         options[:source] || create(:source),
+      after_success:  [],
       task:           create(:task),
       cache_key:      [],
       cached_directories: []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -124,6 +124,7 @@ 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/env.rb
 - lib/vx/builder/configuration.rb
@@ -131,6 +132,7 @@ files:
 - 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/cache.rb
 - lib/vx/builder/script/clojure.rb
 - lib/vx/builder/script/env.rb
@@ -150,6 +152,7 @@ files:
 - 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
@@ -197,6 +200,7 @@ test_files:
 - 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