cocoapods 1.4.0 → 1.5.0.beta.1

data/lib/cocoapods/user_interface/error_report.rb

@@ -32,7 +32,7 @@ module Pod
 
 ```
 #{exception.class} - #{exception.message}
-#{exception.backtrace.join("\n")}
+#{exception.backtrace.join("\n") if exception.backtrace}
 ```
 
 #{'――― TEMPLATE END ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'.reversed}

data/lib/cocoapods/user_interface/inspector_reporter.rb

@@ -19,7 +19,7 @@ module Pod
         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,
+      # Called once the inspector has received a report with more than one issue,
       # showing the top 3 issues, and offering a link to see more.
       #
       # @param [GhInspector::InspectionReport] report
@@ -30,7 +30,7 @@ module Pod
       #
       # @return [void]
       #
-      def inspector_successfully_recieved_report(report, _)
+      def inspector_successfully_received_report(report, _)
         report.issues[0..2].each { |issue| print_issue_full(issue) }
 
         if report.issues.count > 3
@@ -39,7 +39,7 @@ module Pod
         end
       end
 
-      # Called once the report has been recieved, but when there are no issues found.
+      # Called once the report has been received, but when there are no issues found.
       #
       # @param [GhInspector::InspectionReport] report
       #        An empty report
@@ -49,7 +49,7 @@ module Pod
       #
       # @return [void]
       #
-      def inspector_recieved_empty_report(_, inspector)
+      def inspector_received_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

data/lib/cocoapods/validator.rb

@@ -398,8 +398,8 @@ module Pod
     #
     def validate_source_url(spec)
       return if spec.source.nil? || spec.source[:http].nil?
-      url = spec.source[:http]
-      return if url.downcase.start_with?('https://')
+      url = URI(spec.source[:http])
+      return if url.scheme == 'https' || url.scheme == 'file'
       warning('http', "The URL (`#{url}`) doesn't use the encrypted HTTPs protocol. " \
               'It is crucial for Pods to be transferred over a secure protocol to protect your users from man-in-the-middle attacks. '\
               'This will be an error in future releases. Please update the URL to use https.')
@@ -506,13 +506,10 @@ module Pod
     end
 
     def configure_pod_targets(targets, deployment_target)
+      test_only_pod_targets = @installer.pod_targets - targets.flat_map(&:pod_targets)
       targets.each do |target|
         target.pod_targets.each do |pod_target|
-          next unless (native_target = pod_target.native_target)
-          native_target.build_configuration_list.build_configurations.each do |build_configuration|
-            (build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella'
-            build_configuration.build_settings['SWIFT_VERSION'] = (pod_target.swift_version || swift_version) if pod_target.uses_swift?
-          end
+          update_pod_target_build_settings(pod_target)
           if pod_target.uses_swift?
             pod_target.test_native_targets.each do |test_native_target|
               test_native_target.build_configuration_list.build_configurations.each do |build_configuration|
@@ -527,6 +524,20 @@ module Pod
           error('swift', 'Swift support uses dynamic frameworks and is therefore only supported on iOS > 8.') unless uses_xctest
         end
       end
+      # Wire up Swift version to pod targets used only by tests.
+      test_only_pod_targets.each do |test_pod_target|
+        update_pod_target_build_settings(test_pod_target)
+      end
+    end
+
+    def update_pod_target_build_settings(pod_target)
+      native_target = pod_target.native_target
+      unless native_target.nil?
+        native_target.build_configuration_list.build_configurations.each do |build_configuration|
+          (build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella'
+          build_configuration.build_settings['SWIFT_VERSION'] = (pod_target.swift_version || swift_version) if pod_target.uses_swift?
+        end
+      end
     end
 
     def validate_vendored_dynamic_frameworks
@@ -545,46 +556,49 @@ module Pod
     # Performs platform specific analysis. It requires to download the source
     # at each iteration
     #
-    # @note   Xcode warnings are treaded as notes because the spec maintainer
+    # @note   Xcode warnings are treated as notes because the spec maintainer
     #         might not be the author of the library
     #
     # @return [void]
     #
     def build_pod
       if !xcodebuild_available?
-        UI.warn "Skipping compilation with `xcodebuild' because it can't be found.\n".yellow
+        UI.warn "Skipping compilation with `xcodebuild` because it can't be found.\n".yellow
       else
-        UI.message "\nBuilding with xcodebuild.\n".yellow do
+        UI.message "\nBuilding with `xcodebuild`.\n".yellow do
           scheme = if skip_import_validation?
-                     @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }.label
+                     pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
+                     pod_target.label if pod_target.should_build?
                    else
                      'App'
                    end
-          output = xcodebuild('build', scheme, 'Release')
-          UI.puts output
-          parsed_output = parse_xcodebuild_output(output)
-          translate_output_to_linter_messages(parsed_output)
+          if scheme.nil?
+            UI.warn "Skipping compilation with `xcodebuild` because target contains no sources.\n".yellow
+          else
+            output = xcodebuild('build', scheme, 'Release')
+            parsed_output = parse_xcodebuild_output(output)
+            translate_output_to_linter_messages(parsed_output)
+          end
         end
       end
     end
 
     # Builds and runs all test sources associated with the current specification being validated.
     #
-    # @note   Xcode warnings are treaded as notes because the spec maintainer
+    # @note   Xcode warnings are treated as notes because the spec maintainer
     #         might not be the author of the library
     #
     # @return [void]
     #
     def test_pod
       if !xcodebuild_available?
-        UI.warn "Skipping test validation with `xcodebuild' because it can't be found.\n".yellow
+        UI.warn "Skipping test validation with `xcodebuild` because it can't be found.\n".yellow
       else
-        UI.message "\nTesting with xcodebuild.\n".yellow do
+        UI.message "\nTesting with `xcodebuild`.\n".yellow do
           pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
           consumer.spec.test_specs.each do |test_spec|
             scheme = pod_target.native_target_for_spec(test_spec)
             output = xcodebuild('test', scheme, 'Debug')
-            UI.puts output
             parsed_output = parse_xcodebuild_output(output)
             translate_output_to_linter_messages(parsed_output)
           end
@@ -857,25 +871,22 @@ module Pod
         command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
       end
 
-      output, status = _xcodebuild(command)
-
-      unless status.success?
+      begin
+        _xcodebuild(command, true)
+      rescue => e
         message = 'Returned an unsuccessful exit code.'
         message += ' You can use `--verbose` for more information.' unless config.verbose?
         error('xcodebuild', message)
+        e.message
       end
-
-      output
     end
 
     # Executes the given command in the current working directory.
     #
-    # @return [(String, Status)] The output of the given command and its
-    #         resulting status.
+    # @return [String] The output of the given command
     #
-    def _xcodebuild(command)
-      UI.puts 'xcodebuild ' << command.join(' ') if config.verbose
-      Executable.capture_command('xcodebuild', command, :capture => :merge)
+    def _xcodebuild(command, raise_on_failure = false)
+      Executable.execute_command('xcodebuild', command, raise_on_failure)
     end
 
     #-------------------------------------------------------------------------#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-03-22 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.4.0
+        version: 1.5.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0.beta.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -193,21 +193,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.5.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.5.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -445,6 +445,7 @@ files:
 - lib/cocoapods/generator/acknowledgements/plist.rb
 - lib/cocoapods/generator/app_target_helper.rb
 - lib/cocoapods/generator/bridge_support.rb
+- lib/cocoapods/generator/constant.rb
 - lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/generator/dummy_source.rb
 - lib/cocoapods/generator/embed_frameworks_script.rb
@@ -464,6 +465,7 @@ files:
 - lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb
 - lib/cocoapods/installer/analyzer/pod_variant.rb
 - lib/cocoapods/installer/analyzer/pod_variant_set.rb
+- lib/cocoapods/installer/analyzer/podfile_dependency_cache.rb
 - lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
 - lib/cocoapods/installer/analyzer/specs_state.rb
 - lib/cocoapods/installer/analyzer/target_inspection_result.rb
@@ -524,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.