motion-cocoapods 1.2.2 → 1.3.0.rc1

data/lib/motion/project/cocoapods.rb

@@ -1,15 +1,15 @@
 # Copyright (c) 2012, Laurent Sansonetti <lrz@hipbyte.com>
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # 1. Redistributions of source code must retain the above copyright notice,
 #    this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright notice,
 #    this list of conditions and the following disclaimer in the documentation
 #    and/or other materials provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -37,23 +37,28 @@ module Motion::Project
     def pods(&block)
       @pods ||= Motion::Project::CocoaPods.new(self)
       if block
+        @pods.instance_eval(&block)
+
         # We run the update/install commands only if necessary.
-        podfile_lock = Pod::Config.instance.project_lockfile
-        podfile_changed = (!File.exist?(podfile_lock) or File.mtime(self.project_file) > File.mtime(podfile_lock))
-        if podfile_changed and !ENV['COCOAPODS_NO_UPDATE']
-          Pod::Command::Repo.new(Pod::Command::ARGV.new(["update"])).run
+        cp_config = Pod::Config.instance
+        analyzer = Pod::Installer::Analyzer.new(cp_config.sandbox, @pods.podfile, cp_config.lockfile)
+        if analyzer.needs_install?
+          @pods.install!
         end
-        @pods.instance_eval(&block)
-        @pods.install!
+        @pods.link_project
       end
       @pods
     end
   end
 
+  #---------------------------------------------------------------------------#
+
   class CocoaPods
-    VERSION   = '1.2.2'
+    VERSION   = '1.3.0.rc1'
     PODS_ROOT = 'vendor/Pods'
 
+    attr_accessor :podfile
+
     def initialize(config)
       @config = config
 
@@ -61,6 +66,7 @@ module Motion::Project
       @podfile.platform :ios, config.deployment_target
       cp_config.podfile = @podfile
 
+      cp_config.skip_repo_update = ENV['COCOAPODS_NO_UPDATE']
       if ENV['COCOAPODS_VERBOSE']
         cp_config.verbose = true
       else
@@ -68,9 +74,12 @@ module Motion::Project
       end
 
       cp_config.integrate_targets = false
-      cp_config.project_root = Pathname.new(File.expand_path(config.project_dir)) + 'vendor'
+      cp_config.installation_root = Pathname.new(File.expand_path(config.project_dir)) + 'vendor'
     end
 
+    # DSL
+    #-------------------------------------------------------------------------#
+
     def pod(*name_and_version_requirements, &block)
       @podfile.pod(*name_and_version_requirements, &block)
     end
@@ -84,32 +93,31 @@ module Motion::Project
       @podfile.post_install(&block)
     end
 
+    # Installation & Linking
+    #-------------------------------------------------------------------------#
+
     def pods_installer
-      @installer ||= begin
-        # This should move into a factory method in CocoaPods.
-        sandbox = Pod::Sandbox.new(cp_config.project_pods_root)
-        resolver = Pod::Resolver.new(@podfile, cp_config.lockfile, sandbox)
-        resolver.update_mode = !!ENV['UPDATE']
-        Pod::Installer.new(resolver)
-      end
+      @installer ||= Pod::Installer.new(cp_config.sandbox, @podfile, cp_config.lockfile)
     end
 
+    # Performs a CocoaPods Installation.
+    #
     # For now we only support one Pods target, this will have to be expanded
     # once we work on more spec support.
+    #
+    # Let RubyMotion re-generate the BridgeSupport file whenever the list of
+    # installed pods changes.
+    #
     def install!
-      if bridgesupport_file.exist? && cp_config.project_lockfile.exist?
-        installed_pods_before = installed_pods
-      end
-
       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
+      if bridgesupport_file.exist? && !pods_installer.installed_specs.empty?
         bridgesupport_file.delete
       end
+    end
 
+    # Adds the Pods project to the RubyMotion config as a vendored project.
+    #
+    def link_project
       install_resources
 
       @config.vendor_project(PODS_ROOT, :xcode,
@@ -143,12 +151,25 @@ module Motion::Project
       end
     end
 
-    def cp_config
-      Pod::Config.instance
+    def install_resources
+      FileUtils.mkdir_p(resources_dir)
+      resources.each do |file|
+        begin
+          FileUtils.cp_r file, resources_dir
+        rescue ArgumentError => exc
+          unless exc.message =~ /same file/
+            raise
+          end
+        end
+      end
+      @config.resources_dirs << resources_dir.to_s
     end
 
-    def installed_pods
-      YAML.load(cp_config.project_lockfile.read)['PODS']
+    # Helpers
+    #-------------------------------------------------------------------------#
+
+    def cp_config
+      Pod::Config.instance
     end
 
     def bridgesupport_file
@@ -160,14 +181,9 @@ module Motion::Project
       Xcodeproj::Config.new(path)
     end
 
-    def resources_dir
-      Pathname.new(@config.project_dir) + PODS_ROOT + 'Resources'
-    end
-
     def resources
       resources = []
-      pods_resources_path = Pathname.new(@config.project_dir) + PODS_ROOT + "Pods-resources.sh"
-      File.open(pods_resources_path) { |f|
+      File.open(Pathname.new(@config.project_dir) + PODS_ROOT + 'Pods-resources.sh') { |f|
         f.each_line do |line|
           if matched = line.match(/install_resource\s+'(.*)'/)
             resources << Pathname.new(@config.project_dir) + PODS_ROOT + matched[1]
@@ -177,18 +193,8 @@ module Motion::Project
       resources
     end
 
-    def install_resources
-      FileUtils.mkdir_p(resources_dir)
-      resources.each do |file|
-        begin
-          FileUtils.cp_r file, resources_dir
-        rescue ArgumentError => exc
-          unless exc.message =~ /same file/
-            raise
-          end
-        end
-      end
-      @config.resources_dirs << resources_dir.to_s
+    def resources_dir
+      Pathname.new(@config.project_dir) + PODS_ROOT + 'Resources'
     end
 
     def inspect

metadata

@@ -1,29 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
 description: motion-cocoapods allows RubyMotion projects to have access to the CocoaPods
   dependency manager.
 email: lrz@hipbyte.com
@@ -37,25 +40,27 @@ files:
 - LICENSE
 homepage: http://www.rubymotion.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: CocoaPods integration for RubyMotion projects
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9a6515bb61266bad77ded4c9f831a9440aed449e
-  data.tar.gz: 994cc2b82fa82f326e86696e2339fccef531eff7
-SHA512:
-  metadata.gz: c6d54b304477048265ed2ab7702078eb8f5fe3ed2827637532da4c8468ef97d7d102887d90e5c28f8e59edd4c0df1ce024eec47ee7e022583ad6dc7a7edd9cc5
-  data.tar.gz: 29f060ffc2213922b8563ac275a4be19baea01f5f69dcd3554b963e37d8a10b809e52f25a0ef66b8f369efab21b398f36a566febc613f1e386d800f4789a2ff0