cocoapods 0.38.0.beta.2 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 923ec63f64a122d95ab696516d46354779740e21
-  data.tar.gz: 20c71f489b0a564f487095d9110da01e6d7cbead
+  metadata.gz: 38f1d0086c53abf7931b2e48826d9177640d79a8
+  data.tar.gz: 33709e3b43453a8790b9ebfc578774d2528f73c3
 SHA512:
-  metadata.gz: d183a05940a1b9db8499cec101f047cc3b75d8e5c63af41e92bfa17742c326a2d5a1608b31e3af6b8bbb26e20cb753cd4ad24b2b0d198194a7bb3fcc1647951e
-  data.tar.gz: 39e91c4ac906c500aac52ff62315bca3234945ccb57cf5f3fdc0787304755a3078195b43e7be42d26e78412c8723eaedb702925c787defe0120a3b566f0ac2bc
+  metadata.gz: 51a5fa2e47335ad50c008a316edd3e5152649df3372a8221333166958de425c9d05993b603bf510b281ea413e1a4273adefc8dfe5f7113f10f44bea9f56e7f2c
+  data.tar.gz: 6ebb339fb126a197528187117e970c990c09c6f66621f7e08840a3017cf36605e6e3fac9474522605eb079d8a67569b09e7d8682057e64ffe944325d5be56c06

data/CHANGELOG.md

