cocoapods-dykit 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c006e95d2b7ebad36a953c610109d1188844dee
-  data.tar.gz: 7d8903df8dfe1d82bd41b5e513b12e39a797d95b
+  metadata.gz: 6d50192e3b4c57f120562c570c09233e5c136fc3
+  data.tar.gz: 55dd23036fc2133373d475c030a2ce719b3d7e2f
 SHA512:
-  metadata.gz: afba4b568edc4f665e4096661565d15b6c80aa462ac570cbaaa827a31c53c15445ee0ed7fa6ce041cdbce028fd7657624e07b7941263d25391ad64484234056e
-  data.tar.gz: 96db995639c3309477383ec39366c9f182cd4f82e8cb0b303032acf0183567eed34e18887cc0e0e7042c9600e1a8a6bf180046e0dfff9f037bf0207e8de961f3
+  metadata.gz: '0187263a409376917babb7c5760dc3a6c1c8c3a1536c9ff4cf9015dc920c79ee7fde8d8eec210f838e9cbb81dcf5fd0f279a8afa35c02bf3f5956027d4df7a01'
+  data.tar.gz: 7c99321bb40f86095567a911c5a5a255d02ea032a3cd2d46cc4faae84b32dc28e70ee75b302228b90e238337918c82dd6beb0ac9e9e6a2e6a4cf49c6ad0d968e

data/cocoapods-dykit.gemspec

@@ -18,7 +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_dependency "cocoapods", '~> 1.5.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 end

data/lib/pod/command/fmwk/upload.rb

