cocoapods 1.0.1 → 1.1.0.beta.1

data/lib/cocoapods/resolver.rb

@@ -389,7 +389,6 @@ module Pod
         error.conflicts.each do |name, conflict|
           local_pod_parent = conflict.requirement_trees.flatten.reverse.find(&:local?)
           lockfile_reqs = conflict.requirements[name_for_locking_dependency_source]
-
           if lockfile_reqs && lockfile_reqs.last && lockfile_reqs.last.prerelease? && !conflict.existing
             message = 'Due to the previous naïve CocoaPods resolver, ' \
               "you were using a pre-release version of `#{name}`, " \
@@ -398,7 +397,7 @@ 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 local_pod_parent && !specifications_for_dependency(conflict.requirement).empty?
+          elsif local_pod_parent && !specifications_for_dependency(conflict.requirement).empty? && !conflict.possibility
             # Conflict was caused by a requirement from a local dependency.
             # Tell user to use `pod update`.
             message << "\n\nIt seems like you've changed the constraints of dependency `#{name}` " \

data/lib/cocoapods/target/aggregate_target.rb

@@ -7,6 +7,9 @@ module Pod
     #         generated this target.
     attr_reader :target_definition
 
+    # Product types where the product's frameworks must be embedded in a host target
+    EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES = [:app_extension, :framework, :messages_extension, :watch_extension].freeze
+
     # Initialize a new instance
     #
     # @param [TargetDefinition] target_definition @see target_definition
@@ -23,6 +26,22 @@ module Pod
       @xcconfigs = {}
     end
 
+    # @return [Boolean] True if the user_target's pods are
+    #         for an extension and must be embedded in a host,
+    #         target, otherwise false.
+    #
+    def requires_host_target?
+      # If we don't have a user_project, then we can't
+      # glean any info about how this target is going to
+      # be integrated, so return false since we can't know
+      # for sure that this target refers to an extension
+      # target that would require a host target
+      return false if user_project.nil?
+      symbol_types = user_targets.map(&:symbol_type).uniq
+      raise ArgumentError, "Expected single kind of user_target for #{name}. Found #{symbol_types.join(', ')}." unless symbol_types.count == 1
+      EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES.include? symbol_types[0]
+    end
+
     # @return [String] the label for the target.
     #
     def label

data/lib/cocoapods/target/pod_target.rb

@@ -65,6 +65,7 @@ module Pod
           target.native_target = native_target
           target.archs = archs
           target.dependent_targets = dependent_targets.flat_map { |pt| pt.scoped(cache) }.select { |pt| pt.target_definitions == [target_definition] }
+          target.host_requires_frameworks = host_requires_frameworks
           cache[cache_key] = target
         end
       end
@@ -80,6 +81,12 @@ module Pod
       end
     end
 
+    # @return [String] the Swift version for the target.
+    #
+    def swift_version
+      target_definitions.map(&:swift_version).compact.uniq.first
+    end
+
     # @note   The deployment target for the pod target is the maximum of all
     #         the deployment targets for the current platform of the target
     #         (or the minimum required to support the current installation
@@ -188,8 +195,14 @@ module Pod
     #         dependency upon.
     #
     def recursive_dependent_targets
-      targets = dependent_targets + dependent_targets.flat_map(&:recursive_dependent_targets)
-      targets.uniq!
+      targets = dependent_targets.clone
+
+      targets.each do |target|
+        target.dependent_targets.each do |t|
+          targets.push(t) unless t == self || targets.include?(t)
+        end
+      end
+
       targets
     end
 

data/lib/cocoapods/user_interface.rb

@@ -1,4 +1,5 @@
 require 'cocoapods/user_interface/error_report'
+require 'cocoapods/user_interface/inspector_reporter'
 
 module Pod
   # Provides support for UI output. It provides support for nested sections of
@@ -184,7 +185,11 @@ module Pod
         if pathname
           from_path = config.podfile_path.dirname if config.podfile_path
           from_path ||= Pathname.pwd
-          path = Pathname(pathname).relative_path_from(from_path)
+          path = begin
+                   Pathname(pathname).relative_path_from(from_path)
+                 rescue
+                   pathname
+                 end
           "`#{path}`"
         else
           ''

data/lib/cocoapods/user_interface/error_report.rb

@@ -2,6 +2,7 @@
 
 require 'rbconfig'
 require 'cgi'
+require 'gh_inspector'
 
 module Pod
   module UserInterface
@@ -112,6 +113,12 @@ EOS
 EOS
         end
 
+        def search_for_exceptions(exception)
+          inspector = GhInspector::Inspector.new 'cocoapods', 'cocoapods'
+          message_delegate = UserInterface::InspectorReporter.new
+          inspector.search_exception exception, message_delegate
+        end
+
         private
 
         def `(other)

data/lib/cocoapods/user_interface/inspector_reporter.rb

@@ -0,0 +1,109 @@
+require 'uri'
+
+module Pod
+  module UserInterface
+    # Redirects GH-issues delegate callbacks to CocoaPods UI methods.
+    #
+    class InspectorReporter
+      # Called just as the investigation has begun.
+      # Lets the user know that it's looking for an issue.
+      #
+      # @param [query] String unused
+      #
+      # @param [GhInspector::Inspector] inspector
+      #        The current inspector
+      #
+      # @return [void]
+      #
+      def inspector_started_query(_, inspector)
+        UI.puts "Looking for related issues on #{inspector.repo_owner}/#{inspector.repo_name}..."
+      end
+
+      # Called once the inspector has recieved a report with more than one issue,
+      # showing the top 3 issues, and offering a link to see more.
+      #
+      # @param [GhInspector::InspectionReport] report
+      #        Report a list of the issues
+      #
+      # @param [GhInspector::Inspector] inspector
+      #        The current inspector
+      #
+      # @return [void]
+      #
+      def inspector_successfully_recieved_report(report, _)
+        report.issues[0..2].each { |issue| print_issue_full(issue) }
+
+        if report.issues.count > 3
+          UI.puts "and #{report.total_results - 3} more at:"
+          UI.puts report.url
+        end
+      end
+
+      # Called once the report has been recieved, but when there are no issues found.
+      #
+      # @param [GhInspector::InspectionReport] report
+      #        An empty report
+      #
+      # @param [GhInspector::Inspector] inspector
+      #        The current inspector
+      #
+      # @return [void]
+      #
+      def inspector_recieved_empty_report(_, inspector)
+        UI.puts 'Found no similar issues. To create a new issue, please visit:'
+        UI.puts "https://github.com/#{inspector.repo_owner}/#{inspector.repo_name}/issues/new"
+      end
+
+      # Called when there have been networking issues in creating the report.
+      #
+      # @param [Error] error
+      #        The error returned during networking
+      #
+      # @param [String] query
+      #        The original search query
+      #
+      # @param [GhInspector::Inspector] inspector
+      #        The current inspector
+      #
+      # @return [void]
+      #
+      def inspector_could_not_create_report(error, query, inspector)
+        safe_query = URI.escape query
+        UI.puts 'Could not access the GitHub API, you may have better luck via the website.'
+        UI.puts "https://github.com/#{inspector.repo_owner}/#{inspector.repo_name}/search?q=#{safe_query}&type=Issues&utf8=✓"
+        UI.puts "Error: #{error.name}"
+      end
+
+      private
+
+      def print_issue_full(issue)
+        safe_url = URI.escape issue.html_url
+        UI.puts " - #{issue.title}"
+        UI.puts "   #{safe_url} [#{issue.state}] [#{issue.comments} comment#{issue.comments == 1 ? '' : 's'}]"
+        UI.puts "   #{pretty_date(issue.updated_at)}"
+        UI.puts ''
+      end
+
+      # Taken from http://stackoverflow.com/questions/195740/how-do-you-do-relative-time-in-rails
+      def pretty_date(date_string)
+        date = Time.parse(date_string)
+        a = (Time.now - date).to_i
+
+        case a
+        when 0 then 'just now'
+        when 1 then 'a second ago'
+        when 2..59 then a.to_s + ' seconds ago'
+        when 60..119 then 'a minute ago' # 120 = 2 minutes
+        when 120..3540 then (a / 60).to_i.to_s + ' minutes ago'
+        when 3541..7100 then 'an hour ago' # 3600 = 1 hour
+        when 7101..82_800 then ((a + 99) / 3600).to_i.to_s + ' hours ago'
+        when 82_801..172_000 then 'a day ago' # 86400 = 1 day
+        when 172_001..518_400 then ((a + 800) / (60 * 60 * 24)).to_i.to_s + ' days ago'
+        when 518_400..1_036_800 then 'a week ago'
+        when 1_036_801..4_147_204 then ((a + 180_000) / (60 * 60 * 24 * 7)).to_i.to_s + ' weeks ago'
+        else date.strftime('%d %b %Y')
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/validator.rb

@@ -1,8 +1,6 @@
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/string/inflections'
 
-autoload :Fourflusher, 'fourflusher'
-
 module Pod
   # Validates a Specification.
   #
@@ -388,10 +386,19 @@ module Pod
 
       source_file = write_app_import_source_file(pod_target)
       source_file_ref = app_project.new_group('App', 'App').new_file(source_file)
-      app_project.targets.first.add_file_references([source_file_ref])
+      app_target = app_project.targets.first
+      app_target.add_file_references([source_file_ref])
+      add_xctest(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') } }
       app_project.save
     end
 
+    def add_xctest(app_target)
+      app_target.build_configurations.each do |configuration|
+        search_paths = configuration.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= '$(inherited)'
+        search_paths << ' "$(PLATFORM_DIR)/Developer/Library/Frameworks"'
+      end
+    end
+
     def write_app_import_source_file(pod_target)
       language = pod_target.uses_swift? ? :swift : :objc
 
@@ -427,7 +434,7 @@ module Pod
     # for all available platforms with xcodebuild.
     #
     def install_pod
-      %i(verify_no_duplicate_framework_names
+      %i(verify_no_duplicate_framework_and_library_names
          verify_no_static_framework_transitive_dependencies
          verify_framework_usage generate_pods_project integrate_user_project
          perform_post_install_actions).each { |m| @installer.send(m) }
@@ -710,17 +717,18 @@ module Pod
     #         returns its output (both STDOUT and STDERR).
     #
     def xcodebuild
+      require 'fourflusher'
       command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release)
       case consumer.platform_name
       when :ios
         command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
-        command += Fourflusher::SimControl.new.destination('iPhone 4s', deployment_target)
+        command += Fourflusher::SimControl.new.destination(:oldest, 'iOS', deployment_target)
       when :watchos
         command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
-        command += Fourflusher::SimControl.new.destination('Apple Watch - 38mm', deployment_target)
+        command += Fourflusher::SimControl.new.destination(:oldest, 'watchOS', deployment_target)
       when :tvos
         command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
-        command += Fourflusher::SimControl.new.destination('Apple TV 1080p', deployment_target)
+        command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
       end
 
       output, status = Dir.chdir(validation_dir) { _xcodebuild(command) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0.beta.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -173,7 +173,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -183,7 +183,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -193,21 +193,21 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -228,6 +228,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -235,6 +238,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -269,14 +275,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: gh_inspector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
@@ -432,7 +452,6 @@ files:
 - 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/file_references_installer.rb
 - lib/cocoapods/installer/installation_options.rb
 - lib/cocoapods/installer/migrator.rb
 - lib/cocoapods/installer/pod_source_installer.rb
@@ -441,12 +460,15 @@ 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/user_project_integrator/target_integrator/xcconfig_integrator.rb
+- lib/cocoapods/installer/xcode.rb
+- lib/cocoapods/installer/xcode/pods_project_generator.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb
 - lib/cocoapods/open-uri.rb
 - lib/cocoapods/project.rb
 - lib/cocoapods/resolver.rb
@@ -463,6 +485,7 @@ files:
 - lib/cocoapods/target/pod_target.rb
 - lib/cocoapods/user_interface.rb
 - lib/cocoapods/user_interface/error_report.rb
+- lib/cocoapods/user_interface/inspector_reporter.rb
 - lib/cocoapods/validator.rb
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
@@ -484,7 +507,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.5
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.