Commit 08e2ddf3 authored by Samuel E. Giddins's avatar Samuel E. Giddins

[Gemspec] Molinillo is born

parent 9f45146f
...@@ -18,7 +18,7 @@ group :development do ...@@ -18,7 +18,7 @@ group :development do
cp_gem 'cocoapods-trunk', 'cocoapods-trunk' cp_gem 'cocoapods-trunk', 'cocoapods-trunk'
cp_gem 'cocoapods-try', 'cocoapods-try' cp_gem 'cocoapods-try', 'cocoapods-try'
cp_gem 'xcodeproj', 'Xcodeproj' cp_gem 'xcodeproj', 'Xcodeproj'
cp_gem 'resolver', 'Resolver' cp_gem 'molinillo', 'Molinillo'
gem 'bacon' gem 'bacon'
gem 'mocha' gem 'mocha'
......
...@@ -17,11 +17,11 @@ GIT ...@@ -17,11 +17,11 @@ GIT
nap (~> 0.8.0) nap (~> 0.8.0)
GIT GIT
remote: https://github.com/CocoaPods/Resolver.git remote: https://github.com/CocoaPods/Molinillo.git
revision: c9532593ab99e25aa1aa61c1410e72ded3c2a2f1 revision: b66281386b4d226801afc8fd02cb6514c80b81b6
branch: master branch: master
specs: specs:
resolver (0.0.1) molinillo (0.0.1)
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
...@@ -78,9 +78,9 @@ PATH ...@@ -78,9 +78,9 @@ PATH
colored (~> 1.2) colored (~> 1.2)
escape (~> 0.0.4) escape (~> 0.0.4)
json_pure (~> 1.8) json_pure (~> 1.8)
molinillo (~> 0)
nap (~> 0.8) nap (~> 0.8)
open4 (~> 1.3) open4 (~> 1.3)
resolver (~> 0)
xcodeproj (~> 0.19.4) xcodeproj (~> 0.19.4)
GEM GEM
...@@ -182,11 +182,11 @@ DEPENDENCIES ...@@ -182,11 +182,11 @@ DEPENDENCIES
mime-types (< 2.0) mime-types (< 2.0)
mocha mocha
mocha-on-bacon mocha-on-bacon
molinillo!
prettybacon prettybacon
pry pry
rake rake
rb-fsevent rb-fsevent
resolver!
rubocop rubocop
ruby-prof ruby-prof
webmock webmock
......
...@@ -34,7 +34,7 @@ Gem::Specification.new do |s| ...@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'cocoapods-plugins', '~> 0.3.1' s.add_runtime_dependency 'cocoapods-plugins', '~> 0.3.1'
s.add_runtime_dependency 'cocoapods-try', '~> 0.4.1' s.add_runtime_dependency 'cocoapods-try', '~> 0.4.1'
s.add_runtime_dependency 'cocoapods-trunk', '~> 0.3.1' s.add_runtime_dependency 'cocoapods-trunk', '~> 0.3.1'
s.add_runtime_dependency 'resolver', '~> 0' s.add_runtime_dependency 'molinillo', '~> 0'
s.add_runtime_dependency 'colored', '~> 1.2' s.add_runtime_dependency 'colored', '~> 1.2'
s.add_runtime_dependency 'escape', '~> 0.0.4' s.add_runtime_dependency 'escape', '~> 0.0.4'
......
require 'colored' require 'colored'
require 'claide' require 'claide'
require 'resolver' require 'molinillo/errors'
module Resolver module Molinillo
class ResolverError class ResolverError
include CLAide::InformativeError include CLAide::InformativeError
end end
......
require 'resolver' require 'molinillo'
require 'cocoapods/resolver/lazy_specification' require 'cocoapods/resolver/lazy_specification'
module Pod module Pod
...@@ -51,13 +51,13 @@ module Pod ...@@ -51,13 +51,13 @@ module Pod
# #
def resolve def resolve
dependencies = @podfile.target_definition_list.map(&:dependencies).flatten dependencies = @podfile.target_definition_list.map(&:dependencies).flatten
base = locked_dependencies.reduce(::Resolver::DependencyGraph.new) do |graph, locked| base = locked_dependencies.reduce(Molinillo::DependencyGraph.new) do |graph, locked|
graph.tap { |g| g.add_root_vertex(locked.name, locked) } graph.tap { |g| g.add_root_vertex(locked.name, locked) }
end end
@cached_sets = {} @cached_sets = {}
@activated = ::Resolver::Resolver.new(self, self).resolve(dependencies, base) @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, base)
specs_by_target specs_by_target
rescue ::Resolver::ResolverError => e rescue Molinillo::ResolverError => e
raise Informative, e.message raise Informative, e.message
end end
...@@ -93,7 +93,7 @@ module Pod ...@@ -93,7 +93,7 @@ module Pod
# @!group Specification Provider # @!group Specification Provider
include ::Resolver::SpecificationProvider include Molinillo::SpecificationProvider
def search_for(dependency) def search_for(dependency)
@search ||= {} @search ||= {}
...@@ -165,7 +165,7 @@ module Pod ...@@ -165,7 +165,7 @@ module Pod
# @!group Resolver UI # @!group Resolver UI
include ::Resolver::UI include Molinillo::UI
#-------------------------------------------------------------------------# #-------------------------------------------------------------------------#
...@@ -213,7 +213,7 @@ module Pod ...@@ -213,7 +213,7 @@ module Pod
end end
cached_sets[name] = set cached_sets[name] = set
unless set unless set
raise ::Resolver::NoSuchDependencyError.new(dependency) raise Molinillo::NoSuchDependencyError.new(dependency)
end end
end end
cached_sets[name] cached_sets[name]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment