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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/evrone/ci/router/script_builder/webdav_cache.rb +3 -7
  3. data/lib/evrone/ci/router/version.rb +1 -1
  4. data/spec/lib/script_builder/webdav_cache_spec.rb +3 -3
  5. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4cf334ca7780d999da82d083110de69fb5985109
4
- data.tar.gz: a4be0b9b40b980822f47c775a850a46353a99872
3
+ metadata.gz: 5de08301018816f340acfc9b0daf02f474ca9d4d
4
+ data.tar.gz: 8e446fef6cd80d55212749e60396aa3aa4c02a60
5
5
  SHA512:
6
- metadata.gz: 2c001563d39698c83d532272e48a385fdd7372c721655772a8e843beb560b3c4242c025d080900c3ab7420a626a2cde3b9ca1a1912fa1c29a37bcea95b862f1c
7
- data.tar.gz: c4fe2c98e7b4d5df2fc8abd20b038759aa7d3457aed489ce623ba270fb8f5e0ef5a915400677aee2cd93813757a8da484f9fa270b56665b5c29298b6d9eea3b3
6
+ metadata.gz: 2c32ec7b7873e6fafc14fef8be33e38d17daabfaf60bfc26cbb2b25cfd8637bc9e8cb8becf8d482aa29542bd28635e6cb81d75fdfed2ca7816b0cc964a734f6c
7
+ data.tar.gz: 4fc6a30cdfa46cad14a345a97d3370ce64d6e3fb38b2b3696a0846e1427c183cb04b6cbc5f97cb33b874b1220d38872305a6d0728cfc6ccc8fb6befd277b2690
data/lib/evrone/ci/router/script_builder/webdav_cache.rb CHANGED
@@ -42,14 +42,10 @@ module Evrone
42
42
  end
43
43
 
44
44
  def url_for(env, branch)
45
- name = []
45
+ name = env.build.message.name.dup + "/" + branch
46
46
 
47
- name << env.build.message.name.dup
48
- name << branch
49
- name += env.cache_key
50
-
51
- name = name.join("-").gsub(/[^a-z0-9_\-.]/, '-')
52
- "#{config.webdav_cache_url}/#{name}.tgz"
47
+ key = env.cache_key.join("-").gsub(/[^a-z0-9_\-.]/, '-')
48
+ "#{config.webdav_cache_url}/#{name}/#{key}.tgz"
53
49
  end
54
50
 
55
51
  def prepare(env)
data/lib/evrone/ci/router/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Evrone
2
2
  module CI
3
3
  class Router
4
- VERSION = "0.2.0.pre24"
4
+ VERSION = "0.2.0.pre25"
5
5
  end
6
6
  end
7
7
  end
data/spec/lib/script_builder/webdav_cache_spec.rb CHANGED
@@ -32,10 +32,10 @@ describe Evrone::CI::Router::ScriptBuilder::WebdavCache do
32
32
  it { should eq env }
33
33
  its(:init) { should_not be_empty }
34
34
  its(:after_script) { should_not be_empty }
35
- its(:webdav_push_url) { should eq "http://localhost:8080/evrone-test-repo-feature-rvm-1.9.3.tgz" }
35
+ its(:webdav_push_url) { should eq "http://localhost:8080/evrone/test-repo/feature/rvm-1.9.3.tgz" }
36
36
  its(:webdav_fetch_url) { should eq(
37
- ["http://localhost:8080/evrone-test-repo-feature-rvm-1.9.3.tgz",
38
- "http://localhost:8080/evrone-test-repo-master-rvm-1.9.3.tgz"]
37
+ ["http://localhost:8080/evrone/test-repo/feature-rvm-1.9.3.tgz",
38
+ "http://localhost:8080/evrone/test-repo/master-rvm-1.9.3.tgz"]
39
39
  ) }
40
40
 
41
41
  context "execute command" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: evrone-ci-router
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0.pre24
4
+ version: 0.2.0.pre25
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Galinsky
@@ -16,42 +16,42 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.2.0.pre24
19
+ version: 0.2.0.pre25
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.2.0.pre24
26
+ version: 0.2.0.pre25
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: evrone-ci-message
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.2.0.pre24
33
+ version: 0.2.0.pre25
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.2.0.pre24
40
+ version: 0.2.0.pre25
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: evrone-ci-build_configuration
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 0.2.0.pre24
47
+ version: 0.2.0.pre25
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 0.2.0.pre24
54
+ version: 0.2.0.pre25
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: evrone-common-amqp
57
57
  requirement: !ruby/object:Gem::Requirement