motion-cocoapods 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94027d45aab0005bc844065cce54199903a0e779
-  data.tar.gz: 064bac84b3bfb317ae3b6693cc5395b335394e2c
+  metadata.gz: 499dba817314e680c05445bcc192c10bc8d27dd9
+  data.tar.gz: edd7a5a04b2b16f6a104ee172bb4925ad9f93351
 SHA512:
-  metadata.gz: 710fe4a5218cc28cb4693c3dab073d1a9ed1619075cdb84fcd090e488807d4f3f7bad7d0839500799910a8ff7509becf4d7424a5e2fc68aa2ba47513d2d63ce6
-  data.tar.gz: c6de59e4f0187dbcecb4ebc0453ea0fc87867589a3f0130e489295cf59be9827533f1361d86edb416271797c58ae539be5f61d1d069b5a8beacbffb1f40162f0
+  metadata.gz: 2e49d79ace2df7310a690e587370132b53dc50b8d88d6cb924e2b6ab700c11b400d95d6c9ed4753f70a09aec54a1b1ba0c5e4f2f5a8a42702466833f05dfe937
+  data.tar.gz: 7306e84d72908fd8cba5b740c38e89fdd60e52100ab9a9e71ff5e92b556c6a5d1c5581f3a9bfff9faf704c05ebbb4fab28a99dcd6e24cd7f1a599c50ba16394d

data/lib/motion/project/cocoapods.rb

@@ -100,11 +100,19 @@ module Motion::Project
 
       # TODO replace this all once Xcodeproj has the proper xcconfig parser.
       if (xcconfig = self.pods_xcconfig_hash) && ldflags = xcconfig['OTHER_LDFLAGS']
-        lib_search_paths = xcconfig['LIBRARY_SEARCH_PATHS'] || ""
-        lib_search_paths = lib_search_paths.split(/\s/).map do |path|
-          '-L ' << path.gsub('$(PODS_ROOT)', File.join(@config.project_dir, PODS_ROOT))
+        lib_search_path_flags = xcconfig['LIBRARY_SEARCH_PATHS'] || ""
+        lib_search_paths = []
+        lib_search_path_flags = lib_search_path_flags.split(/\s/).map do |path|
+          path = path.gsub('$(PODS_ROOT)', File.join(@config.project_dir, PODS_ROOT))
+          lib_search_paths << path.gsub('"', '')
+          '-L ' << path
         end.join(' ')
 
+        # Get the name of all static libraries that come pre-built with pods
+        pre_built_static_libs = lib_search_paths.map do |path|
+          Dir[File.join(path, '**/*.a')].map { |f| File.basename(f) }
+        end.flatten
+
         # Collect the Pod products
         pods_libs = []
 
@@ -115,13 +123,13 @@ module Motion::Project
             # For CocoaPods 0.37.x or below. This block is marked as deprecated.
             pods_libs << lib_name
             nil
-          elsif !File.exist?("/usr/lib/lib#{lib_name}.dylib")
-            pods_libs << lib_name
-            nil
-          elsif lib_search_paths.length == 0 || File.exist?("/usr/lib/lib#{lib_name}.dylib")
+          elsif pre_built_static_libs.include?("lib#{lib_name}.a")
+            "#{lib_search_path_flags} -ObjC -l#{lib_name}"
+          elsif File.exist?("/usr/lib/lib#{lib_name}.dylib")
             "/usr/lib/lib#{lib_name}.dylib"
           else
-            "#{lib_search_paths} -ObjC -l#{lib_name}"
+            pods_libs << lib_name
+            nil
           end
         }.compact)
         @config.libs.uniq!

data/lib/motion/project/version.rb

@@ -24,6 +24,6 @@
 
 module Motion::Project
   class CocoaPods
-    VERSION = '1.7.2'
+    VERSION = '1.7.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -56,8 +56,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: CocoaPods integration for RubyMotion projects
 test_files: []
+has_rdoc: