motion-cocoapods 1.1.4 → 1.2.0

data/README.rdoc

@@ -40,16 +40,21 @@ dependencies, build them and link them to your application executable.
 
 == Options
 
+If a Podfile.lock file exists, this will be used to install specific versions.
+To update the versions, you can set the +UPDATE+ env variable.
+
+    $ rake UPDATE=1
+
 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.
 
-    $ env COCOAPODS_VERBOSE=1 rake
+    $ rake COCOAPODS_VERBOSE=1
 
 On every build, CocoaPods will try to update the specification repos in
 +~/.cocoapods+, if you want to skip this then set the +COCOAPODS_NO_UPDATE+ env
 variable.
 
-    $ env COCOAPODS_NO_UPDATE=1 rake
+    $ rake COCOAPODS_NO_UPDATE=1
 
 
 == Contribute

data/lib/motion/project/cocoapods.rb

@@ -38,33 +38,35 @@ module Motion::Project
       @pods ||= Motion::Project::CocoaPods.new(self)
       if block
         # We run the update/install commands only if necessary.
-        podfile_lock = File.join(self.project_dir, 'vendor', 'Podfile.lock')
+        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
         end
         @pods.instance_eval(&block)
-        @pods.install!(podfile_changed)
+        @pods.install!
       end
       @pods
     end
   end
 
   class CocoaPods
-    VERSION   = '1.1.4'
+    VERSION   = '1.2.0'
     PODS_ROOT = 'vendor/Pods'
 
     def initialize(config)
       @config = config
+
       @podfile = Pod::Podfile.new {}
-      @podfile.platform :ios, :deployment_target => config.deployment_target
+      @podfile.platform :ios, config.deployment_target
+      cp_config.podfile = @podfile
 
-      cp_config = Pod::Config.instance
       if ENV['COCOAPODS_VERBOSE']
         cp_config.verbose = true
       else
         cp_config.silent = true
       end
+
       cp_config.integrate_targets = false
       cp_config.project_root = Pathname.new(File.expand_path(config.project_dir)) + 'vendor'
     end
@@ -83,21 +85,28 @@ module Motion::Project
     end
 
     def pods_installer
-      @installer ||= Pod::Installer.new(@podfile)
+      @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
     end
 
     # For now we only support one Pods target, this will have to be expanded
     # once we work on more spec support.
-    def install!(podfile_changed)
-      if bridgesupport_file.exist? && pods_installer.lock_file.exist?
+    def install!
+      if bridgesupport_file.exist? && cp_config.project_lockfile.exist?
         installed_pods_before = installed_pods
       end
 
-      pods_installer.install! if podfile_changed
+      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? && installed_pods_before &&
+          installed_pods_before != installed_pods
         bridgesupport_file.delete
       end
 
@@ -124,8 +133,12 @@ module Motion::Project
       end
     end
 
+    def cp_config
+      Pod::Config.instance
+    end
+
     def installed_pods
-      YAML.load(pods_installer.lock_file.read)['PODS']
+      YAML.load(cp_config.project_lockfile.read)['PODS']
     end
 
     def bridgesupport_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.14.0
 description: motion-cocoapods allows RubyMotion projects to have access to the CocoaPods
   dependency manager.
 email: lrz@hipbyte.com
@@ -50,18 +50,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4469866718672717141
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4469866718672717141
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23