travis 1.6.15.travis.561.6 → 1.6.15.travis.562.6

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 (3) hide show
  1. checksums.yaml +8 -8
  2. data/lib/travis/cli/command.rb +8 -1
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YzllYWY1NTUxMzNkM2YyNDYwNTQ2MDA4ZTMyNmJhNzExOWFjMWIwNQ==
4
+ MmE4ZjBjZTc2YzdmYzVkNmIwZWY0NWJmOWI0ZjViOTIzNjM3YjYyOQ==
5
5
  data.tar.gz: !binary |-
6
- NTNkOWIyMzFlOTNlMGIwOWQyMzEwODM3YjFkMDk2MjZkYWExMzk5YQ==
6
+ NGYyZmViY2Y3NTcyOGFiNzUxMWE3MjMyNjM4MjJiNWFkNmViYThhNQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YjQwODM0NDVmZDA0NjYyZWZkOTQ2MmIzNmFlYjUyMjZiOWJhZjJiYzg2NDc4
10
- YjYxMjk5ZTNmZDgzMGY1ZGUxYjA2YTdhYzEyZTYxNGUwNjY0M2FjYjRjNGZi
11
- NDk1NzQ5MTkxYjJhZWQwMDEyYWRmYzRlMDFiZmQzOTExZWExNjU=
9
+ YzUzNzMwYTM5MDMwZDM0ZGRkNjI2ZWZlNTBiYmMyOGM4MzFhZWMzYmZmNzBh
10
+ MTAwODUwZTAzMmY5YjAwMTMxYTJlMTZiYWFlY2MxZGYwNGMzYWY5MDhhYzZi
11
+ ZTUyZTQzN2IyOGNiNzlkOGJiZTBlYzcwYTA3YjhjYTcxZTExOTE=
12
12
  data.tar.gz: !binary |-
13
- MGNkMDJjM2VjOTE3MzgzZmM5NGE4MjZmZjczYTEzZDU3NGQwM2JiYWFmYTM0
14
- NzA4OGMyOTVmNDhmNDYxZmY3MDVkYjFhYWQzNGEwYTQ2OTM1ZWZmODllMzEy
15
- MjViMmM2MjFmYzFmMGQyNWNkNTgwODY2MmM5YjQzMGFiMjVkM2I=
13
+ NGNhZjJhYWQ4YTFmZjhiZTNkYjYzMDQ2MzY3NWQwMTE5YzIyYzFhMzBiY2Zj
14
+ ZTEyNWVkZGRjNDdhMWNjZjgwY2UzNWFlMTI4Yzg4OGRiNjVlNWVmZjcxMDFi
15
+ MGI2ODQzYjQyYTE3YWIwZGY1N2EwN2VjZDNmMTNmNGIxNmMxMWY=
@@ -338,9 +338,16 @@ module Travis
338
338
  File.write(path, content.to_s)
339
339
  end
340
340
 
341
+ YAML_ERROR = defined?(Psych::SyntaxError) ? Psych::SyntaxError : ArgumentError
341
342
  def load_config
342
- @config = YAML.load load_file('config.yml', '{}')
343
+ @config = YAML.load load_file('config.yml', '{}')
344
+ @config ||= {}
343
345
  @original_config = @config.dup
346
+ rescue YAML_ERROR => error
347
+ raise error if explode?
348
+ warn "Broken config file: #{color config_path('config.yml'), :bold}"
349
+ exit 1 unless interactive? and agree("Remove config file? ") { |q| q.default = "no" }
350
+ @original_config, @config = {}, {}
344
351
  end
345
352
 
346
353
  def store_config
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: travis
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.15.travis.561.6
4
+ version: 1.6.15.travis.562.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Konstantin Haase