cocoapods 0.36.0.beta.1 → 0.36.0.beta.2

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

@@ -0,0 +1,43 @@
+module Pod
+  class Command
+    class Spec < Command
+      class Which < Spec
+        self.summary = 'Prints the path of the given spec.'
+
+        self.description = <<-DESC
+          Prints the path of the .podspec file(s) whose name matches `QUERY`
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('QUERY', false),
+        ]
+
+        def self.options
+          [
+            ['--regex', 'Interpret the `QUERY` as a regular expression'],
+            ['--show-all', 'Print all versions of the given podspec'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @use_regex = argv.flag?('regex')
+          @show_all = argv.flag?('show-all')
+          @query = argv.shift_argument
+          @query = @query.gsub('.podspec', '') unless @query.nil?
+          super
+        end
+
+        def validate!
+          super
+          help! 'A podspec name is required.' unless @query
+          validate_regex!(@query) if @use_regex
+        end
+
+        def run
+          query = @use_regex ? @query : Regexp.escape(@query)
+          UI.puts get_path_of_spec(query, @show_all)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/downloader.rb

@@ -7,7 +7,6 @@ module Pod
 
     class Base
       override_api do
-
         def execute_command(executable, command, raise_on_failure = false)
           Executable.execute_command(executable, command, raise_on_failure)
         rescue CLAide::InformativeError => e
@@ -56,7 +55,6 @@ module Pod
         def ui_message(message)
           UI.puts message
         end
-
       end
     end
   end

data/lib/cocoapods/external_sources/podspec_source.rb

@@ -9,9 +9,19 @@ module Pod
       def fetch(sandbox)
         title = "Fetching podspec for `#{name}` #{description}"
         UI.titled_section(title,  :verbose_prefix => '-> ') do
-          is_json = podspec_uri.split('.').last == 'json'
-          require 'open-uri'
-          open(podspec_uri) { |io| store_podspec(sandbox, io.read, is_json) }
+          podspec_path = Pathname(podspec_uri)
+          is_json = podspec_path.extname == '.json'
+          if podspec_path.exist?
+            store_podspec(sandbox, podspec_path, is_json)
+          else
+            require 'open-uri'
+            begin
+              open(podspec_uri) { |io| store_podspec(sandbox, io.read, is_json) }
+            rescue OpenURI::HTTPError => e
+              status = e.io.status.join(' ')
+              raise Informative, "Failed to fetch podspec for `#{name}` at `#{podspec_uri}`.\n Error: #{status}"
+            end
+          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.36.0.beta.1' unless defined? Pod::VERSION
+  VERSION = '0.36.0.beta.2' unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -1,21 +1,22 @@
 module Pod
   module Generator
     class CopyResourcesScript
-      # @return [Array<#to_s>] A list of files relative to the project pods
-      #         root.
+      # @return [Hash{String, Array{String}] A list of files relative to the
+      #         project pods root, keyed by build configuration.
       #
-      attr_reader :resources
+      attr_reader :resources_by_config
 
       # @return [Platform] The platform of the library for which the copy
       #         resources script is needed.
       #
       attr_reader :platform
 
-      # @param  [Array<#to_s>] resources @see resources
+      # @param  [Hash{String, Array{String}]
+      #         resources_by_config @see resources_by_config
       # @param  [Platform] platform @see platform
       #
-      def initialize(resources, platform)
-        @resources = resources
+      def initialize(resources_by_config, platform)
+        @resources_by_config = resources_by_config
         @platform = platform
       end
 
@@ -58,25 +59,35 @@ module Pod
       #
       def install_resources_function
         if use_external_strings_file?
-          INSTALL_RESOURCES_FUCTION
+          INSTALL_RESOURCES_FUNCTION
         else
-          INSTALL_RESOURCES_FUCTION.gsub(' --reference-external-strings-file', '')
+          INSTALL_RESOURCES_FUNCTION.gsub(' --reference-external-strings-file', '')
         end
       end
 
       # @return [String] The contents of the copy resources script.
       #
       def script
+        # Define install function
         script = install_resources_function
-        resources.each do |resource|
-          script += %(          install_resource "#{resource}"\n          )
+
+        # Call function for each configuration-dependent resource
+        resources_by_config.each do |config, resources|
+          unless resources.empty?
+            script += %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
+            resources.each do |resource|
+              script += "  install_resource '#{resource}'\n"
+            end
+            script += "fi\n"
+          end
         end
+
         script += RSYNC_CALL
         script += XCASSETS_COMPILE
         script
       end
 
-      INSTALL_RESOURCES_FUCTION = <<EOS
+      INSTALL_RESOURCES_FUNCTION = <<EOS
 #!/bin/sh
 set -e
 

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -78,6 +78,9 @@ module Pod
             for lib in $swift_runtime_libs; do
               echo "rsync -av \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
               rsync -av "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
+              if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
+                code_sign "${destination}/${lib}"
+              fi
             done
           }
 

data/lib/cocoapods/generator/header.rb

@@ -37,18 +37,18 @@ module Pod
       # @return [String]
       #
       def generate
-        result = ""
+        result = ''
         result << generate_platform_import_header
 
         result << "\n"
 
         imports.each do |import|
-          result << %|#import "#{import}"\n|
+          result << %(#import "#{import}"\n)
         end
 
         unless module_imports.empty?
           module_imports.each do |import|
-            result << %|\n@import #{import}|
+            result << %(\n@import #{import})
           end
           result << "\n"
         end

data/lib/cocoapods/generator/target_environment_header.rb

@@ -74,7 +74,7 @@ module Pod
       def common_specs(specs_by_configuration)
         result = specs_by_configuration.values.flatten.uniq
         specs_by_configuration.values.each do |configuration_specs|
-          result = result & configuration_specs
+          result &= configuration_specs
         end
         result.sort_by(&:name)
       end

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

@@ -49,7 +49,7 @@ module Pod
         def generate
           pod_targets = target.pod_targets_for_build_configuration(@configuration_name)
           config = {
-            'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
+            'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.default_ld_flags(target),
             'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
             'PODS_ROOT' => target.relative_pods_root,
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
@@ -62,7 +62,7 @@ module Pod
               'PODS_FRAMEWORK_BUILD_PATH' => target.configuration_build_dir,
               'FRAMEWORK_SEARCH_PATHS' => '"$PODS_FRAMEWORK_BUILD_PATH"',
               # Make headers discoverable by `import "…"`
-              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-iquote')
+              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-iquote'),
             }
             config.merge!(build_settings)
           else
@@ -70,9 +70,9 @@ module Pod
             header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
             build_settings = {
               # by `#import "…"`
-              'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths),
+              'HEADER_SEARCH_PATHS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths),
               # by `#import <…>`
-              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem')
+              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem'),
             }
             config.merge!(build_settings)
           end
@@ -101,7 +101,7 @@ module Pod
             end
           end
 
-          # TODO Need to decide how we are going to ensure settings like these
+          # TODO: Need to decide how we are going to ensure settings like these
           # are always excluded from the user's project.
           #
           # See https://github.com/CocoaPods/CocoaPods/issues/1216
@@ -125,7 +125,7 @@ module Pod
           else
             ld_runpath_search_paths << [
               "'@executable_path/Frameworks'",
-              "'@loader_path/Frameworks'"
+              "'@loader_path/Frameworks'",
             ]
           end
           @xcconfig.merge!('LD_RUNPATH_SEARCH_PATHS' => ld_runpath_search_paths.join(' '))
@@ -133,6 +133,6 @@ module Pod
 
         #---------------------------------------------------------------------#
       end
+    end
   end
 end
-end

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

@@ -46,6 +46,6 @@ module Pod
 
         #-----------------------------------------------------------------------#
       end
+    end
   end
 end
-end

data/lib/cocoapods/hooks_manager.rb

@@ -20,12 +20,12 @@ module Pod
     #
     class Hook
       # @return [String]
-      #         The name of the hook's notification.
+      #         The name of the plugin that registered the hook.
       #
       attr_reader :plugin_name
 
       # @return [String]
-      #         The name of the plugin the hook came from.
+      #         The name of the hook.
       #
       attr_reader :name
 
@@ -54,8 +54,8 @@ module Pod
     end
 
     class << self
-      # @return [Hash{Symbol => Array<Proc>}] The list of the blocks that are
-      #         registered for each notification name.
+      # @return [Hash{Symbol => Array<Hook>}] The list of the hooks that are
+      #         registered for each hook name.
       #
       attr_reader :registrations
 

data/lib/cocoapods/installer.rb

@@ -446,8 +446,7 @@ module Pod
           target_installer.install!
         end
 
-        # TODO
-        # Move and add specs
+        # TODO: Move and add specs
         pod_targets.sort_by(&:name).each do |pod_target|
           pod_target.file_accessors.each do |file_accessor|
             file_accessor.spec_consumer.frameworks.each do |framework|
@@ -468,6 +467,9 @@ module Pod
     def set_target_dependencies
       frameworks_group = pods_project.frameworks_group
       aggregate_targets.each do |aggregate_target|
+        is_app_extension = aggregate_target.user_targets.map(&:symbol_type).include?(:app_extension)
+        configure_app_extension_api_only_for_target(aggregate_target) if is_app_extension
+
         aggregate_target.pod_targets.each do |pod_target|
           unless pod_target.should_build?
             pod_target.resource_bundle_targets.each do |resource_bundle_target|
@@ -478,17 +480,19 @@ module Pod
           end
 
           aggregate_target.native_target.add_dependency(pod_target.native_target)
-          pod_target.dependencies.each do |dep|
+          configure_app_extension_api_only_for_target(pod_target) if is_app_extension
 
+          pod_target.dependencies.each do |dep|
             unless dep == pod_target.pod_name
               pod_dependency_target = aggregate_target.pod_targets.find { |target| target.pod_name == dep }
-              # TODO remove me
+              # TODO: remove me
               unless pod_dependency_target
                 puts "[BUG] DEP: #{dep}"
               end
 
               next unless pod_dependency_target.should_build?
               pod_target.native_target.add_dependency(pod_dependency_target.native_target)
+              configure_app_extension_api_only_for_target(pod_dependency_target) if is_app_extension
 
               if pod_target.requires_frameworks?
                 product_ref = frameworks_group.files.find { |f| f.path == pod_dependency_target.product_name } ||
@@ -696,6 +700,15 @@ module Pod
       analysis_result.sandbox_state
     end
 
+    # Sets the APPLICATION_EXTENSION_API_ONLY build setting to YES for all
+    # configurations of the given target
+    #
+    def configure_app_extension_api_only_for_target(target)
+      target.native_target.build_configurations.each do |config|
+        config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'YES'
+      end
+    end
+
     #-------------------------------------------------------------------------#
   end
 end

data/lib/cocoapods/installer/analyzer.rb

@@ -101,7 +101,7 @@ module Pod
       #         change in the Podfile should be locked.
       #
       def update_mode?
-        !!update
+        update != nil
       end
 
       # @return [Symbol] Whether and how the dependencies in the Podfile
@@ -163,12 +163,18 @@ module Pod
         end
       end
 
-      # Updates the source repositories unless the config indicates to skip it.
+      # Updates the git source repositories unless the config indicates to skip it.
       #
       def update_repositories_if_needed
         unless config.skip_repo_update?
           UI.section 'Updating spec repositories' do
-            sources.each { |source| SourcesManager.update(source.name) }
+            sources.each do |source|
+              if SourcesManager.git_repo?(source.repo)
+                SourcesManager.update(source.name)
+              else
+                UI.message "Skipping `#{source.name}` update because the repository is not a git source repository."
+              end
+            end
           end
         end
       end
@@ -306,7 +312,7 @@ module Pod
       #
       # @return [void]
       #
-      # TODO    Specs
+      # TODO:    Specs
       #
       def fetch_external_sources
         return unless allow_pre_downloads?
@@ -325,7 +331,7 @@ module Pod
         deps_with_different_sources = podfile.dependencies.group_by(&:root_name).
           select { |_root_name, dependencies| dependencies.map(&:external_source).uniq.count > 1 }
         deps_with_different_sources.each do |root_name, dependencies|
-          raise Informative, "There are multiple dependencies with different " \
+          raise Informative, 'There are multiple dependencies with different ' \
           "sources for `#{root_name}` in #{UI.path podfile.defined_in_file}:" \
           "\n\n- #{dependencies.map(&:to_s).join("\n- ")}"
         end
@@ -344,7 +350,6 @@ module Pod
       def dependencies_to_fetch
         @deps_to_fetch ||= begin
           deps_to_fetch = []
-          deps_to_fetch_if_needed = []
           deps_with_external_source = podfile.dependencies.select(&:external_source)
 
           if update_mode == :all
@@ -466,7 +471,8 @@ module Pod
 
       # Returns the sources used to query for specifications
       #
-      # When no explicit Podfile sources are defined, this defaults to all
+      # When no explicit Podfile sources are defined, this defaults to the
+      # master spec repository.
       # available sources ({SourcesManager.all}).
       #
       # @return [Array<Source>] the sources to be used in finding
@@ -476,10 +482,11 @@ module Pod
         @sources ||= begin
           sources = podfile.sources
           if sources.empty?
-            SourcesManager.all
+            url = 'https://github.com/CocoaPods/Specs.git'
+            [SourcesManager.find_or_create_source_with_url(url)]
           else
-            sources.map do |url|
-              SourcesManager.find_or_create_source_with_url(url)
+            sources.map do |source_url|
+              SourcesManager.find_or_create_source_with_url(source_url)
             end
           end
         end
@@ -647,7 +654,7 @@ module Pod
         end
 
         archs = archs.compact.uniq.sort
-        UI.message("Using `ARCHS` setting to build architectures of " \
+        UI.message('Using `ARCHS` setting to build architectures of ' \
                    "target `#{target_definition.label}`: " \
                    "(`#{archs.join('`, `')}`)")
         archs.length > 1 ? archs : archs.first
@@ -668,7 +675,7 @@ module Pod
               project_path = compute_user_project_path(target_definition)
               user_project = Xcodeproj::Project.open(project_path)
               targets = compute_user_project_targets(target_definition, user_project)
-              platform = compute_platform_for_target_definition(target_definition, targets)
+              compute_platform_for_target_definition(target_definition, targets)
               archs = compute_archs_for_target_definition(target_definition, targets)
               @archs_by_target_def[target_definition] = archs
             else

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -46,7 +46,7 @@ module Pod
         run_prepare_command
       rescue Informative
         raise
-      rescue Object => e
+      rescue Object
         UI.notice("Error installing #{root_spec.name}")
         clean!
         raise