motion-cocoapods 1.0.3 → 1.0.4

data/lib/motion/project/cocoapods.rb

@@ -27,6 +27,7 @@ unless defined?(Motion::Project::Config)
 end
 
 require 'cocoapods'
+require 'yaml'
 
 module Motion::Project
   class Config
@@ -46,7 +47,8 @@ module Motion::Project
   end
 
   class CocoaPods
-    VERSION = '1.0.3'
+    VERSION   = '1.0.4'
+    PODS_ROOT = 'vendor/Pods'
 
     def initialize(config)
       @config = config
@@ -59,8 +61,8 @@ module Motion::Project
       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.rootspec = @podfile unless cocoapods_v06_and_higher?
+      cp_config.integrate_targets = false if cocoapods_v06_and_higher?
       cp_config.project_root = Pathname.new(config.project_dir) + 'vendor'
     end
 
@@ -79,37 +81,62 @@ module Motion::Project
     # For now we only support one Pods target, this will have to be expanded
     # once we work on more spec support.
     def install!
-      @installer = pods_installer
+      if bridgesupport_file.exist? && pods_installer.lock_file.exist?
+        installed_pods_before = installed_pods
+      end
 
-      # CocoaPods 0.5.x backward compatibility
-      if @config.deployment_target && @installer.project.respond_to?(:build_configuration)
-        @installer.project.build_configuration("Debug").buildSettings["IPHONEOS_DEPLOYMENT_TARGET"]   = @config.deployment_target
-        @installer.project.build_configuration("Release").buildSettings["IPHONEOS_DEPLOYMENT_TARGET"] = @config.deployment_target
+      unless cocoapods_v06_and_higher?
+        pods_installer.project.build_configuration("Debug").buildSettings["IPHONEOS_DEPLOYMENT_TARGET"]   = @config.deployment_target
+        pods_installer.project.build_configuration("Release").buildSettings["IPHONEOS_DEPLOYMENT_TARGET"] = @config.deployment_target
       end
 
-      @installer.install!
+      pods_installer.install!
+
+      # Let RubyMotion re-generate the BridgeSupport file whenever the list of
+      # installed pods changes.
+      if bridgesupport_file.exist? && installed_pods_before && installed_pods_before != installed_pods
+        bridgesupport_file.delete
+      end
 
-      @config.vendor_project('vendor/Pods', :xcode,
+      @config.vendor_project(PODS_ROOT, :xcode,
         :target => 'Pods',
         :headers_dir => 'Headers',
         :products => %w{ libPods.a }
       )
 
-      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
-
-      if ldflags = xcconfig.to_hash['OTHER_LDFLAGS']
+      if ldflags = pods_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
+
+    def installed_pods
+      YAML.load(pods_installer.lock_file.read)['PODS']
+    end
+
+    def bridgesupport_file
+      Pathname.new(@config.project_dir) + PODS_ROOT + 'Pods.bridgesupport'
+    end
+
+    def pods_xcconfig
+      pods_installer.target_installers.find do |target_installer|
+        if cocoapods_v06_and_higher?
+          target_installer.target_definition.name == :default
+        else
+          target_installer.definition.name == :default
+        end
+      end.xcconfig
+    end
+
+    def cocoapods_v06_and_higher?
+      self.class.cocoapods_v06_and_higher?
+    end
+
+    def self.cocoapods_v06_and_higher?
+      # last 0.5.x version of CP
+      Gem::Version.new(Pod::VERSION) > Gem::Version.new('0.5.1')
+    end
   end
 end

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  segments_generated: true
+  version: 1.0.4
 platform: ruby
 authors: 
 - Laurent Sansonetti
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-29 00:00:00 +02:00
+date: 2012-06-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
         - 0
         - 5
         - 1
+        segments_generated: true
         version: 0.5.1
   requirement: *id001
   name: cocoapods
@@ -59,6 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -66,6 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []