Fixed issue #69: Add a check for merge conflict markers in YAML files#99

Closed

luisdelarosa wants to merge 16 commits intoCocoaPods:masterfrom luisdelarosa:check_for_merge_conflict_in_yaml

Commits on Apr 5, 2014

Add failing test for issue CocoaPods#69 .
luisdelarosa
committed
Call YAMLConverter.load instead of YAML.load in test.
luisdelarosa
committed
Add failing test to make sure we're not raising an error when there is no
luisdelarosa
committed
Changed test to make sure we're not throwing any error when loading a YAML with
luisdelarosa
committed
Make test pass by calling YAML.load and rescuing Psych::SyntaxError.
luisdelarosa
committed
Add failing test for non-"merge conflicts" in a YAML. These will continue to throw Psych::SyntaxErrors.
luisdelarosa
committed
Check for merge conflict and only raise Informative in that case. Otherwise raise original syntax error.
luisdelarosa
committed
Replaced calls to YAML.load with YAMLConverter.load
luisdelarosa
committed
Renamed YAMLConverter to YAMLHelper per @irrationalfab 's request in CocoaPods#69
luisdelarosa
committed
Change this back to YAML per @orta 's code review.
luisdelarosa
committed
Fix issue when running specs in Ruby 1.8.7.
luisdelarosa
committed
Rename yaml_converter_spec.rb to yaml_helper_spec.rb.
luisdelarosa
committed
Remove trailing space.
luisdelarosa
committed
use generic exception handling
orta
committed
Merge pull request #1 from orta/yaml_exceptions
luisdelarosa
committed
Specify generic Exception.
luisdelarosa
committed