motion-cocoapods 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86d6c7c5167227a973fe0471b633907426c97ef4
-  data.tar.gz: 141d2122cd94435963fac2d43b98ad7dd9d8233a
+  metadata.gz: ef187da4dff56e88c14542a23a6970acd36a7d2c
+  data.tar.gz: 18f39aadb0cb87d277370ee3ea15a9f5f922252a
 SHA512:
-  metadata.gz: dc9acbed9f856e730a9cd7ec6c3366249ef9f700247e17cf32c9f76fc143f02e3e708159c9f8192a89945e045b801782fe3cad96e85b2b3c2eb7bd62a5310001
-  data.tar.gz: 2ea6e87fb6126226178fd6b708a9890f183c13b2e53520f33d5efa27c888c0ad1b950958b96ae226b6387dcbae963a746c95b46a83ed39b425304154f11d039e
+  metadata.gz: b90490505d1693ae1e49994f1d0b179451a7181b6e78889cd740e506bfd4f7afb0d6ca610d0dbb555137eab8e85a74ebe5242a5cefc87fda1b566d5bf2ab2e10
+  data.tar.gz: cf9c42b17299bae6b8176de40f0a1853b97698ea500f7a98255dcbd0ccc69428736b7a576872ec37c8a8999b40b9bc1f0b0e7fea4c20422756288d96f65b4e13

data/lib/motion/project/cocoapods.rb

@@ -91,20 +91,10 @@ module Motion::Project
       @config.resources_dirs << resources_dir.to_s
 
       # TODO replace this all once Xcodeproj has the proper xcconfig parser.
-      if (xcconfig = self.pods_xcconfig) && ldflags = xcconfig.to_hash['OTHER_LDFLAGS']
-        lib_search_paths = xcconfig.to_hash['LIBRARY_SEARCH_PATHS'] || ""
+      if (xcconfig = self.pods_xcconfig_hash) && ldflags = xcconfig['OTHER_LDFLAGS']
+        lib_search_paths = xcconfig['LIBRARY_SEARCH_PATHS'] || ""
         lib_search_paths.gsub!('$(PODS_ROOT)', "-L#{@config.project_dir}/#{PODS_ROOT}")
 
-        framework_search_paths = xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS']
-        if framework_search_paths
-          framework_search_paths.scan(/\"([^\"]+)\"/) do |search_path|
-            path = search_path.first.gsub!(/(\$\(PODS_ROOT\))|(\$\{PODS_ROOT\})/, "#{@config.project_dir}/#{PODS_ROOT}")
-            @config.framework_search_paths << path if path
-          end
-        end
-
-        @config.frameworks.concat(ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] })
-        @config.frameworks.uniq!
         @config.libs.concat(ldflags.scan(/-l([^\s]+)/).map { |m|
           if lib_search_paths.length == 0 || File.exist?("/usr/lib/lib#{m[0]}.dylib")
             "/usr/lib/lib#{m[0]}.dylib"
@@ -112,9 +102,34 @@ module Motion::Project
             "#{lib_search_paths} -ObjC -l#{m[0]}"
           end
         })
+        @config.libs.uniq!
+
+        framework_search_paths = []
+        if xcconfig['FRAMEWORK_SEARCH_PATHS']
+          xcconfig['FRAMEWORK_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
+        end
+        @config.framework_search_paths.concat(framework_search_paths)
+
+        frameworks = ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] }
+        @config.frameworks.concat(frameworks)
+        @config.frameworks.uniq!
+
+        if @config.deploy_platform == 'MacOSX'
+          framework_search_paths.each do |framework_search_path|
+            frameworks.each do |framework|
+              path = File.join(framework_search_path, "#{framework}.framework")
+              if File.exist?(path)
+                @config.embedded_frameworks << path
+              end
+            end
+          end
+        end
+
         @config.weak_frameworks.concat(ldflags.scan(/-weak_framework\s+([^\s]+)/).map { |m| m[0] })
         @config.weak_frameworks.uniq!
-        @config.libs.uniq!
       end
     end
 
@@ -161,11 +176,12 @@ module Motion::Project
     end
 
     # TODO this probably breaks in cases like resource bundles etc, need to test.
+    #
     def install_resources
       FileUtils.mkdir_p(resources_dir)
       resources.each do |file|
         begin
-          FileUtils.cp_r file, resources_dir if file.exist?
+          FileUtils.cp_r(file, resources_dir) if file.exist?
         rescue ArgumentError => exc
           unless exc.message =~ /same file/
             raise
@@ -174,13 +190,17 @@ module Motion::Project
       end
     end
 
+    HEADERS_ROOT = File.join(PODS_ROOT, 'Headers')
+
     def copy_cocoapods_env_and_prefix_headers
       headers = Dir.glob(["#{PODS_ROOT}/*.h", "#{PODS_ROOT}/*.pch"])
       headers.each do |header|
         src = File.basename(header)
         dst = src.sub(/\.pch$/, '.h')
-        unless File.exist?("#{PODS_ROOT}/Headers/____#{dst}")
-          FileUtils.cp("#{PODS_ROOT}/#{src}", "#{PODS_ROOT}/Headers/____#{dst}")
+        dst_path = File.join(HEADERS_ROOT, "____#{dst}")
+        unless File.exist?(dst_path)
+          FileUtils.mkdir_p(HEADERS_ROOT)
+          FileUtils.cp(File.join(PODS_ROOT, src), dst_path)
         end
       end
     end
@@ -206,6 +226,15 @@ module Motion::Project
       Xcodeproj::Config.new(path) if path.exist?
     end
 
+    def pods_xcconfig_hash
+      if xcconfig = pods_xcconfig
+        xcconfig.to_hash
+      end
+    end
+
+    # Do not copy `.framework` bundles, these should be handled through RM's
+    # `embedded_frameworks` config attribute.
+    #
     def resources
       resources = []
       File.open(Pathname.new(@config.project_dir) + PODS_ROOT + 'Pods-resources.sh') { |f|
@@ -213,7 +242,9 @@ module Motion::Project
           if matched = line.match(/install_resource\s+(.*)/)
             path = (matched[1].strip)[1..-2]
             path.sub!("${BUILD_DIR}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}", ".build")
-            resources << Pathname.new(@config.project_dir) + PODS_ROOT + path
+            unless File.extname(path) == '.framework'
+              resources << Pathname.new(@config.project_dir) + PODS_ROOT + path
+            end
           end
         end
       }
@@ -232,7 +263,8 @@ namespace :pod do
       $stderr.puts '[!] The COCOCAPODS_NO_UPDATE env variable has been deprecated, use COCOAPODS_NO_REPO_UPDATE instead.'
       ENV['COCOAPODS_NO_REPO_UPDATE'] = '1'
     end
-    Pod::SourcesManager.update(nil, true) unless ENV['COCOAPODS_NO_REPO_UPDATE']
+    show_output = !ENV['COCOAPODS_NO_REPO_UPDATE_OUTPUT']
+    Pod::SourcesManager.update(nil, show_output) unless ENV['COCOAPODS_NO_REPO_UPDATE']
   end
 
   desc "Download and integrate newly added pods"

data/lib/motion/project/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods