Applies resolver patch.

jcampbell05 · Mar 11, 2016 · d329e72 · d329e72
1 parent 8f81936
commit d329e72
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/lib/cocoapods-deploy/command/deploy.rb b/lib/cocoapods-deploy/command/deploy.rb
@@ -44,6 44,29 @@ def transform_podfile
  transformer.transform_podfile(config.podfile)
  end
 
  # Applies patch to resolver as it needs help being pointed to use the
  # local podspecs due to limitations in CocoaPods. We may be able to remove
  # this in the future.
  def apply_resolver_patch
 
  Resolver.class_eval do
  def find_cached_set(dependency)
  name = dependency.root_name
 
  unless cached_sets[name]
  spec = sandbox.specification(name)
  set = Specification::Set::External.new(spec)
  cached_sets[name] = set
  unless set
  raise Molinillo::NoSuchDependencyError.new(dependency) # rubocop:disable Style/RaiseArgs
  end
  end
 
  cached_sets[name]
  end
  end
  end
 
  # Installed required sources.
  def install_sources_for_lockfile
  config.lockfile.pod_names.each do |dep|
@@ -64,12 87,15 @@ def run
  setup_environment
  verify_environment
 
  apply_resolver_patch
 
  #TODO: Update this so we get the pods actually used in the lockfile.
  # - Then we use this as a look up for the podfile.
  # - We map the ones we match to the lockfile
  # - We leave it to the resolver to notice there is something missing
  # - When it does notice this we catch the error and replace it with something
  # more informative
  # - Somehow need to make sure platform ones are ignored.
 
  #Install the sources from the lockfile
  install_sources_for_lockfile

diff --git a/lib/cocoapods-deploy/deploy_downloader.rb b/lib/cocoapods-deploy/deploy_downloader.rb
@@ -0,0 1,4 @@
 # This make sure we download all of the pods declared in the lockfile.
 # - Once per pod spec
 # - All even if they don't needed (needed for resolution)
 # - Should respect checkout options