Merge pull request #5 from jcampbell05/f/MultipleSourcesSupport

F/multiple sources support
jcampbell05 · Mar 15, 2016 · 732b64b · 732b64b
2 parents c12f6ea 4939b5e
commit 732b64b
Show file tree

Hide file tree

Showing 13 changed files with 116 additions and 50 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 1,7 @@
 PATH
  remote: .
  specs:
- cocoapods-deploy (0.0.5)
  cocoapods-deploy (0.0.6)
 
 GEM
  remote: https://rubygems.org/

diff --git a/cocoapods-deploy.gemspec b/cocoapods-deploy.gemspec
@@ -1,9 1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: cocoapods-deploy 0.0.5 ruby lib
 # stub: cocoapods-deploy 0.0.6 ruby lib
 
 Gem::Specification.new do |s|
  s.name = "cocoapods-deploy"
- s.version = "0.0.5"
  s.version = "0.0.6"
 
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
  s.require_paths = ["lib"]

diff --git a/lib/cocoapods-deploy/command/deploy.rb b/lib/cocoapods-deploy/command/deploy.rb
@@ -97,8 97,9 @@ def install_sources_for_lockfile
  def install_sources_for_pod(pod)
  transformer = DeployTransformer.new(config.lockfile, config.sandbox)
  dep = transformer.transform_dependency_name(pod)
- source = ExternalSources.from_dependency(dep, config.podfile.defined_in_file)
- source.fetch(config.sandbox)
 
  downloader = DeployDownloader.new(dep)
  downloader.download(config)
  end
 
  # Triggers the CocoaPods install process
@@ -111,6 112,7 @@ def run
  setup_environment
  verify_environment
 
  # TODO: BDD Patch
  apply_resolver_patch
 
  install_sources_for_lockfile

diff --git a/lib/cocoapods-deploy/deploy_downloader.rb b/lib/cocoapods-deploy/deploy_downloader.rb
@@ -0,0 1,52 @@
 module Pod
  class DeployDownloader
 
  attr_accessor :dependency
 
  def initialize(dependency)
  @dependency = dependency
  end
 
  def download(config)
  if @dependency.external_source.key?(:podspec)
  download_podspec(config)
  else
  download_source(config)
  end
  end
 
  def download_source(config)
  source = ExternalSources.from_dependency(dependency, config.podfile.defined_in_file)
  source.fetch
  end
 
  def download_podspec(config)
  dependencies_for_sources(config).each do |dep|
  source = ExternalSources.from_dependency(dep, config.podfile.defined_in_file)
 
  begin
  return source.fetch
  rescue
  end
  end
 
  raise Informative, "Failed to deploy podspec for `#{@dependency.name}`."
  end
 
  def podfile_sources(config)
  return ["https://github.com/CocoaPods/CocoaPods.git"] if config.podfile.sources.empty?
  return config.podfile.sources
  end
 
  def dependencies_for_sources(config)
  podfile_sources(config).map do |source|
  filename = File.basename(source, ".*")
  raw_url = File.join( File.dirname(source), filename )
  root_url = "#{raw_url}/raw"
  source = @dependency.external_source[:podspec].gsub('{root-url}', root_url)
 
  Dependency.new(@dependency.name, {:podspec => source})
  end
  end
  end
 end
diff --git a/lib/cocoapods-deploy/deploy_transformer.rb b/lib/cocoapods-deploy/deploy_transformer.rb
@@ -64,7 64,7 @@ def parse_dependency(name_or_hash)
  end
 
  def podspec_url(pod, version)
- "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/#{pod}/#{version}/#{pod}.podspec.json"
  "{root-url}/master/Specs/#{pod}/#{version}/#{pod}.podspec.json"
  end
 
  def collect_podspec_dependencies(name_or_hash)

diff --git a/lib/cocoapods-deploy/gem_version.rb b/lib/cocoapods-deploy/gem_version.rb
@@ -1,3 1,3 @@
 module CocoapodsDeploy
- VERSION = "0.0.5"
  VERSION = "0.0.6"
 end
diff --git a/lib/cocoapods_plugin.rb b/lib/cocoapods_plugin.rb
@@ -1,4 1,5 @@
 require 'cocoapods-deploy/deploy_analyzer'
 require 'cocoapods-deploy/deploy_downloader'
 require 'cocoapods-deploy/deploy_installer'
 require 'cocoapods-deploy/deploy_transformer'
 require 'cocoapods-deploy/command'
diff --git a/spec/command/deploy_installer_spec.rb b/spec/command/deploy_installer_spec.rb
diff --git a/spec/command/deploy_spec.rb b/spec/command/deploy_spec.rb
@@ -1,13 1,5 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
-class MockExternalSource
- def initialize
- end
-
- def fetch
- end
-end
-
 module Pod
  describe Command::Deploy do
 
@@ -122,30 114,17 @@ module Pod
  @transformer.stubs(:transform_dependency_name).with("Google/Analytics").returns(@dependency)
  DeployTransformer.stubs(:new).returns(@transformer)
 
