merge

CHANGELOG.md

@@ -50,6 +50,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [orta](http://orta.github.io)
   [#1561](https://github.com/CocoaPods/CocoaPods/pull/1561)
 
+* Vendored Libraries and Vendored Frameworks now have their paths validated correctly.
+  [Joshua Kalpin](https://github.com/Kapin)
+  [#1567](https://github.com/CocoaPods/CocoaPods/pull/1567)
+
 
 ## 0.27.1
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.2...0.27.1)

Gemfile.lock

 GIT
   remote: https://github.com/CocoaPods/CLAide.git
-  revision: 7fae7e88dea3cb93748e0c5356e5a0314c8cca7a
+  revision: 2de0aea368f02407540138bb3ec284b88fbde2ce
   branch: master
   specs:
     claide (0.3.2)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 77399f24469bee9a6f196914b538e4c51cb8ca37
+  revision: a777f7fb09d486ef54bfd1a1c14adc7e4380c50c
   branch: master
   specs:
     cocoapods-core (0.27.1)
       activesupport (>= 3.2.15, < 4)
-      json_pure (~> 1.8)
+      fuzzy_match (~> 2.0.4)
+      json (~> 1.8)
       nap (~> 0.5)
 
 GIT
@@ -27,7 +28,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-downloader.git
-  revision: 899f3face9d432b4084e78842776e249b77a1b8a
+  revision: b3a95be1468bd6d8a46a82a027460965581e2c21
   branch: master
   specs:
     cocoapods-downloader (0.2.0)
@@ -81,8 +82,10 @@ GEM
     diffy (3.0.1)
     escape (0.0.4)
     ffi (1.9.3)
+    fuzzy_match (2.0.4)
     github-markup (0.7.5)
     i18n (0.6.5)
+    json (1.8.1)
     json_pure (1.8.1)
     listen (1.1.6)
       rb-fsevent (>= 0.9.3)
@@ -103,7 +106,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pygments.rb (0.5.2)
+    pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rake (10.1.0)
@@ -126,7 +129,7 @@ GEM
     thor (0.18.1)
     tins (0.12.0)
     yajl-ruby (1.1.0)
-    yard (0.8.7.2)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby

lib/cocoapods/command.rb

@@ -26,6 +26,7 @@ module Pod
     self.default_subcommand = 'install'
     self.command = 'pod'
     self.description = 'CocoaPods, the Objective-C library package manager.'
+    self.plugin_prefix = 'cocoapods'
 
     def self.options
       [

lib/cocoapods/command/lib.rb

@@ -113,16 +113,21 @@ module Pod
           validator.only_errors = @only_errors
           validator.validate
 
-          if validator.validated?
-            UI.puts "#{validator.spec.name} passed validation.".green
-          else
-            raise Informative, "#{validator.spec.name} did not pass validation."
-          end
-
           unless @clean
             UI.puts "Pods project available at `#{validator.validation_dir}/Pods/Pods.xcodeproj` for inspection."
             UI.puts
           end
+
+          if validator.validated?
+            UI.puts "#{validator.spec.name} passed validation.".green
+          else
+            message = "#{validator.spec.name} did not pass validation."
+            if @clean
+              message << "\nYou can use the `--no-clean` option to inspect " \
+                "any issue."
+            end
+            raise Informative, message
+          end
         end
 
         private

lib/cocoapods/validator.rb

@@ -250,7 +250,7 @@ module Pod
     # @return [void]
     #
     def check_file_patterns
-      [:source_files, :resources, :preserve_paths].each do |attr_name|
+      [:source_files, :resources, :preserve_paths, :vendored_libraries, :vendored_frameworks].each do |attr_name|
         # file_attr = Specification::DSL.attributes.values.find{|attr| attr.name == attr_name }
         if !file_accessor.spec_consumer.send(attr_name).empty? && file_accessor.send(attr_name).empty?
           error "The `#{attr_name}` pattern did not match any file."