@@ -27,7 +27,7 @@ module Pod
 
         def self.options
           [
-            ['--workspace', '构建 workspace，若不指定，默认为构建 project'],
+            ['--version=VERSION', '动态库版本号. ' \
             # ['--allow-warnings', 'Lint validates even if warnings are present'],
             # ['--subspec=NAME', 'Lint validates only the given subspec'],
             # ['--no-subspecs', 'Lint skips validation of subspecs'],
@@ -46,7 +46,7 @@ module Pod
         end
 
         def initialize(argv)
-          @workspace           = argv.flag?('workspace')
+          @version           = argv.option('version', nil)
           # @allow_warnings  = argv.flag?('allow-warnings')
           # @clean           = argv.flag?('clean', true)
           # @fail_fast       = argv.flag?('fail-fast', false)
@@ -68,28 +68,24 @@ module Pod
 
         def run
           framework_names.each do |podspec|
-            `rm -rf #{build_path}` unless !Dir.exist?(build_path)
-
-            puts "打真机包..."
-            puts
-
-            output = xcodebuild(podspec)
-            puts output
-            puts 
-
-            puts "打模拟器包..."
-            puts
-            output = xcodebuild(podspec, :iphonesimulator)
-            puts output
-            puts
-            puts "生成合成包..."
-            puts
-            `lipo #{derived_data_path}/#{podspec}/Build/Products/Release-iphoneos/#{podspec}.framework/#{podspec} #{derived_data_path}/#{podspec}/Build/Products/Release-iphonesimulator/#{podspec}.framework/#{podspec} -create -output #{build_path}/#{podspec}`
-            `cp -r #{derived_data_path}/#{podspec}/Build/Products/Release-iphoneos/#{podspec}.framework #{build_path}/`
-            `cp -f #{build_path}/#{podspec} #{build_path}/#{podspec}.framework/`
-            `rm #{build_path}/#{podspec}`
-            puts "成功输出 framework 于 #{build_path}/#{podspec}.framework/"
-            puts
+            version = @version
+            out_path = Dir.pwd + "/#{podspec}_#{version}.zip"
+
+            puts "更新版本号为 $version"
+            sed_cmd = "sed -i '' \"s/<#version#>/$version/g\" $project_name.podspec || exit $?"
+            Executable.capture_command（sed_cmd, nil, :capture => :merge)
+            puts "打包 framework..."
+            zip_cmd = "zip -r #{out_path} #{podspec}"
+            if [ "$?" != 0 ] 
+            then
+              echo "打包失败！"
+              exit 1
+            fi
+            echo "上传到服务器..."
+            scp $out_path ios@ipa.douyuios.com:/usr/local/var/www/static/frameworks/ || exit $?
+            echo "删除临时文件..."
+            rm $out_path
+            echo "done...!"
           end
         end
 

data/lib/pod/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsDylint
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/validator.rb

@@ -14,6 +14,10 @@ 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.
     #
@@ -252,7 +256,12 @@ module Pod
     # @return [String] the SWIFT_VERSION to use for validation.
     #
     def swift_version
-      @swift_version ||= dot_swift_version || '3.0'
+      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
     end
 
     # Set the SWIFT_VERSION that should be used to validate the pod.
@@ -268,11 +277,10 @@ module Pod
       swift_version_path.read.strip
     end
 
-    # @return [String] A string representing the Swift version used during linting
-    #                  or nil, if Swift was not used.
+    # @return [Boolean] Whether any of the pod targets part of this validator use Swift or not.
     #
-    def used_swift_version
-      swift_version if @installer.pod_targets.any?(&:uses_swift?)
+    def uses_swift?
+      @installer.pod_targets.any?(&:uses_swift?)
     end
 
     #-------------------------------------------------------------------------#
@@ -299,6 +307,7 @@ 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
@@ -309,7 +318,7 @@ module Pod
           download_pod
           check_file_patterns
           install_pod
-          validate_dot_swift_version
+          validate_swift_version
           add_app_project_import
           validate_vendored_dynamic_frameworks
           build_pod
@@ -385,14 +394,50 @@ module Pod
       validate_url(spec.documentation_url) if spec.documentation_url
     end
 
-    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`')
+    # 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 = 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.')
+    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.')
       end
     end
 
@@ -430,7 +475,8 @@ module Pod
 
     def create_app_project
       app_project = Xcodeproj::Project.new(validation_dir + 'App.xcodeproj')
-      app_project.new_target(:application, 'App', consumer.platform_name, deployment_target)
+      Pod::Generator::AppTargetHelper.add_app_target(app_project, 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'
@@ -444,7 +490,6 @@ module Pod
         c.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = 'match Development *'
         c.build_settings['CODE_SIGN_IDENTITY'] = 'iPhone Developer'
         c.build_settings['DEVELOPMENT_TEAM'] = 'KW288R5J73'
-        c.build_settings['ENABLE_BITCODE'] = false
       end
       app_project.save
       app_project.recreate_user_schemes
@@ -452,64 +497,17 @@ module Pod
 
     def add_app_project_import
       app_project = Xcodeproj::Project.open(validation_dir + 'App.xcodeproj')
-      pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
-
-      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') } }
+      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') } }
       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.
     #
@@ -518,12 +516,21 @@ module Pod
          perform_post_install_actions).each { |m| @installer.send(m) }
 
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
-      @installer.aggregate_targets.each do |target|
+      configure_pod_targets(@installer.aggregate_targets, deployment_target)
+      @installer.pods_project.save
+    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'] = swift_version if pod_target.uses_swift?
+          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|
+                build_configuration.build_settings['SWIFT_VERSION'] = swift_version
+              end
+            end
           end
         end
         if target.pod_targets.any?(&:uses_swift?) && consumer.platform_name == :ios &&
@@ -532,7 +539,20 @@ 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
+      # 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
@@ -551,46 +571,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
@@ -853,8 +876,8 @@ module Pod
       when :osx, :macos
         command += %w(CODE_SIGN_IDENTITY=)
       when :ios
-        #command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
-        #command += Fourflusher::SimControl.new.destination(:oldest, 'iOS', deployment_target)
+        # command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
+        # command += Fourflusher::SimControl.new.destination(:oldest, 'iOS', deployment_target)
         command += %w(-sdk iphoneos -destination generic/platform=iOS)
       when :watchos
         command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
@@ -864,25 +887,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,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dykit
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - 黄露洋
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-04-20 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
+        version: 1.5.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
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,4 +105,3 @@ summary: Validates the Pod using the files in the working directory without simu
 test_files:
 - spec/command/dylint_spec.rb
 - spec/spec_helper.rb
-has_rdoc: