cocoapods-dylint 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c0a644e9cd0acc1f2d7b1a020e135d48ce895e
-  data.tar.gz: 5803803ba9c3ed40c1e64751d147c4d691ba6817
+  metadata.gz: 0d2609c2b1de4694fef7b74a647ea7884dde908b
+  data.tar.gz: 1cb3da2ac49a4d33c9dcf0f4213248743b6d2081
 SHA512:
-  metadata.gz: fbe3ac62b834e9cf087eafbf1dcea50e5ab928315943fba504aeac2b1fea94a1ace3dc7386e7bd70b3c648f6349647caad46d4fc1ce1087ddcb3014d7daf7a46
-  data.tar.gz: ad97a1b31e62ea5c470ef0b8d78149d5b686e7f33d9e4a75a155e55fba6793b1a09fa2cb09559e68c0dc7e1f526e8db0e66d37e75160b6de75d0a1d09f179473
+  metadata.gz: 49dc4defca16716a80da6f1db92217ca4e3f8535dc1ecccf848afd9d475d6fe5dc96fab80dcc07cd8110cefabbc42357b7e689877c4ebecd010f0df29ab51eee
+  data.tar.gz: 747e85b60a4665dc65d97aa28fc752de6d81bab6a82f7cbc98ca010c22f5cc8174f5501fc0aa25e64551c04a02417eee8bd2aa6e8ca5f2685d7f06c3b2a5f9b8

data/cocoapods-dylint.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency "cocoapods", '>= 1.3.1', '< 1.4.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 end

data/lib/pod/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsDylint
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/validator.rb

@@ -14,10 +14,6 @@ module Pod
   class DyValidator
     include Config::Mixin
 
-    # The default version of Swift to use when linting pods
-    #
-    DEFAULT_SWIFT_VERSION = '3.2'.freeze
-
     # @return [Specification::Linter] the linter instance from CocoaPods
     #         Core.
     #
@@ -256,12 +252,7 @@ module Pod
     # @return [String] the SWIFT_VERSION to use for validation.
     #
     def swift_version
-      return @swift_version unless @swift_version.nil?
-      if (version = spec.swift_version) || (version = dot_swift_version)
-        @swift_version = version.to_s
-      else
-        DEFAULT_SWIFT_VERSION
-      end
+      @swift_version ||= dot_swift_version || '3.0'
     end
 
     # Set the SWIFT_VERSION that should be used to validate the pod.
@@ -277,10 +268,11 @@ module Pod
       swift_version_path.read.strip
     end
 
-    # @return [Boolean] Whether any of the pod targets part of this validator use Swift or not.
+    # @return [String] A string representing the Swift version used during linting
+    #                  or nil, if Swift was not used.
     #
-    def uses_swift?
-      @installer.pod_targets.any?(&:uses_swift?)
+    def used_swift_version
+      swift_version if @installer.pod_targets.any?(&:uses_swift?)
     end
 
     #-------------------------------------------------------------------------#
@@ -307,7 +299,6 @@ module Pod
       validate_screenshots(spec)
       validate_social_media_url(spec)
       validate_documentation_url(spec)
-      validate_source_url(spec)
 
       valid = spec.available_platforms.send(fail_fast ? :all? : :each) do |platform|
         UI.message "\n\n#{spec} - Analyzing on #{platform} platform.".green.reversed
@@ -318,7 +309,7 @@ module Pod
           download_pod
           check_file_patterns
           install_pod
-          validate_swift_version
+          validate_dot_swift_version
           add_app_project_import
           validate_vendored_dynamic_frameworks
           build_pod
@@ -394,50 +385,14 @@ module Pod
       validate_url(spec.documentation_url) if spec.documentation_url
     end
 
-    # Performs validations related to the `source` -> `http` attribute (if exists)
-    #
-    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://')
-      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.')
-    end
-
-    # Performs validation for which version of Swift is used during validation.
-    #
-    # An error will be displayed if the user has provided a `swift_version` attribute within the podspec but is also
-    # using either  `--swift-version` parameter or a `.swift-version with a different Swift version.
-    #
-    # The user will be warned that the default version of Swift was used if the following things are true:
-    #   - The project uses Swift at all
-    #   - The user did not supply a Swift version via a parameter
-    #   - There is no `swift_version` attribute set within the specification
-    #   - There is no `.swift-version` file present either.
-    #
-    def validate_swift_version
-      return unless uses_swift?
-      spec_swift_version = spec.swift_version
-      unless spec_swift_version.nil?
-        message = nil
-        if !dot_swift_version.nil? && dot_swift_version != spec_swift_version.to_s
-          message = "Specification `#{spec.name}` specifies an inconsistent `swift_version` (`#{spec_swift_version}`) compared to the one present in your `.swift-version` file (`#{dot_swift_version}`). " \
-                    'Please remove the `.swift-version` file which is now deprecated and only use the `swift_version` attribute within your podspec.'
-        elsif !@swift_version.nil? && @swift_version != spec_swift_version.to_s
-          message = "Specification `#{spec.name}` specifies an inconsistent `swift_version` (`#{spec_swift_version}`) compared to the one passed during lint (`#{@swift_version}`)."
-        end
-        unless message.nil?
-          error('swift', message)
-          return
-        end
-      end
-      if @swift_version.nil? && spec_swift_version.nil? && dot_swift_version.nil?
-        warning('swift',
-                'The validator used ' \
-                "Swift #{DEFAULT_SWIFT_VERSION} by default because no Swift version was specified. " \
-                'To specify a Swift version during validation, add the `swift_version` attribute in your podspec. ' \
-                'Note that usage of the `--swift-version` parameter or a `.swift-version` file is now deprecated.')
+    def validate_dot_swift_version
+      if !used_swift_version.nil? && dot_swift_version.nil?
+        warning(:swift_version,
+                'The validator for Swift projects uses ' \
+                'Swift 3.0 by default, if you are using a different version of ' \
+                'swift you can use a `.swift-version` file to set the version for ' \
+                "your Pod. For example to use Swift 2.3, run: \n" \
+                '    `echo "2.3" > .swift-version`')
       end
     end
 