- @source = MockExternalSource.new
  @command.stubs(:transform_podfile).returns(@podfile)
  @command.stubs(:install)
  end
 
- it 'should create new external source' do
- ExternalSources.expects(:from_dependency).with(@dependency, @podfile.defined_in_file).returns(@source)
- @source.stubs(:fetch)
- @command.run
- end
  it 'should download source' do
  downloader = DeployDownloader.new(nil)
  downloader.expects(:download)
 
- it 'should fetch source' do
- ExternalSources.stubs(:from_dependency).returns(@source)
- @source.expects(:fetch)
  DeployDownloader.stubs(:new).returns(downloader)
  @command.run
  end
-
- # TODO: Reducing duplicates
-
- # TODO: Patches
-
- # Figure out how to test external source here.
-
- # Figure out how to handle location
  end
  end
 end
diff --git a/spec/command/deploy_analyzer_Spec.rb → spec/deploy_analyzer_spec.rb b/spec/command/deploy_analyzer_Spec.rb → spec/deploy_analyzer_spec.rb
@@ -1,4 1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../spec_helper', __FILE__)
 
 module Pod
  describe DeployAnalyzer do

diff --git a/spec/deploy_downloader_spec.rb b/spec/deploy_downloader_spec.rb
@@ -0,0 1,38 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 class MockExternalSource
  def initialize
  end
 
  def fetch
  end
 end
 
 module Pod
  describe DeployDownloader do
 
  before do
  @podfile = Podfile.new
  Config.instance.stubs(:podfile).returns(@podfile)
 
  @source = MockExternalSource.new
  ExternalSources.stubs(:from_dependency).returns(@source)
  end
 
  it "should external source outside of repo" do
  dependency = Dependency.new("AFNetworking", { :git => "https://github.com/gowalla/AFNetworking.git"})
  downloader = DeployDownloader.new(dependency)
 
  @source.expects(:fetch)
  downloader.download(Config.instance)
  end
 
  it "should download source from main repo" do
  dependency = Dependency.new("AFNetworking", { :podspec => "{root-url}/master/Specs/AFNetworking/1.0/AFNetworking.podspec.json"})
  downloader = DeployDownloader.new(dependency)
 
  @source.expects(:fetch)
  downloader.download(Config.instance)
  end
  end
 end
diff --git a/spec/deploy_installer_spec.rb b/spec/deploy_installer_spec.rb
@@ -0,0 1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 module Pod
  describe DeployInstaller do
  end
 end
diff --git a/spec/command/deploy_transformer_spec.rb → spec/deploy_transformer_spec.rb b/spec/command/deploy_transformer_spec.rb → spec/deploy_transformer_spec.rb
@@ -1,4 1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../spec_helper', __FILE__)
 
 def transform_podfile(lockfile, sandbox, podfile)
  transformer = Pod::DeployTransformer.new(lockfile, sandbox)
@@ -42,7 42,7 @@ module Pod
  end
 
  podfile = transform_podfile(lockfile, nil, original_podfile)
- dependency = Dependency.new("Mixpanel", {:podspec => "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/Mixpanel/1.0/Mixpanel.podspec.json"})
  dependency = Dependency.new("Mixpanel", {:podspec => "{root-url}/master/Specs/Mixpanel/1.0/Mixpanel.podspec.json"})
  podfile.dependencies.should.include dependency
  end
 
@@ -56,7 56,7 @@ module Pod
  end
 
  podfile = transform_podfile(lockfile, nil, original_podfile)
- dependency = Dependency.new("Google/Analytics", {:podspec => "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/Google/1.0/Google.podspec.json"})
  dependency = Dependency.new("Google/Analytics", {:podspec => "{root-url}/master/Specs/Google/1.0/Google.podspec.json"})
  podfile.dependencies.should.include dependency
  end
  end
@@ -100,7 100,7 @@ module Pod
  end
 
  podfile = transform_podfile(lockfile, @sandbox, original_podfile)
- dependency = Dependency.new("Google", {:podspec => "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/Google/1.0/Google.podspec.json"})
  dependency = Dependency.new("Google", {:podspec => "{root-url}/master/Specs/Google/1.0/Google.podspec.json"})
  podfile.dependencies.should.include dependency
  end
 
@@ -119,16 119,10 @@ module Pod
  end
 
  podfile = transform_podfile(lockfile, @sandbox, original_podfile)
- dependency = Dependency.new("Mixpanel/Mixpanel", {:podspec => "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/Mixpanel/1.0/Mixpanel.podspec.json"})
  dependency = Dependency.new("Mixpanel/Mixpanel", {:podspec => "{root-url}/master/Specs/Mixpanel/1.0/Mixpanel.podspec.json"})
  podfile.dependencies.should.include dependency
  end
  end
-
- # TODO: Reducing duplicates
-
- # Figure out how to test external source here.
-
- # TODO: Test collect_podspec_dependencies as well
  end
  end
 end