Merge pull request #571 from xslim/master

Podfile & Lockfile error handling

lib/cocoapods/lockfile.rb

@@ -8,7 +8,11 @@ module Pod
     #
     def self.from_file(path)
       return nil unless path.exist?
+      begin
         hash = YAML.load(File.open(path))
+      rescue Exception => e
+        raise Informative, "Podfile.lock syntax error:  #{e.inspect}"
+      end
       lockfile = Lockfile.new(hash)
       lockfile.defined_in_file = path
       lockfile

lib/cocoapods/podfile.rb

@@ -177,7 +177,11 @@ module Pod
         string = File.open(path, 'r:utf-8')  { |f| f.read }
         # TODO: work around for Rubinius incomplete encoding in 1.9 mode
         string.encode!('UTF-8') if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
+        begin
           eval(string, nil, path.to_s)
+        rescue Exception => e
+          raise Informative, "Podfile syntax error:  #{e.inspect}"
+        end
       end
       podfile.defined_in_file = path
       podfile.validate!