diff options
| author | Terence Lee <hone02@gmail.com> | 2012-11-14 04:48:20 +0200 |
|---|---|---|
| committer | Terence Lee <hone02@gmail.com> | 2012-11-14 04:50:12 +0200 |
| commit | 71313f1ab45f12ad482df4db8d1cf3892978442d (patch) | |
| tree | d80109a128497bd0d6c2deb3124ba7a25f337f7a | |
| parent | da996eb7edeb3f4d5fdfd590a2b62489d80baf3b (diff) | |
| download | bundler-71313f1ab45f12ad482df4db8d1cf3892978442d.tar.gz | |
clean up rescue clause, and move comment to appropriate area
| -rw-r--r-- | lib/bundler.rb | 3 | ||||
| -rw-r--r-- | lib/bundler/psyched_yaml.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 626c179da1..622a95410a 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -292,8 +292,7 @@ module Bundler contents = File.read(path.basename.to_s) begin Gem::Specification.from_yaml(contents) - # Raises ArgumentError if the file is not valid YAML - rescue ArgumentError, YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception + rescue YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception begin eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s) rescue LoadError, SyntaxError => e diff --git a/lib/bundler/psyched_yaml.rb b/lib/bundler/psyched_yaml.rb index 6a75eecbe1..9501d242df 100644 --- a/lib/bundler/psyched_yaml.rb +++ b/lib/bundler/psyched_yaml.rb @@ -14,6 +14,9 @@ end # Psych might NOT EXIST AT ALL require 'yaml' +# if the file is not valid YAML: +# * Syck raises ArgumentError +# * Psych raises Psych::SyntaxError begin YamlSyntaxError = Psych::SyntaxError rescue NameError |