@@ -475,11 +430,11 @@ module Pod
 
     def create_app_project
       app_project = Xcodeproj::Project.new(validation_dir + 'App.xcodeproj')
-      Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target)
+      app_project.new_target(:application, 'App', consumer.platform_name, deployment_target)
       app_project.root_object.attributes['TargetAttributes'] = {app_project.targets[0].uuid => {"ProvisioningStyle" => "Manual"}}
       target = app_project.targets[0]
       info_plist_path = validation_dir + 'Info.plist'
-      info_plist = Pod::Generator::InfoPlistFile.new('1.0', :ios, :appl)
+      info_plist = Pod::Generator::InfoPlistFile.new(target, :bundle_package_type => :appl)
       f = File.new(info_plist_path, 'w+')
       f.write(info_plist.generate)
       f.close
@@ -496,17 +451,64 @@ module Pod
 
     def add_app_project_import
       app_project = Xcodeproj::Project.open(validation_dir + 'App.xcodeproj')
-      app_target = app_project.targets.first
       pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
-      Pod::Generator::AppTargetHelper.add_app_project_import(app_project, app_target, pod_target, consumer.platform_name, use_frameworks)
-      Pod::Generator::AppTargetHelper.add_swift_version(app_target, swift_version)
-      Pod::Generator::AppTargetHelper.add_xctest_search_paths(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') } }
+
+      source_file = write_app_import_source_file(pod_target)
+      source_file_ref = app_project.new_group('App', 'App').new_file(source_file)
+      app_target = app_project.targets.first
+      app_target.add_file_references([source_file_ref])
+      add_swift_version(app_target)
+      add_xctest(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') } }
       app_project.save
       Xcodeproj::XCScheme.share_scheme(app_project.path, 'App')
       # Share the pods xcscheme only if it exists. For pre-built vendored pods there is no xcscheme generated.
       Xcodeproj::XCScheme.share_scheme(@installer.pods_project.path, pod_target.label) if shares_pod_target_xcscheme?(pod_target)
     end
 
+    def add_swift_version(app_target)
+      app_target.build_configurations.each do |configuration|
+        configuration.build_settings['SWIFT_VERSION'] = swift_version
+      end
+    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
+
+      if language == :swift
+        source_file = validation_dir.+('App/main.swift')
+        source_file.parent.mkpath
+        import_statement = use_frameworks && pod_target.should_build? ? "import #{pod_target.product_module_name}\n" : ''
+        source_file.open('w') { |f| f << import_statement }
+      else
+        source_file = validation_dir.+('App/main.m')
+        source_file.parent.mkpath
+        import_statement = if use_frameworks && pod_target.should_build?
+                             "@import #{pod_target.product_module_name};\n"
+                           else
+                             header_name = "#{pod_target.product_module_name}/#{pod_target.product_module_name}.h"
+                             if pod_target.sandbox.public_headers.root.+(header_name).file?
+                               "#import <#{header_name}>\n"
+                             else
+                               ''
+                             end
+        end
+        source_file.open('w') do |f|
+          f << "@import Foundation;\n"
+          f << "@import UIKit;\n" if consumer.platform_name == :ios || consumer.platform_name == :tvos
+          f << "@import Cocoa;\n" if consumer.platform_name == :osx
+          f << "#{import_statement}int main() {}\n"
+        end
+      end
+      source_file
+    end
+
     # It creates a podfile in memory and builds a library containing the pod
     # for all available platforms with xcodebuild.
     #
@@ -515,24 +517,12 @@ module Pod
          perform_post_install_actions).each { |m| @installer.send(m) }
 
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
-      configure_pod_targets(@installer.aggregate_targets, deployment_target)
-      @installer.pods_project.save
-    end
-
-    def configure_pod_targets(targets, deployment_target)
-      targets.each do |target|
+      @installer.aggregate_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
-          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|
-                build_configuration.build_settings['SWIFT_VERSION'] = swift_version
-              end
-            end
+            build_configuration.build_settings['SWIFT_VERSION'] = swift_version if pod_target.uses_swift?
           end
         end
         if target.pod_targets.any?(&:uses_swift?) && consumer.platform_name == :ios &&
@@ -541,6 +531,7 @@ module Pod
           error('swift', 'Swift support uses dynamic frameworks and is therefore only supported on iOS > 8.') unless uses_xctest
         end
       end
+      @installer.pods_project.save
     end
 
     def validate_vendored_dynamic_frameworks

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dylint
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - 黄露洋
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cocoapods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement