cocoapods 0.37.0 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b22362269f9331be853e50503dbd688fc7c7fb8e
-  data.tar.gz: 06d85077733f0d308b7713d6c47907c0665b05cb
+  metadata.gz: b26721da5616743033e4f4da36b3513e73a8d364
+  data.tar.gz: c4cbc740b6362f10186b1dd194e6f7177eff6bf1
 SHA512:
-  metadata.gz: 4ce806f4ce0a23242570c6b7185d8868f8fc11c11e14ac907564717edb2aa72801d25995029d23d63cb850865e85e4a3849f9eb72b3838ca3477af7471d1d9f5
-  data.tar.gz: 332cd2d31e2bfefedc05a39d2dfda4a757247feda89e5e97d1c5f4652443ee1e04c84747f14fdca4343f7ff1fde7926c6d2eec0ea7aa9286a719b23f32f2839e
+  metadata.gz: 96968927ffc9bc4f081a2c617815f61209612d7615960ffa3e24bf0d65edd1cf43425fefbb94643466232ec8a311597ac65a5cc37e4ecff343e8bb02a1c3d1c9
+  data.tar.gz: 8c729bea9a3b519050522b945107d67623e35e45d6e96059f40c7ed7344b29031733f8a08e384d540e9c0215a1665ed0596805d9601bd8be30ddf5c8da616e8d

data/CHANGELOG.md