@@ -4,6 +4,23 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 0.38.0
+
+##### Enhancements
+
+* Improve the message shown when trying to use Swift Pods without frameworks.
+  Now it includes the offending Pods so that the user can take action to remove
+  the Pods, if they don’t want to move to frameworks yet.  
+  [#3830](https://github.com/CocoaPods/CocoaPods/pull/3830)
+  [Eloy Durán](https://github.com/alloy)
+
+##### Bug Fixes
+
+* Properly merge the `user_target_xcconfig`s of multiple subspecs.  
+  [#3813](https://github.com/CocoaPods/CocoaPods/issues/3813)
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 0.38.0.beta.2
 
 ##### Enhancements
@@ -91,6 +108,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 * The notice about a new version being available will now include our
   recommendation of using the latest stable version.  
   [Hugo Tunius](https://github.com/k0nserv)
+  [#3667](https://github.com/CocoaPods/CocoaPods/pull/3667)
 
 * New commands `pod cache list` and `pod cache clean` allows you to see the
   contents of the cache and clean it.  
@@ -121,6 +139,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 * Cache globbing in `PathList` to speed up `pod install`.  
   [Vincent Isambart](https://github.com/vincentisambart)
+  [#3699](https://github.com/CocoaPods/CocoaPods/pull/3699)
 
 * CocoaPods will validate your podfile and try to identify problems
   and conflicts in how you've specified the dependencies.  

data/lib/cocoapods/executable.rb

@@ -48,8 +48,8 @@ module Pod
     # @todo   Find a way to display the live output of the commands.
     #
     def self.execute_command(executable, command, raise_on_failure)
-      bin = `which #{executable}`.strip
-      raise Informative, "Unable to locate the executable `#{executable}`" if bin.empty?
+      bin = which(executable)
+      raise Informative, "Unable to locate the executable `#{executable}`" unless bin
 
       require 'shellwords'
 
@@ -75,6 +75,26 @@ module Pod
       output
     end
 
+    # Returns the absolute path to the binary with the given name on the current
+    # `PATH`, or `nil` if none is found.
+    #
+    # @param  [String] program
+    #         The name of the program being searched for.
+    #
+    # @return [String,Nil] The absolute path to the given program, or `nil` if
+    #                      it wasn't found in the current `PATH`.
+    #
+    def self.which(program)
+      program = program.to_s
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        bin = File.expand_path(program, path)
+        if File.file?(bin) && File.executable?(bin)
+          return bin
+        end
+      end
+      nil
+    end
+
     private
 
     def self.popen3(bin, command, stdout, stderr)

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.38.0.beta.2' unless defined? Pod::VERSION
+  VERSION = '0.38.0' unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -194,15 +194,16 @@ module Pod
           target.pod_targets_for_build_configuration(@configuration_name)
         end
 
-        # Returns the +user_target_xcconfig+ for all pod targets grouped by keys
+        # Returns the +user_target_xcconfig+ for all pod targets and their spec
+        # consumers grouped by keys
         #
         # @return [Hash{String,Hash{Target,String}]
         #
-        def user_target_xcconfig_values_by_target_by_key
+        def user_target_xcconfig_values_by_consumer_by_key
           pod_targets.each_with_object({}) do |target, hash|
             target.spec_consumers.each do |spec_consumer|
               spec_consumer.user_target_xcconfig.each do |k, v|
-                (hash[k] ||= {})[target] = v
+                (hash[k] ||= {})[spec_consumer] = v
               end
             end
           end
@@ -214,7 +215,7 @@ module Pod
         # @return [Hash{String, String}]
         #
         def merged_user_target_xcconfigs
-          settings = user_target_xcconfig_values_by_target_by_key
+          settings = user_target_xcconfig_values_by_consumer_by_key
           settings.each_with_object({}) do |(key, values_by_target), xcconfig|
             uniq_values = values_by_target.values.uniq
             values_are_bools = uniq_values.all? { |v| v =~ /(yes|no)/i }
@@ -222,7 +223,7 @@ module Pod
               # Boolean build settings
               if uniq_values.count > 1
                 UI.warn 'Can\'t merge user_target_xcconfig for pod targets: ' \
-                  "#{values_by_target.keys.map(&:label)}. Boolean build "\
+                  "#{values_by_target.keys.map(&:name)}. Boolean build "\
                   "setting #{key} has different values."
               else
                 xcconfig[key] = uniq_values.first
@@ -234,7 +235,7 @@ module Pod
               # Singular build settings
               if uniq_values.count > 1
                 UI.warn 'Can\'t merge user_target_xcconfig for pod targets: ' \
-                  "#{values_by_target.keys.map(&:label)}. Singular build "\
+                  "#{values_by_target.keys.map(&:name)}. Singular build "\
                   "setting #{key} has different values."
               else
                 xcconfig[key] = uniq_values.first

data/lib/cocoapods/installer.rb

@@ -411,10 +411,13 @@ module Pod
         aggregate_target.user_build_configurations.keys.each do |config|
           pod_targets = aggregate_target.pod_targets_for_build_configuration(config)
 
-          if pod_targets.any?(&:uses_swift?)
+          swift_pods = pod_targets.select(&:uses_swift?)
+          unless swift_pods.empty?
             raise Informative, 'Pods written in Swift can only be integrated as frameworks; this ' \
               'feature is still in beta. Add `use_frameworks!` to your Podfile or target to opt ' \
-              'into using it.'
+              'into using it. ' \
+              "The Swift #{swift_pods.size == 1 ? 'Pod being used is' : 'Pods being used are'}: " +
+              swift_pods.map(&:name).to_sentence
           end
         end
       end

data/lib/cocoapods/resolver.rb

@@ -235,8 +235,7 @@ module Pod
 
     # Called before resolution starts.
     #
-    # Completely silence this, as we show nothing in normal mode and debug
-    # information in verbose mode.
+    # Completely silence this, as we show nothing.
     #
     # @return [Void]
     #
@@ -245,8 +244,7 @@ module Pod
 
     # Called after resolution ends.
     #
-    # Completely silence this, as we show nothing in normal mode and debug
-    # information in verbose mode.
+    # Completely silence this, as we show nothing.
     #
     # @return [Void]
     #
@@ -255,23 +253,13 @@ module Pod
 
     # Called during resolution to indicate progress.
     #
-    # Completely silence this, as we show nothing in normal mode and debug
-    # information in verbose mode.
+    # Completely silence this, as we show nothing.
     #
     # @return [Void]
     #
     def indicate_progress
     end
 
-    # Conveys debug information to the user.
-    # By default, prints to `STDERR` instead of {#output}.
-    #
-    # @param [Integer] depth the current depth of the resolution process.
-    # @return [void]
-    def debug?
-      Config.instance.verbose?
-    end
-
     #-------------------------------------------------------------------------#
 
     private

data/lib/cocoapods/validator.rb

@@ -381,7 +381,7 @@ module Pod
     # @return [void]
     #
     def build_pod
-      if `which xcodebuild`.strip.empty?
+      if Executable.which('xcodebuild').nil?
         UI.warn "Skipping compilation with `xcodebuild' because it can't be found.\n".yellow
       else
         UI.message "\nBuilding with xcodebuild.\n".yellow do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.38.0.beta.2
+  version: 0.38.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,222 +19,222 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.38.0.beta.2
+        version: 0.38.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.38.0.beta.2
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-stats
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: cocoapods-try
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.15
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |-
@@ -363,12 +363,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []