lib/engineyard-serverside/lockfile_parser.rb in engineyard-serverside-1.4.12 vs lib/engineyard-serverside/lockfile_parser.rb in engineyard-serverside-1.4.13

- old
+ new

@@ -1,9 +1,12 @@ require 'yaml' module EY module Serverside class LockfileParser + def self.default_version + Parse10::DEFAULT + end attr_reader :bundler_version, :lockfile_version def initialize(lockfile_contents) @lockfile_version, @bundler_version = Parse106.new(lockfile_contents).parse @@ -35,10 +38,10 @@ end.compact.first [:bundler09, bundler_version || DEFAULT] end def safe_yaml_load(loadable) YAML.load(loadable) #won't always raise... soemtimes parses the contents as 1 big string - rescue ArgumentError => e # not yaml + rescue ArgumentError, SyntaxError # not yaml nil end end class Parse10 < Parse09