@@ -4,8 +4,50 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 0.37.1
+
+##### Bug Fixes
+
+* [Cache] Fixes a bug that caused that a pod, which was cached once is not updated
+  correctly when needed e.g. for `pod spec lint`.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#3498](https://github.com/CocoaPods/CocoaPods/issues/3498)
+
+* Only add the "Embed Pods Frameworks" script for application and unit test targets.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#3440](https://github.com/CocoaPods/CocoaPods/issues/3440)
+
+* C++ source files with `.cc`, `.cxx` and `.c++` extensions now have their
+  compiler flags set correctly.  
+  [Chongyu Zhu](https://github.com/lembacon)
+  [Kyle Fuller](https://github.com/kylef)
+
+* Handle broken symlinks when installing a Pod.  
+  [Daniel Barden](https://github.com/dbarden)
+  [#3515](https://github.com/cocoapods/cocoapods/issues/3515)
+
+* Just remove write permissions from files, so executables are unaffected.  
+  [Mason Glidden](https://github.com/mglidden)
+  [#3501](https://github.com/CocoaPods/CocoaPods/issues/3501)
+
+* Always copy the generated `Podfile.lock` to `Pods/Manifest.lock` so they are
+  guaranteed to match, character-by-character, after installation.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3502](https://github.com/CocoaPods/CocoaPods/issues/3502)
+
+* Don't generate an umbrella header when a custom module map is specified. This
+  avoids an incomplete module map warning.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Actually allow skipping the download cache by downloading directly to the
+  download target when requested.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 0.37.0
 
+For more details, see 📝 [CocoaPods 0.37](http://blog.cocoapods.org/CocoaPods-0.37/) on our blog.
+
 ##### Bug Fixes
 
 * Print the UTF-8 warning to STDERR.  

data/lib/cocoapods/command/outdated.rb

@@ -24,9 +24,9 @@ module Pod
       #
       def run
         if updates.empty?
-          UI.puts 'No updates are available.'.yellow
+          UI.puts 'No pod updates are available.'.yellow
         else
-          UI.section 'The following updates are available:' do
+          UI.section 'The following pod updates are available:' do
             updates.each do |(name, from_version, matching_version, to_version)|
               UI.puts "- #{name} #{from_version} -> #{matching_version} " \
                 "(latest version #{to_version})"

data/lib/cocoapods/config.rb

@@ -24,6 +24,21 @@ module Pod
       :cache_root          => Pathname.new(Dir.home) + 'Library/Caches/CocoaPods',
     }
 
+    # Applies the given changes to the config for the duration of the given
+    # block.
+    #
+    def with_changes(changes)
+      old = {}
+      changes.keys.each do |key|
+        key = key.to_sym
+        old[key] = send(key) if respond_to?(key)
+      end
+      configure_with(changes)
+      yield if block_given?
+    ensure
+      configure_with(old)
+    end
+
     public
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods/downloader.rb

@@ -27,22 +27,97 @@ module Pod
     def self.download(
       request,
       target,
-      cache_path: !Config.instance.skip_download_cache && Config.instance.cache_root + 'Pods'
+      cache_path: !Config.instance.skip_download_cache && Config.instance.clean? && Config.instance.cache_root + 'Pods'
     )
-      cache_path, tmp_cache = Pathname(Dir.mktmpdir), true unless cache_path
-      cache = Cache.new(cache_path)
-      result = cache.download_pod(request)
-      if target && result.location
+      if cache_path
+        cache = Cache.new(cache_path)
+        result = cache.download_pod(request)
+      else
+        result, _ = download_request(request, target)
+      end
+
+      if target && result.location && target != result.location
         UI.message "Copying #{request.name} from `#{result.location}` to #{UI.path target}", '> ' do
           FileUtils.rm_rf target
           FileUtils.cp_r(result.location, target)
         end
       end
       result
-    ensure
-      FileUtils.rm_r cache_path if tmp_cache
     end
 
+    # Performs the download from the given `request` to the given `target` location.
+    #
+    # @return [Response, Hash<String,Specification>]
+    #         The download response for this download, and the specifications
+    #         for this download grouped by name.
+    #
+    # @param  [Request] request
+    #         the request that describes this pod download.
+    #
+    # @param  [Pathname,Nil] target
+    #         the location to which this pod should be downloaded. If `nil`,
+    #         then the pod will only be cached.
+    #
+    def self.download_request(request, target)
+      result = Response.new
+      result.checkout_options = download_source(request.name, target, request.params, request.head?)
+      result.location = target
+
+      if request.released_pod?
+        result.spec = request.spec
+        podspecs = { request.name => request.spec }
+      else
+        podspecs = Sandbox::PodspecFinder.new(target).podspecs
+        podspecs[request.name] = request.spec if request.spec
+        podspecs.each do |name, spec|
+          if request.name == name
+            result.spec = spec
+          end
+        end
+      end
+
+      [result, podspecs]
+    end
+
+    private
+
+    # Downloads a pod with the given `name` and `params` to `target`.
+    #
+    # @param  [String] name
+    #
+    # @param  [Pathname] target
+    #
+    # @param  [Hash<Symbol,String>] params
+    #
+    # @param  [Boolean] head
+    #
+    # @return [Hash] The checkout options required to re-download this exact
+    #         same source.
+    #
+    def self.download_source(name, target, params, head)
+      FileUtils.rm_rf(target)
+      downloader = Downloader.for_target(target, params)
+      if head
+        unless downloader.head_supported?
+          raise Informative, "The pod '#{name}' does not " \
+            "support the :head option, as it uses a #{downloader.name} " \
+            'source. Remove that option to use this pod.'
+        end
+        downloader.download_head
+      else
+        downloader.download
+      end
+      target.mkpath
+
+      if downloader.options_specific? && !head
+        params
+      else
+        downloader.checkout_options
+      end
+    end
+
+    public
+
     class DownloaderError; include CLAide::InformativeError; end
 
     class Base

data/lib/cocoapods/downloader/cache.rb

@@ -99,25 +99,14 @@ module Pod
       #
       def uncached_pod(request)
         in_tmpdir do |target|
-          result = Response.new
-          result.checkout_options = download(request.name, target, request.params, request.head?)
-
-          if request.released_pod?
-            result.spec = request.spec
-            result.location = destination = path_for_pod(request, :params => result.checkout_options)
-            copy_and_clean(target, destination, request.spec)
-            write_spec(request.spec, path_for_spec(request, :params => result.checkout_options))
-          else
-            podspecs = Sandbox::PodspecFinder.new(target).podspecs
-            podspecs[request.name] = request.spec if request.spec
-            podspecs.each do |name, spec|
-              destination = path_for_pod(request, :name => name, :params => result.checkout_options)
-              copy_and_clean(target, destination, spec)
-              write_spec(spec, path_for_spec(request, :name => name, :params => result.checkout_options))
-              if request.name == name
-                result.location = destination
-                result.spec = spec
-              end
+          result, podspecs = download(request, target)
+
+          podspecs.each do |name, spec|
+            destination = path_for_pod(request, :name => name, :params => result.checkout_options)
+            copy_and_clean(target, destination, spec)
+            write_spec(spec, path_for_spec(request, :name => name, :params => result.checkout_options))
+            if request.name == name
+              result.location = destination
             end
           end
 
@@ -125,37 +114,8 @@ module Pod
         end
       end
 
-      # Downloads a pod with the given `name` and `params` to `target`.
-      #
-      # @param  [String] name
-      #
-      # @param  [Pathname] target
-      #
-      # @param  [Hash<Symbol,String>] params
-      #
-      # @param  [Boolean] head
-      #
-      # @return [Hash] The checkout options required to re-download this exact
-      #         same source.
-      #
-      def download(name, target, params, head)
-        downloader = Downloader.for_target(target, params)
-        if head
-          unless downloader.head_supported?
-            raise Informative, "The pod '#{name}' does not " \
-              "support the :head option, as it uses a #{downloader.name} " \
-              'source. Remove that option to use this pod.'
-          end
-          downloader.download_head
-        else
-          downloader.download
-        end
-
-        if downloader.options_specific? && !head
-          params
-        else
-          downloader.checkout_options
-        end
+      def download(request, target)
+        Downloader.download_request(request, target)
       end
 
       # Performs the given block inside a temporary directory,
@@ -184,6 +144,7 @@ module Pod
       def copy_and_clean(source, destination, spec)
         specs_by_platform = group_subspecs_by_platform(spec)
         destination.parent.mkpath
+        FileUtils.rm_rf(destination)
         FileUtils.cp_r(source, destination)
         Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
         Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!

data/lib/cocoapods/executable.rb

@@ -54,7 +54,7 @@ module Pod
       require 'shellwords'
 
       command = command.map(&:to_s)
-      full_command = "#{bin.shellescape} #{command.map(&:shellescape).join(' ')}"
+      full_command = "#{bin} #{command.join(' ')}"
 
       if Config.instance.verbose?
         UI.message("$ #{full_command}")

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/installer.rb

@@ -605,7 +605,9 @@ module Pod
       end
 
       UI.message "- Writing Manifest in #{UI.path sandbox.manifest_path}" do
-        @lockfile.write_to_disk(sandbox.manifest_path)
+        sandbox.manifest_path.open('w') do |f|
+          f.write config.lockfile_path.read
+        end
       end
     end
 

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -103,8 +103,11 @@ module Pod
         # We don't want to lock diretories, as that forces you to override
         # those permissions if you decide to delete the Pods folder.
         Dir.glob(root + '**/*').each do |file|
-          unless File.directory?(file)
-            File.chmod(0444, file)
+          if File.file?(file)
+            # Only remove write permission, since some pods (like Crashlytics)
+            # have executable files.
+            new_permissions = File.stat(file).mode & ~0222
+            File.chmod(new_permissions, file)
           end
         end
       end

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -256,10 +256,10 @@ module Pod
       end
 
       def create_module_map
-        return super unless module_map = target.file_accessors.first.module_map
+        return super unless custom_module_map
         path = target.module_map_path
         UI.message "- Copying module map file to #{UI.path(path)}" do
-          FileUtils.cp(module_map, path)
+          FileUtils.cp(custom_module_map, path)
           add_file_to_support_group(path)
 
           native_target.build_configurations.each do |c|
@@ -269,6 +269,14 @@ module Pod
         end
       end
 
+      def create_umbrella_header
+        return super unless custom_module_map
+      end
+
+      def custom_module_map
+        @custom_module_map ||= target.file_accessors.first.module_map
+      end
+
       #-----------------------------------------------------------------------#
     end
   end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -9,6 +9,11 @@ module Pod
       class TargetIntegrator
         autoload :XCConfigIntegrator, 'cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator'
 
+        # @return [Array<Symbol>] the symbol types, which require that the pod
+        # frameworks are embedded in the output directory / product bundle.
+        #
+        EMBED_FRAMEWORK_TARGET_TYPES = [:application, :unit_test_bundle].freeze
+
         # @return [Target] the target that should be integrated.
         #
         attr_reader :target
@@ -136,7 +141,10 @@ module Pod
         #
         def add_embed_frameworks_script_phase
           phase_name = 'Embed Pods Frameworks'
-          native_targets_to_integrate.each do |native_target|
+          targets_to_embed_in = native_targets_to_integrate.select do |target|
+            EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
+          end
+          targets_to_embed_in.each do |native_target|
             embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name == phase_name }
             unless embed_build_phase.present?
               UI.message("Adding Build Phase '#{phase_name}' to project.")

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -8,7 +8,7 @@ module Pod
     #
     class FileAccessor
       HEADER_EXTENSIONS = Xcodeproj::Constants::HEADER_FILES_EXTENSIONS
-      SOURCE_FILE_EXTENSIONS = (%w(.m .mm .c .cpp .swift) + HEADER_EXTENSIONS).uniq.freeze
+      SOURCE_FILE_EXTENSIONS = (%w(.m .mm .c .cc .cxx .cpp .c++ .swift) + HEADER_EXTENSIONS).uniq.freeze
 
       GLOB_PATTERNS = {
         :readme              => 'readme{*,.*}'.freeze,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.37.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.37.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.37.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement