cocoapods 0.37.0.beta.1 → 0.37.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab74bb5d0f584952ffd9115c2e61a0b624b9fb03
-  data.tar.gz: a935b3bff32b56d454932f95bff73eb4b6b780b5
+  metadata.gz: a26042f0448f6610faa8a5f75f0514784c0d5c33
+  data.tar.gz: 5053a7897ddcc85454482cfe5e640f8ef3732bc3
 SHA512:
-  metadata.gz: b4c2c341908e2cceb3ee3ad114c21296648f583a19e1f11f31c062540727b3647c64e4fcab70ac8d3d32c3903fd0c611bd638eee052ce527a1fccfe2494e6921
-  data.tar.gz: d0161a847678e8d4d35efdf85dbf95e03dfc477af4348849c2230c84864b40096f5aeb287b9d9fbbf36473ee939527bfce4440b341e4839cda943bd99cd8d41b
+  metadata.gz: 4fd3572b8d654e49c5c35cbd39de6f7b3cce5e10be5d8d58f6730f5f20930b8dfec613896eea12e61d82d869dfab8e238088f8f66e75d0efbb6f8a2e49177162
+  data.tar.gz: e11d9d17fbc11cf19bb28096b47d768efb8bba8406984b5cb191ecb09c5b4e9e83bac4ecad9301bb9687f74ed75e577f3812e223b5d01ea46498d4ae21ee44d6

data/CHANGELOG.md

