motion-cocoapods 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5809a607aad317dffc74f3d3dea5f6e234ae544f
-  data.tar.gz: 29f69e491f27646fd980b37b3e3fc7a349836733
+  metadata.gz: c080d5b0ed0340f6aef99a31c114007c1680963d
+  data.tar.gz: 3474078ff4ad74cf0acd84dce6c9e6c0ab218f7a
 SHA512:
-  metadata.gz: eac171e6e18c1843f055209c679fe4ea225bd2d0ddfc6a67f139ffc9202e1a528c7c0ab3dea7384871eef971c4e2b02af9a94bbc9ff0fac14328ceae23eec7df
-  data.tar.gz: 13fcec8d997ea2ee5aaa488aeee68e90e798c0f053d1470d7e333f8a5f79a45d0b730235afe654f440fb1c98e0a28a41d74055dffe8e2c290a25f13c3fb01c8e
+  metadata.gz: 01f8d63b9a7bf46edc207e225a408d3c327a641bd8225025ddd3873fd62793fc8d8426522c76ca95fffe0abdd4854682d94c6629ea0c09938cc3e8cf28563a5d
+  data.tar.gz: b98d5b10ec810c59a8b93746d0d3cc7b1ef19801f1038bfa6a97b30cc44162f8d43a7057a3ce92d226169577898a3cdcd8a49fc437e0693dd6823037a5d2f9b3

data/README.md

@@ -13,7 +13,7 @@ $ [sudo] gem install motion-cocoapods
 Or if you use Bundler:
 
 ```ruby
-gem 'motion-cocoapods', '~> 1.4.1'
+gem 'motion-cocoapods'
 ```
 
 
@@ -53,7 +53,7 @@ To tell motion-cocoapods to download your dependencies, run the following rake
 task:
 
 ```
-$ rake pod:install
+$ [bundle exec] rake pod:install
 ```
 
 That’s all. The build system will properly download the given pods and their
@@ -64,23 +64,38 @@ If the `vendor/Podfile.lock` file exists, this will be used to install specific
 versions. To update the versions, use the following rake task:
 
 ```
-$ rake pod:update
+$ [bundle exec] rake pod:update
 ```
 
 ## Options
 
+If necessary, you can pass `vendor_project` options to the `pods` configuration
+method. These options are described [here](http://www.rubymotion.com/developer-center/guides/project-management/#_vendoring_3rd_party_libraries).
+For instance, to only generate BridgeSupport metadata for a single pod, which
+might be needed if a dependency that you’re not using directly is causing issues
+(such as C++ headers), you can specify that like so:
+
+```ruby
+   Motion::Project::App.setup do |app|
+     app.pods :headers_dir => 'Headers/AFNetworking' do
+       pod 'AFNetworking'
+       # ...
+     end
+   end
+```
+
 By default the output of CocoaPods doing its work is silenced. If, however, you
 would like to see the output, you can set the `COCOAPODS_VERBOSE` env variable:
 
 ```
-$ rake pod:install COCOAPODS_VERBOSE=1
+$ [bundle exec] rake pod:install COCOAPODS_VERBOSE=1
 ```
 
 As part of the install and update tasks, the specification repostories will get
 updated. You can disable this with the `COCOAPODS_NO_REPO_UPDATE` env variable:
 
 ```
-$ rake pod:install COCOAPODS_NO_REPO_UPDATE=1
+$ [bundle exec] rake pod:install COCOAPODS_NO_REPO_UPDATE=1
 ```
 
 
@@ -91,13 +106,13 @@ $ rake pod:install COCOAPODS_NO_REPO_UPDATE=1
    ```
    $ git clone git://github.com/HipByte/motion-cocoapods.git
    $ cd motion-cocoapods
-   $ rake bootstrap
+   $ [bundle exec] rake bootstrap
    ```
 
 2. Verify that all the tests are passing.
 
    ```
-   $ rake spec
+   $ [bundle exec] rake spec
    ```
 
 3. Create your patch and send a

data/lib/motion/project/cocoapods.rb

@@ -34,8 +34,8 @@ module Motion::Project
   class Config
     variable :pods
 
-    def pods(&block)
-      @pods ||= Motion::Project::CocoaPods.new(self)
+    def pods(vendor_options = {}, &block)
+      @pods ||= Motion::Project::CocoaPods.new(self, vendor_options)
       if block
         @pods.instance_eval(&block)
       end
@@ -47,7 +47,7 @@ module Motion::Project
     class << self
       def build_with_cocoapods(platform, opts = {})
         unless File.exist?(CocoaPods::PODS_ROOT)
-          $stderr.puts "[!] No CocoaPods dependencies found in #{CocoaPods::PODS_ROOT}, run the `rake pod:install` task."
+          $stderr.puts "[!] No CocoaPods dependencies found in #{CocoaPods::PODS_ROOT}, run the `[bundle exec] rake pod:install` task."
           exit 1
         end
         build_without_cocoapods(platform, opts)
@@ -62,55 +62,77 @@ module Motion::Project
 
   class CocoaPods
     PODS_ROOT = 'vendor/Pods'
+    SUPPORT_FILES = File.join(PODS_ROOT, 'Target Support Files/Pods')
 
     attr_accessor :podfile
 
-    def initialize(config)
+    def initialize(config, vendor_options)
       @config = config
+      @vendor_options = vendor_options
 
       @podfile = Pod::Podfile.new(Pathname.new(Rake.original_dir) + 'Rakefile') {}
       @podfile.platform((App.respond_to?(:template) ? App.template : :ios), config.deployment_target)
       cp_config.podfile = @podfile
       cp_config.skip_repo_update = true
-      cp_config.verbose = !!ENV['COCOAPODS_VERBOSE']
       cp_config.integrate_targets = false
       cp_config.installation_root = Pathname.new(File.expand_path(config.project_dir)) + 'vendor'
 
+      if cp_config.verbose = !!ENV['COCOAPODS_VERBOSE']
+        require 'claide'
+      end
+
       configure_project
     end
 
     # Adds the Pods project to the RubyMotion config as a vendored project and
     #
     def configure_project
-      @config.vendor_project(PODS_ROOT, :xcode,
-        :target => 'Pods',
-        :headers_dir => 'Headers',
-        :products => %w{ libPods.a }
-      )
-
       @config.resources_dirs << resources_dir.to_s
 
       # 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|
+        lib_search_paths = lib_search_paths.split(/\s/).map do |path|
           '-L ' << path.gsub('$(PODS_ROOT)', File.join(@config.project_dir, PODS_ROOT))
         end.join(' ')
 
-        @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"
+        # Collect the Pod products
+        pods_libs = []
+
+        @config.libs.concat(ldflags.scan(/-l"?([^\s"]+)"?/).map { |m|
+          lib_name = m[0]
+          next if lib_name.nil?
+          if lib_name.start_with?('Pods-')
+            pods_libs << lib_name
+            nil
+          elsif lib_search_paths.length == 0 || File.exist?("/usr/lib/lib#{lib_name}.dylib")
+            "/usr/lib/lib#{lib_name}.dylib"
           else
-            "#{lib_search_paths} -ObjC -l#{m[0]}"
+            "#{lib_search_paths} -ObjC -l#{lib_name}"
           end
-        })
+        }.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 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
+        if search_paths = xcconfig['FRAMEWORK_SEARCH_PATHS']
+          search_paths = search_paths.strip
+          unless search_paths.empty?
+            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
+            # If we couldn't parse any search paths, then presumably nothing was properly quoted, so
+            # fallback to just assuming the whole value is one path.
+            if framework_search_paths.empty?
+              path = search_paths.gsub!(/(\$\(PODS_ROOT\))|(\$\{PODS_ROOT\})/, "#{@config.project_dir}/#{PODS_ROOT}")
+              framework_search_paths << path if path
+            end
           end
         end
         frameworks = ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] }
