travis-config 1.0.12 → 1.0.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -0
- data/lib/travis/config.rb +0 -6
- data/lib/travis/config/heroku/url.rb +12 -1
- data/lib/travis/config/version.rb +1 -1
- data/spec/travis/config/heroku/amqp_spec.rb +1 -0
- data/spec/travis/config_spec.rb +2 -2
- metadata +13 -16
- data/Gemfile.lock +0 -40
- data/travis-config.gemspec +0 -22
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0997a79b3e1da9db64c9cba5b94b5b2d51621e32
|
4
|
+
data.tar.gz: 9369e30f3ff7a61fd27676c78fff5ea4dbf726f7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3530a85d18b1150fde81ab80cb0395c142a43794ac494632a82997eb67e92b017a18a328af3c33880519ed91983feaec7be1b1b577e484014eabff1e28c0178e
|
7
|
+
data.tar.gz: bd0ba8452584938c3f7f79ce747bf3d1ae881f1cd98b6ace2d1d837c5b22b3c0e52a77cc82e940a6d62ff0e7524e93bc50880f5fd09f4d36e6f9a3ebd03440ad
|
data/README.md
CHANGED
@@ -2,6 +2,8 @@
|
|
2
2
|
|
3
3
|
Shared way of loading and reading configuration in Travis CI.
|
4
4
|
|
5
|
+
Internal documentation for Travis CI Builders on how configs are loaded for Travis apps can be found [here](https://github.com/travis-pro/team-teal/wiki/How-config-files-are-handled). (not publicly accessible)
|
6
|
+
|
5
7
|
Users can either set defaults and include logic directly to the class
|
6
8
|
`Travis::Config` or extend the class to, e.g. `Travis::Logs::Config`.
|
7
9
|
|
data/lib/travis/config.rb
CHANGED
@@ -18,7 +18,6 @@ module Travis
|
|
18
18
|
|
19
19
|
def load(*names)
|
20
20
|
config = load_from(*names)
|
21
|
-
config = normalize(config)
|
22
21
|
new(config)
|
23
22
|
end
|
24
23
|
|
@@ -34,11 +33,6 @@ module Travis
|
|
34
33
|
names = [:files, :env, :heroku, :docker] if names.empty?
|
35
34
|
names.map { |name| const_get(camelize(name)).new }
|
36
35
|
end
|
37
|
-
|
38
|
-
def normalize(config)
|
39
|
-
config[:logs_database] = config[:database] if blank?(config[:logs_database])
|
40
|
-
config
|
41
|
-
end
|
42
36
|
end
|
43
37
|
|
44
38
|
def env
|
@@ -22,7 +22,18 @@ module Travis
|
|
22
22
|
super.reject { |key, value| key == :database }.merge(vhost: vhost)
|
23
23
|
end
|
24
24
|
end
|
25
|
-
|
25
|
+
|
26
|
+
# The amqps:// protocol needs to also pass along that it has SSL enabled
|
27
|
+
# for adapters such as march_hare
|
28
|
+
class Amqps < Amqp
|
29
|
+
def ssl
|
30
|
+
true
|
31
|
+
end
|
32
|
+
|
33
|
+
def to_h
|
34
|
+
super.merge(ssl: ssl)
|
35
|
+
end
|
36
|
+
end
|
26
37
|
|
27
38
|
class << self
|
28
39
|
def parse(url)
|
data/spec/travis/config_spec.rb
CHANGED
@@ -70,8 +70,8 @@ describe Travis::Config do
|
|
70
70
|
it { expect(config.logs_database.database).to eq 'keychain' }
|
71
71
|
end
|
72
72
|
|
73
|
-
describe 'given logs_database is not defined anywhere it
|
74
|
-
it { expect(config.logs_database
|
73
|
+
describe 'given logs_database is not defined anywhere it does not default to database' do
|
74
|
+
it { expect(config.logs_database).to eq nil }
|
75
75
|
end
|
76
76
|
end
|
77
77
|
end
|
metadata
CHANGED
@@ -1,27 +1,27 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: travis-config
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.13
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Travis CI
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2017-01-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: hashr
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 2.0.0
|
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
26
|
version: 2.0.0
|
27
27
|
description: Travis CI config.
|
@@ -30,20 +30,16 @@ executables: []
|
|
30
30
|
extensions: []
|
31
31
|
extra_rdoc_files: []
|
32
32
|
files:
|
33
|
-
- Gemfile
|
34
|
-
- Gemfile.lock
|
35
|
-
- LICENSE
|
36
|
-
- README.md
|
37
|
-
- lib/travis/config.rb
|
38
33
|
- lib/travis/config/docker.rb
|
39
34
|
- lib/travis/config/env.rb
|
40
35
|
- lib/travis/config/files.rb
|
41
36
|
- lib/travis/config/helpers.rb
|
42
|
-
- lib/travis/config/heroku.rb
|
43
37
|
- lib/travis/config/heroku/database.rb
|
44
38
|
- lib/travis/config/heroku/memcached.rb
|
45
39
|
- lib/travis/config/heroku/url.rb
|
40
|
+
- lib/travis/config/heroku.rb
|
46
41
|
- lib/travis/config/version.rb
|
42
|
+
- lib/travis/config.rb
|
47
43
|
- spec/spec_helper.rb
|
48
44
|
- spec/travis/config/docker_spec.rb
|
49
45
|
- spec/travis/config/files_spec.rb
|
@@ -53,7 +49,9 @@ files:
|
|
53
49
|
- spec/travis/config/heroku/redis_spec.rb
|
54
50
|
- spec/travis/config/heroku/sentry_spec.rb
|
55
51
|
- spec/travis/config_spec.rb
|
56
|
-
-
|
52
|
+
- Gemfile
|
53
|
+
- LICENSE
|
54
|
+
- README.md
|
57
55
|
homepage: https://github.com/travis-ci/travis-config
|
58
56
|
licenses:
|
59
57
|
- MIT
|
@@ -64,19 +62,18 @@ require_paths:
|
|
64
62
|
- lib
|
65
63
|
required_ruby_version: !ruby/object:Gem::Requirement
|
66
64
|
requirements:
|
67
|
-
- -
|
65
|
+
- - '>='
|
68
66
|
- !ruby/object:Gem::Version
|
69
67
|
version: '0'
|
70
68
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
71
69
|
requirements:
|
72
|
-
- -
|
70
|
+
- - '>='
|
73
71
|
- !ruby/object:Gem::Version
|
74
72
|
version: '0'
|
75
73
|
requirements: []
|
76
|
-
rubyforge_project:
|
77
|
-
rubygems_version: 2.
|
74
|
+
rubyforge_project: '[none]'
|
75
|
+
rubygems_version: 2.0.14.1
|
78
76
|
signing_key:
|
79
77
|
specification_version: 4
|
80
78
|
summary: Travis CI config
|
81
79
|
test_files: []
|
82
|
-
has_rdoc:
|
data/Gemfile.lock
DELETED
@@ -1,40 +0,0 @@
|
|
1
|
-
PATH
|
2
|
-
remote: .
|
3
|
-
specs:
|
4
|
-
travis-config (1.0.11)
|
5
|
-
hashr (~> 2.0.0)
|
6
|
-
|
7
|
-
GEM
|
8
|
-
remote: https://rubygems.org/
|
9
|
-
specs:
|
10
|
-
diff-lcs (1.2.5)
|
11
|
-
hashr (2.0.0)
|
12
|
-
metaclass (0.0.4)
|
13
|
-
mocha (1.1.0)
|
14
|
-
metaclass (~> 0.0.1)
|
15
|
-
rspec (3.3.0)
|
16
|
-
rspec-core (~> 3.3.0)
|
17
|
-
rspec-expectations (~> 3.3.0)
|
18
|
-
rspec-mocks (~> 3.3.0)
|
19
|
-
rspec-core (3.3.2)
|
20
|
-
rspec-support (~> 3.3.0)
|
21
|
-
rspec-expectations (3.3.1)
|
22
|
-
diff-lcs (>= 1.2.0, < 2.0)
|
23
|
-
rspec-support (~> 3.3.0)
|
24
|
-
rspec-mocks (3.3.2)
|
25
|
-
diff-lcs (>= 1.2.0, < 2.0)
|
26
|
-
rspec-support (~> 3.3.0)
|
27
|
-
rspec-support (3.3.0)
|
28
|
-
|
29
|
-
PLATFORMS
|
30
|
-
java
|
31
|
-
ruby
|
32
|
-
|
33
|
-
DEPENDENCIES
|
34
|
-
hashr (~> 2.0.0)
|
35
|
-
mocha (~> 1.1)
|
36
|
-
rspec (~> 3.0)
|
37
|
-
travis-config!
|
38
|
-
|
39
|
-
BUNDLED WITH
|
40
|
-
1.12.5
|
data/travis-config.gemspec
DELETED
@@ -1,22 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
|
3
|
-
$:.unshift File.expand_path('../lib', __FILE__)
|
4
|
-
require 'travis/config/version'
|
5
|
-
|
6
|
-
Gem::Specification.new do |s|
|
7
|
-
s.name = "travis-config"
|
8
|
-
s.version = TravisConfig::VERSION
|
9
|
-
s.authors = ["Travis CI"]
|
10
|
-
s.email = "contact@travis-ci.org"
|
11
|
-
s.homepage = "https://github.com/travis-ci/travis-config"
|
12
|
-
s.summary = "Travis CI config"
|
13
|
-
s.description = "#{s.summary}."
|
14
|
-
s.license = "MIT"
|
15
|
-
|
16
|
-
s.files = Dir['{lib/**/*,spec/**/*,[A-Z]*}']
|
17
|
-
s.platform = Gem::Platform::RUBY
|
18
|
-
s.require_path = 'lib'
|
19
|
-
s.rubyforge_project = '[none]'
|
20
|
-
|
21
|
-
s.add_dependency 'hashr', '~> 2.0.0'
|
22
|
-
end
|