@@ -4,6 +4,62 @@ 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.0.rc.1
+
+[Core](https://github.com/CocoaPods/Core/compare/0.37.0.beta.1...0.37.0.rc.1)
+[Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.24.0...0.24.1)
+
+##### Enhancements
+
+* Add environment variable `COCOAPODS_SKIP_UPDATE_MESSAGE` to disable new
+  version message.  
+  [Andrea Mazzini](https://github.com/andreamazz)
+  [#3364](https://github.com/CocoaPods/CocoaPods/issues/3364)
+
+* Use user project's object version for pods project.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#253](https://github.com/CocoaPods/Xcodeproj/issues/253)
+
+##### Bug Fixes
+
+* Adding `$(inherited)` to `FRAMEWORK_SEARCH_PATHS` build setting in xcconfig for aggregate.  
+  [Tomohiro Kumagai](https://github.com/EZ-NET)
+  [#3429](https://github.com/CocoaPods/CocoaPods/pull/3429)
+
+* Don't crash when the downloader can't find an appropriate podspec in a `git`
+  pod.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3433](https://github.com/CocoaPods/CocoaPods/issues/3433)
+
+* Automatically lock Pod source files after installing.  
+  [Mason Glidden](https://github.com/mglidden)
+  [#1154](https://github.com/CocoaPods/CocoaPods/issues/1154)
+
+* Handle subprocesses leaking STDOUT/STDERR pipes by more strictly managing
+  process lifetime and not allowing I/O to block completion of the task.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3101](https://github.com/CocoaPods/CocoaPods/issues/3101)
+
+* Do not create pod target if `source_files` only contains headers.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#3106](https://github.com/CocoaPods/CocoaPods/issues/3106)
+
+* Run a pod's `prepare_command` (if it has one) before it is cleaned in the
+  download cache.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3436](https://github.com/CocoaPods/CocoaPods/issues/3436)
+
+* Don't set the `-fno-objc-arc` compiler flags for files for which the flag
+  makes no sense.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2559](https://github.com/CocoaPods/CocoaPods/issues/2559)
+
+* Also apply a pod's configuration to any resource targets defined by the pod.  
+  [Tom Adriaenssen](https://github.com/inferis)
+  [#3463](https://github.com/CocoaPods/CocoaPods/issues/3463)
+
+
 ## 0.37.0.beta.1
 
 ##### Enhancements

data/README.md

@@ -30,8 +30,8 @@ project goals influence and drive the design of CocoaPods:
 - Allow library authors to structure their libraries however they like.
 - Save time for library authors by automating a lot of Xcode work not 
   related to their libraries' functionality.
-- Support any source management system. (Currently supported are git, 
-  svn, mercurial, bazaar, and various types of archives downloaded over HTTP.)
+- Support any source management system. (Currently supported are `git`, 
+  `svn`, `mercurial`, `bazaar`, and various types of archives downloaded over HTTP.)
 - Promote a culture of distributed collaboration on pods, but also provide
   features only possible with a centralised solution to foster a community.
 - Build tools on top of the core Cocoa development system, including those 

data/lib/cocoapods/config.rb

@@ -19,7 +19,7 @@ module Pod
 
       :clean               => true,
       :integrate_targets   => true,
-      :new_version_message => true,
+      :new_version_message => ENV['COCOAPODS_SKIP_UPDATE_MESSAGE'].nil?,
 
       :cache_root          => Pathname.new(Dir.home) + 'Library/Caches/CocoaPods',
     }

data/lib/cocoapods/downloader.rb

@@ -32,7 +32,7 @@ module Pod
       cache_path, tmp_cache = Pathname(Dir.mktmpdir), true unless cache_path
       cache = Cache.new(cache_path)
       result = cache.download_pod(request)
-      if target
+      if 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)

data/lib/cocoapods/downloader/cache.rb

@@ -188,6 +188,7 @@ module Pod
         end
         destination.parent.mkpath
         FileUtils.cp_r(source, destination)
+        Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
         Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
       end
 

data/lib/cocoapods/executable.rb

@@ -51,7 +51,6 @@ module Pod
       bin = `which #{executable}`.strip
       raise Informative, "Unable to locate the executable `#{executable}`" if bin.empty?
 
-      require 'open4'
       require 'shellwords'
 
       command = command.map(&:to_s)
@@ -64,9 +63,8 @@ module Pod
         stdout, stderr = Indenter.new, Indenter.new
       end
 
-      options = { :stdout => stdout, :stderr => stderr, :status => true }
-      status  = Open4.spawn(bin, command, options)
-      output  = stdout.join("\n") + stderr.join("\n")
+      status = popen3(bin, command, stdout, stderr)
+      output = stdout.join("\n") + stderr.join("\n")
       unless status.success?
         if raise_on_failure
           raise Informative, "#{full_command}\n\n#{output}"
@@ -77,6 +75,27 @@ module Pod
       output
     end
 
+    private
+
+    def self.popen3(bin, command, stdout, stderr)
+      require 'open3'
+      Open3.popen3(bin, *command) do |i, o, e, t|
+        out_reader = Thread.new { while s = o.gets; stdout << s; end }
+        err_reader = Thread.new { while s = e.gets; stderr << s; end }
+
+        i.close
+
+        run_readers = lambda do
+          [out_reader, err_reader].each do |reader|
+            reader.run if reader.alive?
+          end
+        end
+
+        run_readers.call
+        t.value.tap { run_readers.call }
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     # Helper class that allows to write to an {IO} instance taking into account

data/lib/cocoapods/gem_version.rb

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

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

@@ -64,7 +64,7 @@ module Pod
               'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-iquote'),
             }
             if target.pod_targets.any?(&:should_build?)
-              build_settings['FRAMEWORK_SEARCH_PATHS'] = '"$PODS_FRAMEWORK_BUILD_PATH"'
+              build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'
             end
             config.merge!(build_settings)
           else

data/lib/cocoapods/installer.rb

@@ -34,6 +34,7 @@ module Pod
     autoload :HooksContext,             'cocoapods/installer/hooks_context'
     autoload :Migrator,                 'cocoapods/installer/migrator'
     autoload :PodSourceInstaller,       'cocoapods/installer/pod_source_installer'
+    autoload :PodSourcePreparer,        'cocoapods/installer/pod_source_preparer'
     autoload :PodTargetInstaller,       'cocoapods/installer/target_installer/pod_target_installer'
     autoload :TargetInstaller,          'cocoapods/installer/target_installer'
     autoload :UserProjectIntegrator,    'cocoapods/installer/user_project_integrator'
@@ -444,7 +445,15 @@ module Pod
     #
     def prepare_pods_project
       UI.message '- Creating Pods project' do
-        @pods_project = Pod::Project.new(sandbox.project_path)
+        object_version = aggregate_targets.map(&:user_project_path).compact.map do |path|
+          Xcodeproj::Project.open(path).object_version.to_i
+        end.min
+
+        if object_version
+          @pods_project = Pod::Project.new(sandbox.project_path, false, object_version)
+        else
+          @pods_project = Pod::Project.new(sandbox.project_path)
+        end
 
         analysis_result.all_user_build_configurations.each do |name, type|
           @pods_project.add_build_configuration(name, type)

data/lib/cocoapods/installer/migrator.rb

@@ -63,7 +63,7 @@ module Pod
               lockfile['SPEC CHECKSUMS'][spec.name] = Specification.from_file(child).checksum
             end
             sandbox.manifest = Lockfile.new(lockfile)
-            File.open(sandbox.manifest_path, 'w') { |f| f.write sandbox.manifest.to_yaml }
+            sandbox.manifest.write_to_disk(sandbox.manifest_path)
           end
         end
 

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -43,7 +43,8 @@ module Pod
       #
       def install!
         download_source unless predownloaded? || local?
-        run_prepare_command
+        PodSourcePreparer.new(root_spec, root).prepare! if local?
+        lock_files!
       end
 
       # Cleans the installations if appropriate.
@@ -89,25 +90,21 @@ module Pod
         )
       end
 
-      extend Executable
-      executable :bash
-
-      # Runs the prepare command bash script of the spec.
-      #
-      # @note   Unsets the `CDPATH` env variable before running the
-      #         shell script to avoid issues with relative paths
-      #         (issue #1694).
+      # Locks all of the files in this pod (source, license, etc). This will
+      # cause Xcode to warn you if you try to accidently edit one of the files.
       #
       # @return [void]
       #
-      def run_prepare_command
-        return unless root_spec.prepare_command
-        UI.section(' > Running prepare command', '', 1) do
-          Dir.chdir(root) do
-            ENV.delete('CDPATH')
-            prepare_command = root_spec.prepare_command.strip_heredoc.chomp
-            full_command = "\nset -e\n" + prepare_command
-            bash!('-c', full_command)
+      def lock_files!
+        if local?
+          return
+        end
+
+        # 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)
           end
         end
       end

data/lib/cocoapods/installer/pod_source_preparer.rb

@@ -0,0 +1,70 @@
+module Pod
+  class Installer
+    # Controller class responsible of executing the prepare command
+    # of a single Pod.
+    #
+    class PodSourcePreparer
+      # @return [Specification] the root specification of the Pod.
+      #
+      attr_reader :spec
+
+      # @return [Pathname] the folder where the source of the Pod is located.
+      #
+      attr_reader :path
+
+      # @param [Specification] spec the root specification of the Pod.
+      # @param [Pathname] path the folder where the source of the Pod is located.
+      #
+      def initialize(spec, path)
+        raise "Given spec isn't a root spec, but must be." unless spec.root?
+        @spec = spec
+        @path = path
+      end
+
+      #-----------------------------------------------------------------------#
+
+      public
+
+      # @!group Preparation
+
+      # Executes the prepare command if there is one.
+      #
+      # @return [void]
+      #
+      def prepare!
+        run_prepare_command
+      end
+
+      #-----------------------------------------------------------------------#
+
+      private
+
+      # @!group Preparation Steps
+
+      extend Executable
+      executable :bash
+
+      # Runs the prepare command bash script of the spec.
+      #
+      # @note   Unsets the `CDPATH` env variable before running the
+      #         shell script to avoid issues with relative paths
+      #         (issue #1694).
+      #
+      # @return [void]
+      #
+      def run_prepare_command
+        return unless spec.prepare_command
+        UI.section(' > Running prepare command', '', 1) do
+          Dir.chdir(path) do
+            ENV.delete('CDPATH')
+            prepare_command = spec.prepare_command.strip_heredoc.chomp
+            full_command = "\nset -e\n" + prepare_command
+            bash!('-c', full_command)
+          end
+        end
+      end
+
+      #-----------------------------------------------------------------------#
+    end
+  end
+end

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

@@ -38,6 +38,8 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
+      SOURCE_FILE_EXTENSIONS = Sandbox::FileAccessor::SOURCE_FILE_EXTENSIONS
+
       # Adds the build files of the pods to the target and adds a reference to
       # the frameworks of the Pods.
       #
@@ -53,7 +55,7 @@ module Pod
           headers = file_accessor.headers
           public_headers = file_accessor.public_headers
           private_headers = file_accessor.private_headers
-          other_source_files = file_accessor.source_files.select { |sf| sf.extname == '.d' }
+          other_source_files = file_accessor.source_files.reject { |sf| SOURCE_FILE_EXTENSIONS.include?(sf.extname) }
 
           {
             true => file_accessor.arc_source_files,
@@ -154,6 +156,13 @@ module Pod
         native_target.build_configurations.each do |c|
           c.base_configuration_reference = xcconfig_file_ref
         end
+
+        # also apply the private config to resource targets
+        target.resource_bundle_targets.each do |rsrc_target|
+          rsrc_target.build_configurations.each do |rsrc_bc|
+            rsrc_bc.base_configuration_reference = xcconfig_file_ref
+          end
+        end
       end
 
       # Creates a prefix header file which imports `UIKit` or `Cocoa` according

data/lib/cocoapods/project.rb

@@ -10,9 +10,12 @@ module Pod
     # @param  [Pathname, String] path @see path
     # @param  [Bool] skip_initialization
     #         Whether the project should be initialized from scratch.
+    # @param  [Int] object_version
+    #         Object version to use for serialization, defaults to Xcode 3.2 compatible.
     #
-    def initialize(path, skip_initialization = false)
-      super(path, skip_initialization)
+    def initialize(path, skip_initialization = false,
+        object_version = Xcodeproj::Constants::DEFAULT_OBJECT_VERSION)
+      super(path, skip_initialization, object_version)
       @support_files_group = new_group('Targets Support Files')
       @refs_by_absolute_path = {}
       @pods = new_group('Pods')

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -8,11 +8,12 @@ module Pod
     #
     class FileAccessor
       HEADER_EXTENSIONS = Xcodeproj::Constants::HEADER_FILES_EXTENSIONS
+      SOURCE_FILE_EXTENSIONS = (%w(.m .mm .c .cpp .swift) + HEADER_EXTENSIONS).uniq.freeze
 
       GLOB_PATTERNS = {
         :readme              => 'readme{*,.*}'.freeze,
         :license             => 'licen{c,s}e{*,.*}'.freeze,
-        :source_files        => '*.{h,hpp,tpp,hh,m,mm,c,cpp,swift}'.freeze,
+        :source_files        => "*{#{SOURCE_FILE_EXTENSIONS.join(',')}}".freeze,
         :public_header_files => "*{#{HEADER_EXTENSIONS.join(',')}}".freeze,
       }.freeze
 

data/lib/cocoapods/target/pod_target.rb

@@ -52,7 +52,9 @@ module Pod
     # A target should not be build if it has no source files.
     #
     def should_build?
-      !file_accessors.flat_map(&:source_files).empty?
+      source_files = file_accessors.flat_map(&:source_files)
+      source_files -= file_accessors.flat_map(&:headers)
+      !source_files.empty?
     end
 
     # @return [Array<Specification::Consumer>] the specification consumers for

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.37.0.beta.1
+  version: 0.37.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-27 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.beta.1
+        version: 0.37.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.0.beta.1
+        version: 0.37.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
@@ -153,20 +153,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +310,7 @@ files:
 - lib/cocoapods/installer/hooks_context.rb
 - lib/cocoapods/installer/migrator.rb
 - lib/cocoapods/installer/pod_source_installer.rb
+- lib/cocoapods/installer/pod_source_preparer.rb
 - lib/cocoapods/installer/target_installer.rb
 - lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
 - lib/cocoapods/installer/target_installer/pod_target_installer.rb