motion-cocoapods 1.0.1 → 1.0.2

data/README.rdoc

@@ -34,13 +34,13 @@ That's all. The build system will properly download the given pods and their dep
 
 1. Setup a local development environment.
 
-  $ git clone git://github.com/HipByte/motion-cocoapods.git
-  $ cd motion-cocoapods
-  $ rake bootstrap
+     $ git clone git://github.com/HipByte/motion-cocoapods.git
+     $ cd motion-cocoapods
+     $ rake bootstrap
 
 2. Verify that all the tests are passing.
 
-  $ rake spec
+     $ rake spec
 
 3. Create your patch and send a pull-request[http://help.github.com/send-pull-requests/].
 

data/lib/motion/project/cocoapods.rb

@@ -36,71 +36,68 @@ module Motion::Project
       @pods ||= Motion::Project::CocoaPods.new(self)
       if block
         @pods.instance_eval(&block)
-        @pods.resolve!
+        @pods.install!
       end
       @pods
     end
   end
 
   class CocoaPods
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
 
     def initialize(config)
       @config = config
       @podfile = Pod::Podfile.new {}
       @podfile.platform :ios
 
-      Pod::Config.instance.silent = true
-      Pod::Config.instance.rootspec = @podfile
-      Pod::Config.instance.instance_variable_set(:@project_pods_root, Pathname.new(File.join(config.project_dir, 'vendor')))
+      cp_config = Pod::Config.instance
+      if ENV['COCOAPODS_VERBOSE']
+        cp_config.verbose = true
+      else
+        cp_config.silent = true
+      end
+      cp_config.rootspec = @podfile if cp_config.respond_to?(:rootspec) # CocoaPods 0.5.x backward compatibility
+      cp_config.integrate_targets = false if cp_config.respond_to?(:integrate_targets) # CocoaPods 0.6 forward compatibility
+      cp_config.project_root = Pathname.new(config.project_dir) + 'vendor'
     end
 
     def dependency(*name_and_version_requirements, &block)
       @podfile.dependency(*name_and_version_requirements, &block)
     end
 
+    def post_install(&block)
+      @podfile.post_install(&block)
+    end
+
     def pods_installer
       @installer ||= Pod::Installer.new(@podfile)
     end
 
-    def resolve!
-      pods_installer.install_dependencies!
-      specs = pods_installer.build_specifications
-      header_paths = specs.map do |podspec|
-        podspec.expanded_source_files.select do |p|
-          File.extname(p) == '.h'
-        end.map do |p|
-          "-I\"" + File.expand_path(File.join('./vendor', File.dirname(p))) + "\""
-        end
-      end.flatten.join(' ')
-      specs.each do |podspec|
-       cflags = (podspec.compiler_flags or '') + ' ' + header_paths
-        source_files = podspec.expanded_source_files.map do |path|
-          # Remove the first part of the path which is the project directory.
-          path.to_s.split('/')[1..-1].join('/')
-        end
+    # For now we only support one Pods target, this will have to be expanded
+    # once we work on more spec support.
+    def install!
+      pods_installer.install!
 
-        @config.vendor_project(podspec.pod_destroot, :static,
-          :cflags => cflags,
-          :source_files => source_files)
+      @config.vendor_project('vendor/Pods', :xcode,
+        :target => 'Pods',
+        :headers_dir => 'Headers',
+        :products => %w{ libPods.a }
+      )
 
-        ldflags = podspec.xcconfig.to_hash['OTHER_LDFLAGS']
-        if ldflags
-          @config.frameworks.concat(ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] })
-          @config.frameworks.uniq!
-          @config.libs.concat(ldflags.scan(/-l([^\s]+)/).map { |m| "/usr/lib/lib#{m[0]}.dylib" })
-          @config.libs.uniq!
+      xcconfig = @installer.target_installers.find do |target_installer|
+        if target_installer.respond_to?(:definition)
+          target_installer.definition.name == :default
+        else
+          # CocoaPods 0.6 forward compatibility
+          target_installer.target_definition.name == :default
         end
+      end.xcconfig
 
-=begin
-        # Remove .h files that are not covered in the podspec, to avoid
-        # future preprocessor #include collisions.
-        headers_to_ignore = (Dir.chdir(podspec.pod_destroot) do
-          Dir.glob('*/**/*.h')
-        end) - source_files.select { |p| File.extname(p) == '.h' }
-  p headers_to_ignore,source_files.select { |p| File.extname(p) == '.h' } ,:ok
-        #headers_to_ignore.each { |p| FileUtils.rm_rf File.join(podspec.pod_destroot, p) }
-=end
+      if ldflags = xcconfig.to_hash['OTHER_LDFLAGS']
+        @config.frameworks.concat(ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] })
+        @config.frameworks.uniq!
+        @config.libs.concat(ldflags.scan(/-l([^\s]+)/).map { |m| "/usr/lib/lib#{m[0]}.dylib" })
+        @config.libs.uniq!
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: motion-cocoapods
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  segments_generated: true
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Laurent Sansonetti
@@ -15,24 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-07 00:00:00 +02:00
-default_executable: 
+date: 2012-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 5
         - 1
-        segments_generated: true
         version: 0.5.1
   requirement: *id001
   name: cocoapods
-  prerelease: false
-  type: :runtime
 description: motion-cocoapods allows RubyMotion projects to have access to the CocoaPods dependency manager.
 email: lrz@hipbyte.com
 executables: []
@@ -46,7 +46,6 @@ files:
 - lib/motion-cocoapods.rb
 - README.rdoc
 - LICENSE
-has_rdoc: true
 homepage: http://www.rubymotion.com
 licenses: []
 
@@ -56,25 +55,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: CocoaPods integration for RubyMotion projects