@@ -122,10 +144,13 @@ module Motion::Project
           @config.frameworks.uniq!
 
           framework_search_paths.each do |framework_search_path|
-            frameworks.each do |framework|
+            frameworks.reject! do |framework|
               path = File.join(framework_search_path, "#{framework}.framework")
               if File.exist?(path)
                 @config.embedded_frameworks << path
+                true
+              else
+                false
               end
             end
           end
@@ -136,15 +161,21 @@ module Motion::Project
           # as a static library (which it is) with `-force_load` fixes this.
           #
           framework_search_paths.each do |framework_search_path|
-            frameworks.each do |framework|
+            frameworks.reject! do |framework|
               path = File.join(framework_search_path, "#{framework}.framework")
               if File.exist?(path)
                 @config.libs << "-force_load '#{File.join(path, framework)}'"
+                true
+              else
+                false
               end
             end
           end
         end
 
+        @config.frameworks.concat(frameworks)
+        @config.frameworks.uniq!
+
         @config.weak_frameworks.concat(ldflags.scan(/-weak_framework\s+([^\s]+)/).map { |m| m[0] })
         @config.weak_frameworks.uniq!
       end
@@ -239,7 +270,7 @@ module Motion::Project
     end
 
     def pods_xcconfig
-      path = Pathname.new(@config.project_dir) + PODS_ROOT + 'Pods.xcconfig'
+      path = Pathname.new(@config.project_dir) + SUPPORT_FILES + 'Pods.release.xcconfig'
       Xcodeproj::Config.new(path) if path.exist?
     end
 
@@ -254,7 +285,7 @@ module Motion::Project
     #
     def resources
       resources = []
-      File.open(Pathname.new(@config.project_dir) + PODS_ROOT + 'Pods-resources.sh') { |f|
+      File.open(Pathname.new(@config.project_dir) + SUPPORT_FILES + 'Pods-resources.sh') { |f|
         f.each_line do |line|
           if matched = line.match(/install_resource\s+(.*)/)
             path = (matched[1].strip)[1..-2]

data/lib/motion/project/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.34'
 description: motion-cocoapods allows RubyMotion projects to have access to the CocoaPods
   dependency manager.
 email: lrz@hipbyte.com