motion-cocoapods 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c080d5b0ed0340f6aef99a31c114007c1680963d
-  data.tar.gz: 3474078ff4ad74cf0acd84dce6c9e6c0ab218f7a
+  metadata.gz: f654cd843c3fb327bc7e79e077f4baf50c832689
+  data.tar.gz: c85e57fad5afed873f20d4129674e552c8849e6c
 SHA512:
-  metadata.gz: 01f8d63b9a7bf46edc207e225a408d3c327a641bd8225025ddd3873fd62793fc8d8426522c76ca95fffe0abdd4854682d94c6629ea0c09938cc3e8cf28563a5d
-  data.tar.gz: b98d5b10ec810c59a8b93746d0d3cc7b1ef19801f1038bfa6a97b30cc44162f8d43a7057a3ce92d226169577898a3cdcd8a49fc437e0693dd6823037a5d2f9b3
+  metadata.gz: 8ef83e2d367daf17a544b04224f0efa1788c94fda4382abe1ed2a79e404bfbefb387dfad96442f01b7858e6d6691a1e909e9ccc5333b5844743e8f11d33dbcea
+  data.tar.gz: 884168eb5c190f7e3649119883b5c10d538bdca586abf2a3de91013fe13c8213616a95d0f6c03a2f5a6a052737eb3cdf1c1b7e203e7f651e8c3fa5a4358e69b8

data/lib/motion/project/cocoapods.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2013, Laurent Sansonetti <lrz@hipbyte.com>
+# Copyright (c) 2012-2014, Laurent Sansonetti <lrz@hipbyte.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -113,17 +113,11 @@ module Motion::Project
         }.compact)
         @config.libs.uniq!
 
-        @config.vendor_project(PODS_ROOT, :xcode, {
-          :target => 'Pods',
-          :headers_dir => 'Headers/Public',
-          :products => pods_libs.map { |lib_name| "lib#{lib_name}.a" }
-        }.merge(@vendor_options))
-
         framework_search_paths = []
         if search_paths = xcconfig['FRAMEWORK_SEARCH_PATHS']
           search_paths = search_paths.strip
           unless search_paths.empty?
-            search_paths.scan(/\"([^\"]+)\"/) do |search_path|
+            search_paths.scan(/"([^"]+)"/) do |search_path|
               path = search_path.first.gsub!(/(\$\(PODS_ROOT\))|(\$\{PODS_ROOT\})/, "#{@config.project_dir}/#{PODS_ROOT}")
               framework_search_paths << path if path
             end
@@ -135,14 +129,14 @@ module Motion::Project
             end
           end
         end
-        frameworks = ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] }
+
+        header_dirs = ['Headers/Public']
+        frameworks = ldflags.scan(/-framework\s+"?([^\s"]+)"?/).map { |m| m[0] }
 
         case @config.deploy_platform
         when 'MacOSX'
           @config.framework_search_paths.concat(framework_search_paths)
-          @config.frameworks.concat(frameworks)
-          @config.frameworks.uniq!
-
+          @config.framework_search_paths.uniq!
           framework_search_paths.each do |framework_search_path|
             frameworks.reject! do |framework|
               path = File.join(framework_search_path, "#{framework}.framework")
@@ -155,6 +149,7 @@ module Motion::Project
             end
           end
         when 'iPhoneOS'
+          pods_root = cp_config.installation_root + 'Pods'
           # If we would really specify these as ‘frameworks’ then the linker
           # would not link the archive into the application, because it does not
           # see any references to any of the symbols in the archive. Treating it
@@ -165,6 +160,13 @@ module Motion::Project
               path = File.join(framework_search_path, "#{framework}.framework")
               if File.exist?(path)
                 @config.libs << "-force_load '#{File.join(path, framework)}'"
+                # This is needed until (and if) CocoaPods links framework
+                # headers into `Headers/Public` by default:
+                #
+                #   https://github.com/CocoaPods/CocoaPods/pull/2722
+                #
+                header_dir = Pathname.new(path) + 'Headers'
+                header_dirs << header_dir.realpath.relative_path_from(pods_root).to_s
                 true
               else
                 false
@@ -178,6 +180,12 @@ module Motion::Project
 
         @config.weak_frameworks.concat(ldflags.scan(/-weak_framework\s+([^\s]+)/).map { |m| m[0] })
         @config.weak_frameworks.uniq!
+
+        @config.vendor_project(PODS_ROOT, :xcode, {
+          :target => 'Pods',
+          :headers_dir => "{#{header_dirs.join(',')}}",
+          :products => pods_libs.map { |lib_name| "lib#{lib_name}.a" }
+        }.merge(@vendor_options))
       end
     end
 
@@ -238,17 +246,17 @@ module Motion::Project
       end
     end
 
-    HEADERS_ROOT = File.join(PODS_ROOT, 'Headers')
+    PUBLIC_HEADERS_ROOT = File.join(PODS_ROOT, 'Headers/Public')
 
     def copy_cocoapods_env_and_prefix_headers
-      headers = Dir.glob(["#{PODS_ROOT}/*.h", "#{PODS_ROOT}/*.pch"])
+      headers = Dir.glob(["#{PODS_ROOT}/*.h", "#{PODS_ROOT}/*.pch", "#{PODS_ROOT}/Target Support Files/**/*.h", "#{PODS_ROOT}/Target Support Files/**/*.pch"])
       headers.each do |header|
         src = File.basename(header)
         dst = src.sub(/\.pch$/, '.h')
-        dst_path = File.join(HEADERS_ROOT, "____#{dst}")
+        dst_path = File.join(PUBLIC_HEADERS_ROOT, "____#{dst}")
         unless File.exist?(dst_path)
-          FileUtils.mkdir_p(HEADERS_ROOT)
-          FileUtils.cp(File.join(PODS_ROOT, src), dst_path)
+          FileUtils.mkdir_p(PUBLIC_HEADERS_ROOT)
+          FileUtils.cp(header, dst_path)
         end
       end
     end
@@ -256,6 +264,15 @@ module Motion::Project
     # Helpers
     #-------------------------------------------------------------------------#
 
+    # This is the output that gets shown in `rake config`, so it should be
+    # short and sweet.
+    #
+    def inspect
+      cp_config.lockfile.to_hash['PODS'].map do |pod|
+        pod.is_a?(Hash) ? pod.keys.first : pod
+      end.inspect
+    end
+
     def cp_config
       Pod::Config.instance
     end

data/lib/motion/project/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods