cocoapods 0.14.0.rc2 → 0.14.0

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## Master
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0...master)
+
+## 0.14.0
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0.rc2...0.14.0) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.2...0.3.3)
+
+###### Bug fixes
+
+- In certain conditions the spec of an external would have been overridden
+  by the spec in the root of a Pod.
+  [#489](https://github.com/CocoaPods/CocoaPods/issues/489)
+- CocoaPods now uses a recent version of Octokit.
+  [#490](https://github.com/CocoaPods/CocoaPods/issues/490)
+- Fixed a bug that caused Pods with preferred dependencies to be always
+  installed.
+  [Specs#464](https://github.com/CocoaPods/CocoaPods/issues/464)
+- Fixed Xcode 4.4+ artwork warning.
+  [Specs#508](https://github.com/CocoaPods/CocoaPods/issues/508)
+
 ## 0.14.0.rc2
 
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0.rc1...0.14.0.rc2)
@@ -5,8 +26,11 @@
 ###### Bug fixes
 
 - Fix incorrect name for Pods from external sources with preferred subspecs.
+  [#485](https://github.com/CocoaPods/CocoaPods/issues/485)
 - Prevent duplication of Pod with a local source and mutliple activated specs.
+  [#485](https://github.com/CocoaPods/CocoaPods/issues/485)
 - Fixed the `uninitialized constant Pod::Lockfile::Digest` error.
+  [#484](https://github.com/CocoaPods/CocoaPods/issues/484)
 
 ## 0.14.0.rc1
 

data/README.md

@@ -33,8 +33,7 @@ $ [sudo] gem install cocoapods
 If you want to have CocoaPods generate documentation for each library, then install the [appledoc](http://gentlebytes.com/appledoc/) tool:
 
 ```
-$ brew install appledoc --HEAD
-$ ln -sf "`brew --prefix`/Cellar/appledoc/HEAD/Templates" ~/Library/Application\ Support/appledoc
+$ brew install appledoc
 ```
 
 Now that you've got CocoaPods installed you can easily add it to your project.

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.rc2'
+  VERSION = '0.14.0'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/dependency.rb

@@ -165,12 +165,26 @@ module Pod
         end
 
         def specification_from_external(sandbox, platform)
-          copy_external_source_into_sandbox(sandbox, platform)
+          podspec = copy_external_source_into_sandbox(sandbox, platform)
           spec = specification_from_local(sandbox, platform)
           raise Informative, "No podspec found for `#{name}' in #{description}" unless spec
           spec
         end
 
+        # Can store from a pathname or a string
+        #
+        def store_podspec(sandbox, podspec)
+          output_path = sandbox.root + "Local Podspecs/#{name}.podspec"
+          output_path.dirname.mkpath
+          if podspec.is_a?(String)
+            raise Informative, "No podspec found for `#{name}' in `#{description}'" unless podspec.include?('Spec.new')
+            output_path.open('w') { |f| f.puts(podspec) }
+          else
+            raise Informative, "No podspec found for `#{name}' in `#{description}'" unless podspec.exist?
+            FileUtils.copy(podspec, output_path)
+          end
+        end
+
         def ==(other)
           return if other.nil?
           name == other.name && params == other.params
@@ -184,6 +198,7 @@ module Pod
           target.rmtree if target.exist?
           downloader = Downloader.for_target(sandbox.root + name, @params)
           downloader.download
+          store_podspec(sandbox, target + "#{name}.podspec")
           if local_pod = sandbox.installed_pod_named(name, platform)
             local_pod.downloaded = true
           end
@@ -201,14 +216,10 @@ module Pod
       # can be http, file, etc
       class PodspecSource < AbstractExternalSource
         def copy_external_source_into_sandbox(sandbox, _)
-          output_path = sandbox.root + "Local Podspecs/#{name}.podspec"
-          output_path.dirname.mkpath
           puts "-> Fetching podspec for `#{name}' from: #{@params[:podspec]}" unless config.silent?
           path = @params[:podspec]
           path = Pathname.new(path).expand_path if path.start_with?("~")
-          open(path) do |io|
-            output_path.open('w') { |f| f << io.read }
-          end
+          open(path) { |io| store_podspec(sandbox, io.read) }
         end
 
         def description
@@ -224,9 +235,7 @@ module Pod
         end
 
         def copy_external_source_into_sandbox(sandbox, _)
-          output_path = sandbox.root + "Local Podspecs/#{name}.podspec"
-          output_path.dirname.mkpath
-          FileUtils.copy(pod_spec_path, output_path)
+          store_podspec(sandbox, pod_spec_path)
         end
 
         def specification_from_local(sandbox, platform)

data/lib/cocoapods/local_pod.rb

@@ -95,10 +95,13 @@ module Pod
     end
 
     # @return [String] A string representation of the pod which indicates if
-    #                  the pods comes from a local source.
+    #                  the pods comes from a local source or has a preferred
+    #                  dependency.
     #
     def to_s
-      top_specification.to_s
+      s =  top_specification.to_s
+      s << " defaulting to #{top_specification.preferred_dependency} subspec" if top_specification.preferred_dependency
+      s
     end
 
     # @return [String] The name of the Pod.

data/lib/cocoapods/lockfile.rb

@@ -204,6 +204,7 @@ module Pod
     # @return [void] Writes the Lockfile to {#path}.
     #
     def write_to_disk(path)
+      path.dirname.mkpath unless path.dirname.exist?
       File.open(path, 'w') {|f| f.write(to_yaml) }
       defined_in_file = path
     end

data/lib/cocoapods/sandbox.rb

@@ -55,11 +55,8 @@ module Pod
     end
 
     def podspec_for_name(name)
-      if spec_path = Dir[root + "#{name}/*.podspec"].first
-        Pathname.new(spec_path)
-      elsif spec_path = Dir[root + "Local Podspecs/#{name}.podspec"].first
-        Pathname.new(spec_path)
-      end
+      path = root + "Local Podspecs/#{name}.podspec"
+      path.exist? ? path : nil
     end
   end
 

data/lib/cocoapods/specification.rb

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

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.14.0.rc2
-  prerelease: 7
+  version: 0.14.0
+  prerelease: 
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -123,22 +139,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: xcodeproj
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3928809809918317926
+      hash: -46450679422976878
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: