evrone-ci-router 0.2.0.pre23 → 0.2.0.pre24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 857440d03ba3e8bf50be6caf1aa03368060c200a
-  data.tar.gz: ce9fd7abad14ebbdbb62c6249e6c1a5e034edcee
+  metadata.gz: 4cf334ca7780d999da82d083110de69fb5985109
+  data.tar.gz: a4be0b9b40b980822f47c775a850a46353a99872
 SHA512:
-  metadata.gz: f0e47b15e14ad3e615868ceb7e8b8ac90ca3696b42ff29e21a8ff7ab52ec455961f2182ad4cbef320e5653fea86979d0f36bd0a6ad221b3df28457958cf6cf13
-  data.tar.gz: 788a8ebb7646b4c4b00d62dc8502f7a01353c5f5b24a772685177c5e84144fce21069b6921ea70a8383ad4934a06e7b36495eebc35a8a81acab2f5abf33b2ae0
+  metadata.gz: 2c001563d39698c83d532272e48a385fdd7372c721655772a8e843beb560b3c4242c025d080900c3ab7420a626a2cde3b9ca1a1912fa1c29a37bcea95b862f1c
+  data.tar.gz: c4fe2c98e7b4d5df2fc8abd20b038759aa7d3457aed489ce623ba270fb8f5e0ef5a915400677aee2cd93813757a8da484f9fa270b56665b5c29298b6d9eea3b3

data/lib/evrone/ci/router/script_builder.rb

@@ -90,6 +90,7 @@ module Evrone
 
               configuration:   configuration,
               build:           build,
+              cache_key:       []
             )
           end
 

data/lib/evrone/ci/router/script_builder/ruby.rb

@@ -13,6 +13,8 @@ module Evrone
 
           def call(env)
             if rvm env
+              env.cache_key << "rvm-#{rvm env}"
+
               env.before_install.tap do |i|
                 i << 'eval "$(rbenv init -)" || true'
                 i << "rbenv shell #{make_rbenv_version_command env}"

data/lib/evrone/ci/router/script_builder/webdav_cache.rb

@@ -12,6 +12,8 @@ module Evrone
           CASHER_BIN = "$HOME/.casher/bin/casher"
 
           def call(env)
+            rs = app.call env
+
             if config.webdav_cache_url
               assign_url_to_env(env)
               prepare(env)
@@ -19,24 +21,35 @@ module Evrone
               add(env)
               push(env)
             end
-            app.call env
+
+            rs
           end
 
           private
 
             def assign_url_to_env(env)
-              name = []
-              name << env.build.message.name.dup
+              urls   = []
+              branch = env.build.message.branch
+              if branch != 'master'
+                urls << url_for(env, branch)
+              end
+              puts urls.inspect
+              urls << url_for(env, 'master')
 
-              # convert keys from ["rvm:2.0.0"] to "rvm 2.0.0"
-              name += env.configuration.matrix_keys.map{|i| i.split(":").join(" ") }
-              # replace non word chars to ' '
-              name = name.join("-").gsub(/[^a-z0-9_\-.]/, ' ')
+              env.webdav_fetch_url = urls
+              env.webdav_push_url  = url_for(env, branch)
+              env
+            end
+
+            def url_for(env, branch)
+              name   = []
 
-              name = name.strip().gsub(/ +/, '-').downcase
-              name << ".tgz"
+              name << env.build.message.name.dup
+              name << branch
+              name += env.cache_key
 
-              env.webdav_cache_url = "#{config.webdav_cache_url}/#{name}"
+              name = name.join("-").gsub(/[^a-z0-9_\-.]/, '-')
+              "#{config.webdav_cache_url}/#{name}.tgz"
             end
 
             def prepare(env)
@@ -51,8 +64,8 @@ module Evrone
             end
 
             def fetch(env)
-              env.init << "echo fetch cached content"
-              env.init << "#{CASHER_BIN} fetch #{env.webdav_cache_url} || true"
+              urls = env.webdav_fetch_url.join(" ")
+              env.init << "#{CASHER_BIN} fetch #{urls} || true"
             end
 
             def add(env)
@@ -61,8 +74,9 @@ module Evrone
             end
 
             def push(env)
-              env.after_script << "echo push cached content"
-              env.after_script << "#{CASHER_BIN} push #{env.webdav_cache_url}"
+              if env.webdav_push_url
+                env.after_script << "#{CASHER_BIN} push #{env.webdav_push_url}"
+              end
             end
 
         end

data/lib/evrone/ci/router/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     class Router
-      VERSION = "0.2.0.pre23"
+      VERSION = "0.2.0.pre24"
     end
   end
 end

data/spec/lib/script_builder/webdav_cache_spec.rb

@@ -5,9 +5,15 @@ require 'fileutils'
 describe Evrone::CI::Router::ScriptBuilder::WebdavCache do
   let(:path)   { '/tmp/.test' }
   let(:app)    { ->(_) { _ } }
-  let(:build)  { create :build }
+  let(:build)  { create :build, branch: "feature" }
   let(:config) { create :configuration }
-  let(:env)    { OpenStruct.new build: build, init: [], configuration: config, after_script: [] }
+  let(:env)    { OpenStruct.new(
+    build: build,
+    init: [],
+    configuration: config,
+    after_script: [],
+    cache_key: ['rvm-1.9.3']
+  )}
   let(:mid)    { described_class.new app }
 
   subject { mid.call env }
@@ -26,7 +32,11 @@ describe Evrone::CI::Router::ScriptBuilder::WebdavCache do
   it { should eq env }
   its(:init)             { should_not be_empty }
   its(:after_script)     { should_not be_empty }
-  its(:webdav_cache_url) { should eq "http://localhost:8080/evrone-test-repo-rvm-2.0.0.tgz" }
+  its(:webdav_push_url)  { should eq "http://localhost:8080/evrone-test-repo-feature-rvm-1.9.3.tgz" }
+  its(:webdav_fetch_url) { should eq(
+    ["http://localhost:8080/evrone-test-repo-feature-rvm-1.9.3.tgz",
+     "http://localhost:8080/evrone-test-repo-master-rvm-1.9.3.tgz"]
+  ) }
 
   context "execute command" do
     include Evrone::Common::Spawn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-router
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre23
+  version: 0.2.0.pre24
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre23
+        version: 0.2.0.pre24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre23
+        version: 0.2.0.pre24
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre23
+        version: 0.2.0.pre24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre23
+        version: 0.2.0.pre24
 - !ruby/object:Gem::Dependency
   name: evrone-ci-build_configuration
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre23
+        version: 0.2.0.pre24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre23
+        version: 0.2.0.pre24
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement