cocoapods 0.14.0.rc1 → 0.14.0.rc2

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-## Master
+## 0.14.0.rc2
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0.rc1...0.14.0.rc2)
+
+###### Bug fixes
+
+- Fix incorrect name for Pods from external sources with preferred subspecs.
+- Prevent duplication of Pod with a local source and mutliple activated specs.
+- Fixed the `uninitialized constant Pod::Lockfile::Digest` error.
+
+## 0.14.0.rc1
 
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.13.0...0.14.0.rc1) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.1...0.3.2)
 

data/lib/cocoapods.rb

@@ -13,7 +13,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
 end
 
 module Pod
-  VERSION = '0.14.0.rc1'
+  VERSION = '0.14.0.rc2'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/installer.rb

@@ -48,17 +48,11 @@ module Pod
     #
     def install_dependencies!
       pods.sort_by { |pod| pod.top_specification.name.downcase }.each do |pod|
-        name = pod.top_specification.name
-        should_install = @resolver.should_install?(name) || !pod.exists?
+        should_install = @resolver.should_install?(pod.top_specification.name) || !pod.exists?
 
         unless config.silent?
           marker = config.verbose ? "\n-> ".green : ''
-          if subspec_name = pod.top_specification.preferred_dependency
-            name = "#{pod.top_specification.name}/#{subspec_name} (#{pod.top_specification.version})"
-          else
-            name = pod.to_s
-          end
-          puts marker << ( should_install ? "Installing #{name}".green : "Using #{name}" )
+          puts marker << ( should_install ? "Installing #{pod}".green : "Using #{pod}" )
         end
 
         if should_install
@@ -196,7 +190,7 @@ module Pod
         @pods_by_spec[target_definition.platform] = {}
         result[target_definition] = specs.map do |spec|
           if spec.local?
-            LocalPod::LocalSourcedPod.new(spec, sandbox, target_definition.platform)
+            @sandbox.locally_sourced_pod_for_spec(spec, target_definition.platform)
           else
             @sandbox.local_pod_for_spec(spec, target_definition.platform)
           end

data/lib/cocoapods/lockfile.rb

@@ -1,3 +1,5 @@
+require 'digest'
+
 module Pod
   class Lockfile
 

data/lib/cocoapods/sandbox.rb

@@ -14,6 +14,7 @@ module Pod
       @build_headers = HeadersDirectory.new(self, BUILD_HEADERS_DIR)
       @public_headers = HeadersDirectory.new(self, PUBLIC_HEADERS_DIR)
       @cached_local_pods = {}
+      @cached_locally_sourced_pods = {}
       FileUtils.mkdir_p(@root)
     end
 
@@ -37,6 +38,15 @@ module Pod
       end
     end
 
+    # TODO: refactor the pods from a local source should not be chached by the sandbox
+    #
+    def locally_sourced_pod_for_spec(spec, platform)
+      key = [spec.top_level_parent.name, platform.to_sym]
+      (@cached_locally_sourced_pods[key] ||= LocalPod::LocalSourcedPod.new(spec.top_level_parent, self, platform)).tap do |pod|
+        pod.add_specification(spec)
+      end
+    end
+
     def installed_pod_named(name, platform)
       if spec_path = podspec_for_name(name)
         key = [name, platform.to_sym]

data/lib/cocoapods/specification.rb

@@ -458,7 +458,8 @@ module Pod
     end
 
     def to_s
-      "#{name} (#{version})"
+      display_name = preferred_dependency.nil? ? name : "#{name}/#{preferred_dependency}"
+      "#{display_name} (#{version})"
     end
 
     def inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.14.0.rc1
+  version: 0.14.0.rc2
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -253,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 202149505213323645
+      hash: 3928809809918317926
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: