cocoapods 0.39.0.beta.4 → 0.39.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b37d2db8457fdd54c70e37273ccf0cd2f2f4848a
-  data.tar.gz: 9a545fa271be99539ae2a47aca529a550b4627d1
+  metadata.gz: d34fbbd05497ec88b132304db391872b725f0976
+  data.tar.gz: 07097a4bea5c3ddfcf65fc77de8ec0968ef8aa31
 SHA512:
-  metadata.gz: 1c2e3a8e261f3d6c0cd0ba5987de648703168b67021a9a6ae75dc6e5364c6d0929d91fcad2defd9aced52088e5bc948e4b3fd633c3bf8bfd981be3bcef482b7c
-  data.tar.gz: edec194b42c0a81e7fa1b8af59c3c6d8508ee95cf1641d41261a1d17bf6c224f329e311051f431a02030bc4a1a8d6c64ea21e74a4a0b49dabfad40b7b5633fc7
+  metadata.gz: e749c9394f1dc06fc4e06bb64b1e9b9d6602d9381f23a450cf8688c8a834f167a8c3b45b6a41c85e964de30db7d3614a7f3e27a4125608c9fcaa8b96d3638a56
+  data.tar.gz: 1aaca2db33e7209f5cd93aeb44159f3fd85351aa807f2e9bd0edb6e5a1c4749ac2979f4a7fe21787398e3fe1b62a39754342d202e10f0197aa18b0d457c2ccfd

data/CHANGELOG.md

@@ -4,6 +4,83 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 0.39.0.beta.5 (2015-10-01)
+
+##### Breaking
+
+* Activesupport 4 is now required, breaking compatibility with applications
+  locked to `3.x.y`.  
+
+##### Enhancements
+
+* The `EMBEDDED_CONTENT_CONTAINS_SWIFT` build setting will now be set when
+  appropriate.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* The embed frameworks script will no longer manually copy over the Swift
+  runtime libraries on Xcode 7 and later.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [earltedly](https://github.com/segiddins)
+  [DJ Tarazona](https://github.com/djtarazona)
+  [#4188](https://github.com/CocoaPods/CocoaPods/issues/4188)
+
+* A post-install summary of the pods installed is now printed.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4124](https://github.com/CocoaPods/CocoaPods/issues/4124)
+
+##### Bug Fixes
+
+* Give a meaningful message for the case where there is no available stable
+  version for a pod, and there is no explicit version requirement.  
+  [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
+  [#4197](https://github.com/CocoaPods/CocoaPods/issues/4197)
+
+* Use `watchsimulator` when validating pods with the watchOS platform.  
+  [Thomas Kollbach](https://github.com/toto)
+  [#4130](https://github.com/CocoaPods/CocoaPods/issues/4130)
+
+* C or C++ preprocessor output files with `.i` extension now have their compiler
+  flags set correctly.  
+  [Andrea Aresu](https://github.com/aaresu/)
+
+* Remove SDKROOT relative search path as it isn't needed anymore since XCTest.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#4219](https://github.com/CocoaPods/CocoaPods/issues/4219)
+
+* Podfile generated by `pod init` now specifies iOS 8.0 as the default platform
+  and includes `use_frameworks!` for Swift projects.  
+  [Jamie Evans](https://github.com/JamieREvans)
+
+* Support for the new `tvos` platform.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#4152](https://github.com/CocoaPods/CocoaPods/pull/4152)
+
+* Either generate just one pod target or generate it once for each target
+  definition.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#4034](https://github.com/CocoaPods/CocoaPods/issues/4034)
+
+* Stop setting `DYLIB_CURRENT_VERSION`, `CURRENT_PROJECT_VERSION`, and
+  `DYLIB_COMPATIBILITY_VERSION` for pods integrated as dynamic frameworks.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4083](https://github.com/CocoaPods/CocoaPods/issues/4083)
+
+* The headers folders paths for static library pods will be unset, fixing
+  validation when archives are uploaded to iTunes Connect.  
+  [Boris Bügling](https://github.com/neonichu)
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4119](https://github.com/CocoaPods/CocoaPods/issues/4119)
+
+* Don't require the `platform` attribute for targets without any declared pods
+  when running `pod install --no-integrate`.  
+  [Sylvain Guillopé](https://github.com/sguillope)
+  [#3151](https://github.com/CocoaPods/CocoaPods/issues/3151)
+
+* Gracefully handle exception if creating the repos directory fails due to a
+  system error like a permission issue.  
+  [Sylvain Guillopé](https://github.com/sguillope)
+  [#4177](https://github.com/CocoaPods/CocoaPods/issues/4177)
+
 ## 0.39.0.beta.4 (2015-09-02)
 
 ##### Bug Fixes

data/lib/cocoapods/command.rb

@@ -20,7 +20,6 @@ module Pod
     require 'cocoapods/command/outdated'
     require 'cocoapods/command/project'
     require 'cocoapods/command/repo'
-    require 'cocoapods/command/search'
     require 'cocoapods/command/setup'
     require 'cocoapods/command/spec'
     require 'cocoapods/command/init'
@@ -37,7 +36,7 @@ module Pod
 
     def self.options
       [
-        ['--silent',   'Show nothing'],
+        ['--silent', 'Show nothing'],
       ].concat(super)
     end
 

data/lib/cocoapods/command/init.rb

@@ -57,7 +57,9 @@ module Pod
         podfile << "xcodeproj '#{@project_path}'\n\n" if @project_path
         podfile << <<-PLATFORM.strip_heredoc
           # Uncomment this line to define a global platform for your project
-          # platform :ios, '6.0'
+          # platform :ios, '8.0'
+          # Uncomment this line if you're using Swift
+          # use_frameworks!
         PLATFORM
 
         project.targets.each do |target|

data/lib/cocoapods/command/repo/add.rb

@@ -23,7 +23,9 @@ module Pod
 
         def initialize(argv)
           @shallow = argv.flag?('shallow', false)
-          @name, @url, @branch = argv.shift_argument, argv.shift_argument, argv.shift_argument
+          @name = argv.shift_argument
+          @url = argv.shift_argument
+          @branch = argv.shift_argument
           super
         end
 
@@ -37,16 +39,49 @@ module Pod
         def run
           prefix = @shallow ? 'Creating shallow clone of' : 'Cloning'
           UI.section("#{prefix} spec repo `#{@name}` from `#{@url}`#{" (branch `#{@branch}`)" if @branch}") do
-            config.repos_dir.mkpath
-            Dir.chdir(config.repos_dir) do
-              command = ['clone', @url, @name]
-              command << '--depth=1' if @shallow
-              git!(command)
-            end
-            Dir.chdir(dir) { git!('checkout', @branch) } if @branch
+            create_repos_dir
+            clone_repo
+            checkout_branch
             SourcesManager.check_version_information(dir)
           end
         end
+
+        private
+
+        # Creates the repos directory specified in the configuration by
+        # `config.repos_dir`.
+        #
+        # @return [void]
+        #
+        # @raise  If the directory cannot be created due to a system error.
+        #
+        def create_repos_dir
+          config.repos_dir.mkpath
+        rescue => e
+          raise Informative, "Could not create '#{config.repos_dir}', the CocoaPods repo cache directory.\n" \
+            "#{e.class.name}: #{e.message}"
+        end
+
+        # Clones the git spec-repo according to parameters passed to the
+        # command.
+        #
+        # @return [void]
+        #
+        def clone_repo
+          Dir.chdir(config.repos_dir) do
+            command = ['clone', @url, @name]
+            command << '--depth=1' if @shallow
+            git!(command)
+          end
+        end
+
+        # Checks out the branch of the git spec-repo if provided.
+        #
+        # @return [void]
+        #
+        def checkout_branch
+          Dir.chdir(dir) { git!('checkout', @branch) } if @branch
+        end
       end
     end
   end

data/lib/cocoapods/command/spec.rb

@@ -48,7 +48,7 @@ module Pod
           set = sets.find { |s| s.name == spec }
         else
           names = sets.map(&:name) * ', '
-          raise Informative, "More than one spec found for '#{ spec }':\n#{ names }"
+          raise Informative, "More than one spec found for '#{spec}':\n#{names}"
         end
 
         unless show_all
@@ -77,7 +77,7 @@ module Pod
 
           versions.each do |version|
             spec = source.specification(set.name, version)
-            paths += "#{ pathname_from_spec(spec, source) }\n"
+            paths += "#{pathname_from_spec(spec, source)}\n"
           end
         end
 
@@ -102,7 +102,7 @@ module Pod
         end
 
         if !best_source || !best_version
-          raise Informative, "Unable to locate highest known specification for `#{ set.name }'"
+          raise Informative, "Unable to locate highest known specification for `#{set.name}'"
         end
 
         [best_source.specification(set.name, best_version), best_source]

data/lib/cocoapods/command/spec/cat.rb

@@ -37,7 +37,7 @@ module Pod
           query = @use_regex ? @query : Regexp.escape(@query)
           filepath = if @show_all
                        specs = get_path_of_spec(query, @show_all).split(/\n/)
-                       index = UI.choose_from_array(specs, "Which spec would you like to print [1-#{ specs.count }]? ")
+                       index = UI.choose_from_array(specs, "Which spec would you like to print [1-#{specs.count}]? ")
                        specs[index]
                      else
                        get_path_of_spec(query)

data/lib/cocoapods/command/spec/create.rb

@@ -15,7 +15,8 @@ module Pod
         ]
 
         def initialize(argv)
-          @name_or_url, @url = argv.shift_argument, argv.shift_argument
+          @name_or_url = argv.shift_argument
+          @url = argv.shift_argument
           super
         end
 
@@ -73,7 +74,7 @@ module Pod
           data[:name]          = repo['name']
           data[:summary]       = (repo['description'] || '').gsub(/["]/, '\"')
           data[:homepage]      = (repo['homepage'] && !repo['homepage'].empty?) ? repo['homepage'] : repo['html_url']
-          data[:author_name]   = user['name']  || user['login']
+          data[:author_name]   = user['name'] || user['login']
           data[:author_email]  = user['email'] || 'email@address.com'
           data[:source_url]    = repo['clone_url']
 
@@ -177,6 +178,7 @@ Pod::Spec.new do |s|
   # s.ios.deployment_target = "5.0"
   # s.osx.deployment_target = "10.7"
   # s.watchos.deployment_target = "2.0"
+  # s.tvos.deployment_target = "9.0"
 
 
   # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

data/lib/cocoapods/command/spec/edit.rb

@@ -45,7 +45,7 @@ module Pod
           end
 
           exec_editor(filepath.to_s) if File.exist? filepath
-          raise Informative, "#{ filepath } doesn't exist."
+          raise Informative, "#{filepath} doesn't exist."
         end
 
         # Looks up an executable in the search paths

data/lib/cocoapods/downloader.rb

@@ -34,7 +34,7 @@ module Pod
         result = cache.download_pod(request)
       else
         require 'cocoapods/installer/pod_source_preparer'
-        result, _ = download_request(request, target)
+        result, = download_request(request, target)
         Installer::PodSourcePreparer.new(result.spec, result.location).prepare!
       end
 

data/lib/cocoapods/downloader/request.rb

@@ -68,7 +68,7 @@ module Pod
       #         download request.
       #
       def slug(name: self.name, params: self.params, spec: self.spec)
-        checksum = spec && spec.checksum &&  '-' << spec.checksum[0, 5]
+        checksum = spec && spec.checksum && '-' << spec.checksum[0, 5]
         if released_pod?
           "Release/#{name}/#{spec.version}#{checksum}"
         else

data/lib/cocoapods/executable.rb

@@ -54,13 +54,16 @@ module Pod
 
       if Config.instance.verbose?
         UI.message("$ #{full_command}")
-        stdout, stderr = Indenter.new(STDOUT), Indenter.new(STDERR)
+        stdout = Indenter.new(STDOUT)
+        stderr = Indenter.new(STDERR)
       else
-        stdout, stderr = Indenter.new, Indenter.new
+        stdout = Indenter.new
+        stderr = Indenter.new
       end
 
       status = popen3(bin, command, stdout, stderr)
-      stdout, stderr = stdout.join, stderr.join
+      stdout = stdout.join
+      stderr = stderr.join
       output = stdout + stderr
       unless status.success?
         if raise_on_failure
@@ -197,7 +200,7 @@ module Pod
       #
       def <<(value)
         super
-        io << "#{ indent }#{ value }" if io
+        io << "#{indent}#{value}" if io
       end
     end
   end

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/acknowledgements.rb

@@ -77,7 +77,7 @@ module Pod
             if license_file.exist?
               text = IO.read(license_file)
             else
-              UI.warn "Unable to read the license file `#{license_file }` " \
+              UI.warn "Unable to read the license file `#{license_file}` " \
               "for the spec `#{spec}`"
             end
           end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -52,6 +52,7 @@ module Pod
         :ios => Version.new('6.0'),
         :osx => Version.new('10.8'),
         :watchos => Version.new('2.0'),
+        :tvos => Version.new('9.0'),
       }
 
       # @return [Bool] Whether the external strings file is supported by the

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -79,14 +79,16 @@ module Pod
             # Resign the code if required by the build settings to avoid unstable apps
             code_sign_if_enabled "${destination}/$(basename "$1")"
 
-            # Embed linked Swift runtime libraries
-            local swift_runtime_libs
-            swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
-            for lib in $swift_runtime_libs; do
-              echo "rsync -auv \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
-              rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
-              code_sign_if_enabled "${destination}/${lib}"
-            done
+            # Embed linked Swift runtime libraries. No longer necessary as of Xcode 7.
+            if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then
+              local swift_runtime_libs
+              swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
+              for lib in $swift_runtime_libs; do
+                echo "rsync -auv \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
+                rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
+                code_sign_if_enabled "${destination}/${lib}"
+              done
+            fi
           }
 
           # Signs a framework with the provided identity

data/lib/cocoapods/generator/header.rb

@@ -84,6 +84,7 @@ module Pod
       def generate_platform_import_header
         case platform.name
         when :ios then "#import <UIKit/UIKit.h>\n"
+        when :tvos then "#import <UIKit/UIKit.h>\n"
         when :osx then "#import <Cocoa/Cocoa.h>\n"
         else "#import <Foundation/Foundation.h>\n"
         end

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

@@ -60,6 +60,9 @@ module Pod
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
             'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
           }
+          if pod_targets.any?(&:uses_swift?)
+            config['EMBEDDED_CONTENT_CONTAINS_SWIFT'] = 'YES'
+          end
           @xcconfig = Xcodeproj::Config.new(config)
 
           @xcconfig.merge!(merged_user_target_xcconfigs)

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

@@ -47,7 +47,7 @@ module Pod
 
           config = {
             'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
-            'PODS_ROOT'  => '${SRCROOT}',
+            'PODS_ROOT' => '${SRCROOT}',
             'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
             'SKIP_INSTALL' => 'YES',

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

@@ -18,7 +18,7 @@ module Pod
         #
         def self.quote(strings, prefix = nil)
           prefix = "#{prefix} " if prefix
-          strings.sort.map { |s| %W(          #{prefix}"#{s}"          ) }.join(' ')
+          strings.sort.map { |s| %W( #{prefix}"#{s}"          ) }.join(' ')
         end
 
         # Return the default linker flags
@@ -74,7 +74,7 @@ module Pod
           xcconfig.libraries.merge(consumer.libraries)
           xcconfig.frameworks.merge(consumer.frameworks)
           xcconfig.weak_frameworks.merge(consumer.weak_frameworks)
-          add_developers_frameworks_if_needed(xcconfig, consumer.platform_name)
+          add_developers_frameworks_if_needed(xcconfig)
         end
 
         # Configures the given Xcconfig with the build settings for the given
@@ -183,17 +183,12 @@ module Pod
         #
         # @return [void]
         #
-        def self.add_developers_frameworks_if_needed(xcconfig, platform)
+        def self.add_developers_frameworks_if_needed(xcconfig)
           matched_frameworks = xcconfig.frameworks & %w(XCTest SenTestingKit)
           unless matched_frameworks.empty?
             search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= ''
             search_paths_to_add = []
             search_paths_to_add << '$(inherited)'
-            if platform == :ios || platform == :watchos
-              search_paths_to_add << '"$(SDKROOT)/Developer/Library/Frameworks"'
-            else
-              search_paths_to_add << '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
-            end
             frameworks_path = '"$(PLATFORM_DIR)/Developer/Library/Frameworks"'
             search_paths_to_add << frameworks_path
             search_paths_to_add.each do |search_path|

data/lib/cocoapods/hooks_manager.rb

@@ -105,7 +105,7 @@ module Pod
         if registrations
           hooks = registrations[name]
           if hooks
-            UI.message "- Running #{name.to_s.gsub('_', ' ')} hooks" do
+            UI.message "- Running #{name.to_s.tr('_', ' ')} hooks" do
               hooks.each do |hook|
                 next if whitelisted_plugins && !whitelisted_plugins.key?(hook.plugin_name)
                 UI.message "- #{hook.plugin_name || 'unknown plugin'} from " \

data/lib/cocoapods/installer.rb

@@ -462,6 +462,16 @@ module Pod
       run_plugins_post_install_hooks
       warn_for_deprecations
       lock_pod_sources
+      print_post_install_message
+    end
+
+    def print_post_install_message
+      podfile_dependencies = podfile.dependencies.uniq.size
+      pods_installed = root_specs.size
+      UI.info('Pod installation complete! ' \
+              "There #{podfile_dependencies == 1 ? 'is' : 'are'} #{podfile_dependencies} " \
+              "#{'dependency'.pluralize(podfile_dependencies)} from the Podfile " \
+              "and #{pods_installed} total #{'pod'.pluralize(pods_installed)} installed.")
     end
 
     # Runs the registered callbacks for the plugins post install hooks.
@@ -569,10 +579,12 @@ module Pod
         osx_deployment_target = platforms.select { |p| p.name == :osx }.map(&:deployment_target).min
         ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min
         watchos_deployment_target = platforms.select { |p| p.name == :watchos }.map(&:deployment_target).min
+        tvos_deployment_target = platforms.select { |p| p.name == :tvos }.map(&:deployment_target).min
         @pods_project.build_configurations.each do |build_configuration|
           build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
           build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
           build_configuration.build_settings['WATCHOS_DEPLOYMENT_TARGET'] = watchos_deployment_target.to_s if watchos_deployment_target
+          build_configuration.build_settings['TVOS_DEPLOYMENT_TARGET'] = tvos_deployment_target.to_s if tvos_deployment_target
           build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
           build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
         end
@@ -732,7 +744,7 @@ module Pod
     #         information in the lockfile.
     #
     def integrate_user_project
-      UI.section "Integrating client #{'project'.pluralize(aggregate_targets.map(&:user_project_path).uniq.count) }" do
+      UI.section "Integrating client #{'project'.pluralize(aggregate_targets.map(&:user_project_path).uniq.count)}" do
         installation_root = config.installation_root
         integrator = UserProjectIntegrator.new(podfile, sandbox, installation_root, aggregate_targets)
         integrator.integrate!

data/lib/cocoapods/installer/analyzer.rb

@@ -255,7 +255,7 @@ module Pod
           target.client_root = config.installation_root
           target.user_target_uuids = []
           target.user_build_configurations = target_definition.build_configurations || { 'Release' => :release, 'Debug' => :debug }
-          if target_definition.platform.name == :osx
+          if target_definition.platform && target_definition.platform.name == :osx
             target.archs = '$(ARCHS_STANDARD_64_BIT)'
           end
         end
@@ -292,9 +292,9 @@ module Pod
           pod_targets = distinct_targets.flat_map do |_, targets_by_distinctors|
             if targets_by_distinctors.count > 1
               # There are different sets of subspecs or the spec is used across different platforms
-              targets_by_distinctors.map do |distinctor, target_definitions|
-                specs, _ = *distinctor
-                generate_pod_target(target_definitions, specs, :scoped => true)
+              targets_by_distinctors.flat_map do |distinctor, target_definitions|
+                specs, = *distinctor
+                generate_pod_target(target_definitions, specs).scoped
               end
             else
               (specs, _), target_definitions = targets_by_distinctors.first
@@ -317,7 +317,7 @@ module Pod
           pod_targets = specs_by_target.flat_map do |target_definition, specs|
             grouped_specs = specs.group_by.group_by(&:root).values.uniq
             grouped_specs.flat_map do |pod_specs|
-              generate_pod_target([target_definition], pod_specs, :scoped => true)
+              generate_pod_target([target_definition], pod_specs).scoped
             end
           end
           pod_targets.each do |target|
@@ -364,13 +364,10 @@ module Pod
       # @param  [Array<Specification>] specs
       #         the specifications of an equal root.
       #
-      # @param  [Bool] scoped
-      #         whether the pod target should be scoped
-      #
       # @return [PodTarget]
       #
-      def generate_pod_target(target_definitions, pod_specs, scoped: false)
-        pod_target = PodTarget.new(pod_specs, target_definitions, sandbox, scoped)
+      def generate_pod_target(target_definitions, pod_specs)
+        pod_target = PodTarget.new(pod_specs, target_definitions, sandbox)
 
         if config.integrate_targets?
           target_inspections = result.target_inspections.select { |t, _| target_definitions.include?(t) }.values
@@ -639,7 +636,7 @@ module Pod
       def verify_platforms_specified!
         unless config.integrate_targets?
           podfile.target_definition_list.each do |target_definition|
-            unless target_definition.platform
+            if !target_definition.empty? && target_definition.platform.nil?
               raise Informative, 'It is necessary to specify the platform in the Podfile if not integrating.'
             end
           end

data/lib/cocoapods/installer/analyzer/specs_state.rb

@@ -23,9 +23,9 @@ module Pod
           @unchanged = []
 
           if pods_by_state
-            @added     = pods_by_state[:added]     || []
-            @deleted   = pods_by_state[:removed]   || []
-            @changed   = pods_by_state[:changed]   || []
+            @added     = pods_by_state[:added] || []
+            @deleted   = pods_by_state[:removed] || []
+            @changed   = pods_by_state[:changed] || []
             @unchanged = pods_by_state[:unchanged] || []
           end
         end
@@ -51,10 +51,10 @@ module Pod
         # @return [void]
         #
         def print
-          added    .sort.each { |pod| UI.message('A'.green  + " #{pod}", '', 2) }
-          deleted  .sort.each { |pod| UI.message('R'.red    + " #{pod}", '', 2) }
+          added    .sort.each { |pod| UI.message('A'.green + " #{pod}", '', 2) }
+          deleted  .sort.each { |pod| UI.message('R'.red + " #{pod}", '', 2) }
           changed  .sort.each { |pod| UI.message('M'.yellow + " #{pod}", '', 2) }
-          unchanged.sort.each { |pod| UI.message('-'        + " #{pod}", '', 2) }
+          unchanged.sort.each { |pod| UI.message('-' + " #{pod}", '', 2) }
         end
 
         # Adds the name of a Pod to the give state.

data/lib/cocoapods/installer/post_install_hooks_context.rb

@@ -66,7 +66,7 @@ module Pod
         #
         attr_accessor :specs
 
-        # @return [Symbol] The platform (either `:ios`, `:watchos` or `:osx`).
+        # @return [Symbol] The platform (either `:ios`, `:watchos`, `:tvos`, or `:osx`).
         #
         attr_accessor :platform_name
 

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

@@ -36,21 +36,16 @@ module Pod
 
       private
 
-      # Adds the project/library and compatibility versions, which are only
-      # applicable to dynamic libraries.
+      # Remove the default headers folder path settings for static library pod
+      # targets.
       #
       # @return [Hash{String => String}]
       #
       def custom_build_settings
         settings = super
-        if target.requires_frameworks?
-          version = target.root_spec.version
-          project_version = [version.major, version.minor, version.patch].join('.')
-          compatibility_version = version.major
-          compatibility_version = project_version if compatibility_version < 1
-          settings['CURRENT_PROJECT_VERSION'] = project_version
-          settings['DYLIB_COMPATIBILITY_VERSION'] = compatibility_version.to_s
-          settings['DYLIB_CURRENT_VERSION'] = '$(CURRENT_PROJECT_VERSION)'
+        unless target.requires_frameworks?
+          settings['PRIVATE_HEADERS_FOLDER_PATH'] = ''
+          settings['PUBLIC_HEADERS_FOLDER_PATH'] = ''
         end
         settings
       end
@@ -199,6 +194,7 @@ module Pod
         :ios => Version.new('6'),
         :osx => Version.new('10.8'),
         :watchos => Version.new('2.0'),
+        :tvos => Version.new('9.0'),
       }
 
       # Returns the compiler flags for the source files of the given specification.

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

@@ -227,7 +227,7 @@ module Pod
           native_targets_to_integrate.each do |native_target|
             phase = create_or_update_build_phase(native_target, phase_name)
             native_target.build_phases.unshift(phase).uniq!
-            phase.shell_script = <<-EOS.strip_heredoc
+            phase.shell_script = <<-SH.strip_heredoc
               diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
               if [[ $? != 0 ]] ; then
                   cat << EOM
@@ -235,7 +235,7 @@ module Pod
               EOM
                   exit 1
               fi
-            EOS
+            SH
           end
         end
 

data/lib/cocoapods/resolver.rb

@@ -174,7 +174,7 @@ module Pod
     #
     def requirement_satisfied_by?(requirement, activated, spec)
       existing_vertices = activated.vertices.values.select do |v|
-        Specification.root_name(v.name) ==  requirement.root_name
+        Specification.root_name(v.name) == requirement.root_name
       end
       existing = existing_vertices.map(&:payload).compact.first
       requirement_satisfied =
@@ -383,6 +383,21 @@ module Pod
               'version requirement to your Podfile ' \
               "(e.g. `pod '#{name}', '#{lockfile_reqs.map(&:requirement).join("', '")}'`) " \
               "or revert to a stable version by running `pod update #{name}`."
+          elsif (conflict.possibility && conflict.possibility.version.prerelease?) &&
+              (conflict.requirement && !(
+              conflict.requirement.prerelease? ||
+              conflict.requirement.external_source ||
+              conflict.requirement.head?)
+              )
+            # Conflict was caused by not specifying an explicit version for the requirement #[name],
+            # and there is no available stable version satisfying constraints for the requirement.
+            message = "There are only pre-release versions available satisfying the following requirements:\n"
+            conflict.requirements.values.flatten.each do |r|
+              unless search_for(r).empty?
+                message << "\n\t'#{name}', '#{r.requirement}'\n"
+              end
+            end
+            message << "\nYou should explicitly specify the version in order to install a pre-release version"
           elsif !conflict.existing
             conflict.requirements.values.flatten.each do |r|
               unless search_for(r).empty?

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 .cc .cxx .cpp .c++ .swift) + HEADER_EXTENSIONS).uniq.freeze
+      SOURCE_FILE_EXTENSIONS = (%w(.m .mm .i .c .cc .cxx .cpp .c++ .swift) + HEADER_EXTENSIONS).uniq.freeze
 
       GLOB_PATTERNS = {
         :readme              => 'readme{*,.*}'.freeze,

data/lib/cocoapods/sandbox/path_list.rb

@@ -49,7 +49,7 @@ module Pod
         end
         root_length  = root.to_s.length + 1
         escaped_root = escape_path_for_glob(root)
-        paths  = Dir.glob(escaped_root + '**/*', File::FNM_DOTMATCH)
+        paths = Dir.glob(escaped_root + '**/*', File::FNM_DOTMATCH)
         absolute_dirs  = paths.select { |path| File.directory?(path) }
         relative_dirs  = absolute_dirs.map  { |p| p[root_length..-1] }
         absolute_paths = paths.reject { |p| p == "#{root}/." || p == "#{root}/.." }

data/lib/cocoapods/sources_manager.rb

@@ -252,7 +252,8 @@ module Pod
       def check_version_information(dir)
         versions = version_information(dir)
         unless repo_compatible?(dir)
-          min, max = versions['min'], versions['max']
+          min = versions['min']
+          max = versions['max']
           version_msg = (min == max) ? min : "#{min} - #{max}"
           raise Informative, "The `#{dir.basename}` repo requires " \
           "CocoaPods #{version_msg} (currently using #{Pod::VERSION})\n".red +
@@ -293,7 +294,8 @@ module Pod
       def repo_compatible?(dir)
         versions = version_information(dir)
 
-        min, max = versions['min'], versions['max']
+        min = versions['min']
+        max = versions['max']
         bin_version  = Gem::Version.new(Pod::VERSION)
         supports_min = !min || bin_version >= Gem::Version.new(min)
         supports_max = !max || bin_version <= Gem::Version.new(max)
@@ -329,7 +331,7 @@ module Pod
       #
       def version_information(dir)
         require 'yaml'
-        yaml_file  = dir + 'CocoaPods-version.yml'
+        yaml_file = dir + 'CocoaPods-version.yml'
         return {} unless yaml_file.exist?
         begin
           YAMLHelper.load_file(yaml_file)

data/lib/cocoapods/target/pod_target.rb

@@ -66,7 +66,7 @@ module Pod
           target.user_build_configurations = user_build_configurations
           target.native_target = native_target
           target.archs = archs
-          target.dependent_targets = dependent_targets.flat_map(&:scoped)
+          target.dependent_targets = dependent_targets.flat_map(&:scoped).select { |pt| pt.target_definitions == [target_definition] }
         end
       end
     end

data/lib/cocoapods/user_interface.rb

@@ -7,7 +7,7 @@ module Pod
   module UserInterface
     require 'colored'
 
-    @title_colors      =  %w(    yellow green    )
+    @title_colors      =  %w( yellow green    )
     @title_level       =  0
     @indentation_level =  2
     @treat_titles_as_messages = false
@@ -298,14 +298,14 @@ module Pod
       #
       def choose_from_array(array, message)
         array.each_with_index do |item, index|
-          UI.puts "#{ index + 1 }: #{ item }"
+          UI.puts "#{index + 1}: #{item}"
         end
 
         UI.puts message
 
         index = UI.gets.chomp.to_i - 1
         if index < 0 || index > array.count - 1
-          raise Informative, "#{ index + 1 } is invalid [1-#{ array.count }]"
+          raise Informative, "#{index + 1} is invalid [1-#{array.count}]"
         else
           index
         end

data/lib/cocoapods/validator.rb

@@ -94,6 +94,8 @@ module Pod
           platform_message = '[OSX] '
         elsif result.platforms == [:watchos]
           platform_message = '[watchOS] '
+        elsif result.platforms == [:tvos]
+          platform_message = '[tvOS] '
         end
 
         subspecs_message = ''
@@ -609,7 +611,16 @@ module Pod
     #
     def xcodebuild
       command = 'xcodebuild clean build -target Pods'
-      command << ' CODE_SIGN_IDENTITY=- -sdk iphonesimulator' if consumer.platform_name == :ios
+
+      case consumer.platform_name
+      when :ios
+        command << ' CODE_SIGN_IDENTITY=- -sdk iphonesimulator'
+      when :watchos
+        command << ' CODE_SIGN_IDENTITY=- -sdk watchsimulator'
+      when :tvos
+        command << ' CODE_SIGN_IDENTITY=- -sdk appletvsimulator'
+      end
+
       output, status = _xcodebuild "#{command} 2>&1"
 
       unless status.success?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.39.0.beta.4
+  version: 0.39.0.beta.5
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-10-01 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.39.0.beta.4
+        version: 0.39.0.beta.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0.beta.4
+        version: 0.39.0.beta.5
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.27.2
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: cocoapods-search
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-stats
   requirement: !ruby/object:Gem::Requirement
@@ -173,14 +187,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
@@ -254,52 +268,45 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- LICENSE
-- README.md
-- bin/pod
-- bin/sandbox-pod
-- lib/cocoapods.rb
-- lib/cocoapods/command.rb
-- lib/cocoapods/command/cache.rb
 - lib/cocoapods/command/cache/clean.rb
 - lib/cocoapods/command/cache/list.rb
+- lib/cocoapods/command/cache.rb
 - lib/cocoapods/command/init.rb
 - lib/cocoapods/command/inter_process_communication.rb
 - lib/cocoapods/command/lib.rb
 - lib/cocoapods/command/list.rb
 - lib/cocoapods/command/outdated.rb
 - lib/cocoapods/command/project.rb
-- lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/repo/add.rb
 - lib/cocoapods/command/repo/lint.rb
 - lib/cocoapods/command/repo/list.rb
 - lib/cocoapods/command/repo/push.rb
 - lib/cocoapods/command/repo/remove.rb
 - lib/cocoapods/command/repo/update.rb
-- lib/cocoapods/command/search.rb
+- lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/setup.rb
-- lib/cocoapods/command/spec.rb
 - lib/cocoapods/command/spec/cat.rb
 - lib/cocoapods/command/spec/create.rb
 - lib/cocoapods/command/spec/edit.rb
 - lib/cocoapods/command/spec/lint.rb
 - lib/cocoapods/command/spec/which.rb
+- lib/cocoapods/command/spec.rb
+- lib/cocoapods/command.rb
 - lib/cocoapods/config.rb
-- lib/cocoapods/downloader.rb
 - lib/cocoapods/downloader/cache.rb
 - lib/cocoapods/downloader/request.rb
 - lib/cocoapods/downloader/response.rb
+- lib/cocoapods/downloader.rb
 - lib/cocoapods/executable.rb
-- lib/cocoapods/external_sources.rb
 - lib/cocoapods/external_sources/abstract_external_source.rb
 - lib/cocoapods/external_sources/downloader_source.rb
 - lib/cocoapods/external_sources/path_source.rb
 - lib/cocoapods/external_sources/podspec_source.rb
+- lib/cocoapods/external_sources.rb
 - lib/cocoapods/gem_version.rb
-- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/acknowledgements/markdown.rb
 - lib/cocoapods/generator/acknowledgements/plist.rb
+- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/bridge_support.rb
 - lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/generator/dummy_source.rb
@@ -309,19 +316,18 @@ files:
 - lib/cocoapods/generator/module_map.rb
 - lib/cocoapods/generator/prefix_header.rb
 - lib/cocoapods/generator/umbrella_header.rb
-- lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+- lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/hooks_manager.rb
-- lib/cocoapods/installer.rb
-- lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/analyzer/analysis_result.rb
 - lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb
 - lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
 - lib/cocoapods/installer/analyzer/specs_state.rb
 - lib/cocoapods/installer/analyzer/target_inspection_result.rb
 - lib/cocoapods/installer/analyzer/target_inspector.rb
+- lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/file_references_installer.rb
 - lib/cocoapods/installer/migrator.rb
 - lib/cocoapods/installer/pod_source_installer.rb
@@ -330,29 +336,36 @@ files:
 - lib/cocoapods/installer/post_install_hooks_context.rb
 - lib/cocoapods/installer/pre_install_hooks_context.rb
 - lib/cocoapods/installer/source_provider_hooks_context.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
-- lib/cocoapods/installer/user_project_integrator.rb
-- lib/cocoapods/installer/user_project_integrator/target_integrator.rb
+- lib/cocoapods/installer/target_installer.rb
 - lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
+- lib/cocoapods/installer/user_project_integrator/target_integrator.rb
+- lib/cocoapods/installer/user_project_integrator.rb
+- lib/cocoapods/installer.rb
 - lib/cocoapods/open_uri.rb
 - lib/cocoapods/project.rb
-- lib/cocoapods/resolver.rb
 - lib/cocoapods/resolver/lazy_specification.rb
-- lib/cocoapods/sandbox.rb
+- lib/cocoapods/resolver.rb
 - lib/cocoapods/sandbox/file_accessor.rb
 - lib/cocoapods/sandbox/headers_store.rb
 - lib/cocoapods/sandbox/path_list.rb
 - lib/cocoapods/sandbox/pod_dir_cleaner.rb
 - lib/cocoapods/sandbox/podspec_finder.rb
+- lib/cocoapods/sandbox.rb
 - lib/cocoapods/sources_manager.rb
-- lib/cocoapods/target.rb
 - lib/cocoapods/target/aggregate_target.rb
 - lib/cocoapods/target/pod_target.rb
-- lib/cocoapods/user_interface.rb
+- lib/cocoapods/target.rb
 - lib/cocoapods/user_interface/error_report.rb
+- lib/cocoapods/user_interface.rb
 - lib/cocoapods/validator.rb
+- lib/cocoapods.rb
+- bin/pod
+- bin/sandbox-pod
+- README.md
+- LICENSE
+- CHANGELOG.md
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
@@ -373,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.

data/lib/cocoapods/command/search.rb

@@ -1,101 +0,0 @@
-module Pod
-  class Command
-    class Search < Command
-      self.summary = 'Searches for pods'
-
-      self.description = <<-DESC
-        Searches for pods, ignoring case, whose name matches `QUERY`. If the
-        `--full` option is specified, this will also search in the summary and
-        description of the pods.
-      DESC
-
-      self.arguments = [
-        CLAide::Argument.new('QUERY', true),
-      ]
-
-      def self.options
-        [
-          ['--regex', 'Interpret the `QUERY` as a regular expression'],
-          ['--full',  'Search by name, summary, and description'],
-          ['--stats', 'Show additional stats (like GitHub watchers and forks)'],
-          ['--ios',   'Restricts the search to Pods supported on iOS'],
-          ['--osx',   'Restricts the search to Pods supported on OS X'],
-          ['--web',   'Searches on cocoapods.org'],
-        ].concat(super.reject { |option, _| option == '--silent' })
-      end
-
-      def initialize(argv)
-        @use_regex = argv.flag?('regex')
-        @full_text_search = argv.flag?('full')
-        @stats = argv.flag?('stats')
-        @supported_on_ios = argv.flag?('ios')
-        @supported_on_osx = argv.flag?('osx')
-        @web = argv.flag?('web')
-        @query = argv.arguments! unless argv.arguments.empty?
-        config.silent = false
-        super
-      end
-
-      def validate!
-        super
-        help! 'A search query is required.' unless @query
-
-        unless @web || !@use_regex
-          begin
-            /#{@query.join(' ').strip}/
-          rescue RegexpError
-            help! 'A valid regular expression is required.'
-          end
-        end
-      end
-
-      def run
-        ensure_master_spec_repo_exists!
-        if @web
-          web_search
-        else
-          local_search
-        end
-      end
-
-      extend Executable
-      executable :open
-
-      def web_search
-        query_parameter = [
-          ('on:osx' if @supported_on_osx),
-          ('on:ios' if @supported_on_ios),
-          @query,
-        ].compact.flatten.join(' ')
-        url = "http://cocoapods.org/?q=#{CGI.escape(query_parameter).gsub('+', '%20')}"
-        UI.puts("Opening #{url}")
-        open!(url)
-      end
-
-      def local_search
-        query_regex = @query.join(' ').strip
-        query_regex = Regexp.escape(query_regex) unless @use_regex
-
-        sets = SourcesManager.search_by_name(query_regex, @full_text_search)
-        if @supported_on_ios
-          sets.reject! { |set| !set.specification.available_platforms.map(&:name).include?(:ios) }
-        end
-        if @supported_on_osx
-          sets.reject! { |set| !set.specification.available_platforms.map(&:name).include?(:osx) }
-        end
-
-        sets.each do |set|
-          begin
-            if @stats
-              UI.pod(set, :stats)
-            else
-              UI.pod(set, :normal)
-            end
-          rescue DSLError
-            UI.warn "Skipping `#{set.name}` because the podspec contains errors."
-          end
-        end
-      end
-    end
-  end
-end