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

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzllYWY1NTUxMzNkM2YyNDYwNTQ2MDA4ZTMyNmJhNzExOWFjMWIwNQ==
+    MmE4ZjBjZTc2YzdmYzVkNmIwZWY0NWJmOWI0ZjViOTIzNjM3YjYyOQ==
   data.tar.gz: !binary |-
-    NTNkOWIyMzFlOTNlMGIwOWQyMzEwODM3YjFkMDk2MjZkYWExMzk5YQ==
+    NGYyZmViY2Y3NTcyOGFiNzUxMWE3MjMyNjM4MjJiNWFkNmViYThhNQ==
 SHA512:
   metadata.gz: !binary |-
-    YjQwODM0NDVmZDA0NjYyZWZkOTQ2MmIzNmFlYjUyMjZiOWJhZjJiYzg2NDc4
-    YjYxMjk5ZTNmZDgzMGY1ZGUxYjA2YTdhYzEyZTYxNGUwNjY0M2FjYjRjNGZi
-    NDk1NzQ5MTkxYjJhZWQwMDEyYWRmYzRlMDFiZmQzOTExZWExNjU=
+    YzUzNzMwYTM5MDMwZDM0ZGRkNjI2ZWZlNTBiYmMyOGM4MzFhZWMzYmZmNzBh
+    MTAwODUwZTAzMmY5YjAwMTMxYTJlMTZiYWFlY2MxZGYwNGMzYWY5MDhhYzZi
+    ZTUyZTQzN2IyOGNiNzlkOGJiZTBlYzcwYTA3YjhjYTcxZTExOTE=
   data.tar.gz: !binary |-
-    MGNkMDJjM2VjOTE3MzgzZmM5NGE4MjZmZjczYTEzZDU3NGQwM2JiYWFmYTM0
-    NzA4OGMyOTVmNDhmNDYxZmY3MDVkYjFhYWQzNGEwYTQ2OTM1ZWZmODllMzEy
-    MjViMmM2MjFmYzFmMGQyNWNkNTgwODY2MmM5YjQzMGFiMjVkM2I=
+    NGNhZjJhYWQ4YTFmZjhiZTNkYjYzMDQ2MzY3NWQwMTE5YzIyYzFhMzBiY2Zj
+    ZTEyNWVkZGRjNDdhMWNjZjgwY2UzNWFlMTI4Yzg4OGRiNjVlNWVmZjcxMDFi
+    MGI2ODQzYjQyYTE3YWIwZGY1N2EwN2VjZDNmMTNmNGIxNmMxMWY=

data/lib/travis/cli/command.rb

@@ -338,9 +338,16 @@ module Travis
           File.write(path, content.to_s)
         end
 
+        YAML_ERROR = defined?(Psych::SyntaxError) ? Psych::SyntaxError : ArgumentError
         def load_config
-          @config = YAML.load load_file('config.yml', '{}')
+          @config          = YAML.load load_file('config.yml', '{}')
+          @config        ||= {}
           @original_config = @config.dup
+        rescue YAML_ERROR => error
+          raise error if explode?
+          warn "Broken config file: #{color config_path('config.yml'), :bold}"
+          exit 1 unless interactive? and agree("Remove config file? ") { |q| q.default = "no" }
+          @original_config, @config = {}, {}
         end
 
         def store_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.6.15.travis.561.6
+  version: 1.6.15.travis.562.6
 platform: ruby
 authors:
 - Konstantin Haase