cocoapods-util 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a288d0cd86146de6d734f9a0f292db9bdda764e4e95b21b9b8ed0af38544a93
-  data.tar.gz: a07465a12f9d5c800d9c6acb25c46394e59916349714d092140ccf874019aadc
+  metadata.gz: c64106c89882c33e0febe8aa3623478f1b5c9a3325c7efdb6a10a4a2a998ab91
+  data.tar.gz: ec9b2691eecd6fba14b374f0fd8b9a302595b958d314d85c8b065e85896b5f35
 SHA512:
-  metadata.gz: ba53816980be856b40546b803f22d5d1bf081efd1d42e587095e6f20402d5bca4c4f9342e8fe8df37fbcd3500afdd1094cbb37e90884eb467ed0fb3ad2d9360e
-  data.tar.gz: abf3a469e43499b1943ab01caf1620cd4e4067132936f9c5a6db98413d1e8eaf76a467e9df094692f0f6e98f602533509427d5e03d46d9fb70e9d3cc782565db
+  metadata.gz: e21f0d9d26c4c4ae210f25f462f706e57a0867536316b4ec81321c9e422ce4469c3df09a3ee2637516f49c27026bbd83f428268efe1999204c83f0d4ec23c8b0
+  data.tar.gz: '0818fdf44b6dc9cc552ba5464de71aa95e004190cea4a21b827d049b16641a82fd103feda06421c2d897e59faa0d303b8472205b7d1f08d8a8ea3bf369811730'

data/README.md

@@ -1,20 +1,24 @@
-# cocoapods-util
+### **cocoapods-util是一个pod插件集合，集成了一些ios开发过程中提效的一些插件。**
 
-cocoapods-util是一个pod插件集合，支持package、生成xcframework、linksource、repo push等功能。
-
-## Installation
+# Installation
 
+```
 $ gem install cocoapods-util
+```
 
-## Usage
+# Usage
 
+```
 $ pod util --help
+```
 
-## 功能
+![fde10974894037fe52660a72e4057929.png](./assets/fde10974894037fe52660a72e4057929.png)
 
-### package
+# 功能
 
-$ pod util package --help
+## package
+
+### 介绍
 
 通过podspec文件生成library、framework、xcframework。
 
@@ -23,32 +27,145 @@ $ pod util package --help
 - [x] 支持排除模拟器
 - [x] 支持多平台（ios、osx、watchos、tvos）
 - [x] 支持自定义设置工程的build settings（如：排除ios模拟器64位架构、设置支持的架构等）
-    
 
-###  xcframework
+```
+$ pod util package --help
+```
+
+![74dd1a40ffa3af3744fdf79384fdebdb.png](./assets/74dd1a40ffa3af3744fdf79384fdebdb.png)
+
+### 示例
+
+#### 生成xcfrmework/framework/library
+
+生成AFNetworking组件的xcframework 进入AFNetworking源码的根目录下，执行下面的命令
+
+```
+$ pod util package AFNetworking.podspec --force --local --xcframework
+
+$ pod util package AFNetworking.podspec --force --local --framework
+
+$ pod util package AFNetworking.podspec --force --local --library
+```
+
+![d5410dda08a99ee977dd6ca8af98ef74.png](./assets/d5410dda08a99ee977dd6ca8af98ef74.png)
+
+#### 排除模拟器
+
+如果你不需要编译模拟器架构，可以添加--exclude-sim
+
+```
+$ pod util package AFNetworking.podspec --force --local --xcframework --exclude-sim
+```
+
+#### 平台设置
+
+如果你只需要编译ios架构下的xcframework，可以添加--platforms=ios
+
+```
+$ pod util package AFNetworking.podspec --force --local --xcframework --exclude-sim --platforms=ios
+```
+
+#### build settings配置
+
+如果你想要做一些build settings特殊配置，可以添加 --build-settings，如设置编译选项排除模拟器arm64架构。理论上来讲，可以像直接操作工程一样，灵活的配置build settings
+
+- 如设置排除arm64位架构
+
+```
+$ --build-settings='{"EXCLUDED_ARCHS[sdk=iphonesimulator*]":"arm64"}'
+```
+
+- 设置编译swift生成swiftinterface文件
+
+```
+$ -build-settings='{"BUILD_LIBRARY_FOR_DISTRIBUTION":"YES"}'
+```
 
-$ pod util xcframework --help
+- 或者你想设置多个编译选项
+
+```
+$ -build-settings='{"EXCLUDED_ARCHS[sdk=iphonesimulator*]":"arm64","BUILD_LIBRARY_FOR_DISTRIBUTION":"YES","VALID_ARCHS":"arm64"}'
+```
+
+#### 自定义dependencies
+
+如果你依赖的组件并没有发布到私有仓库，你只是分支依赖！ 如果你依赖的组件和官方源有冲突，你改需要指定source源！ 这时候你可以通过配置`--dependency-config={}`选项指定仓库分支、tag或指定source源。
+
+```
+$ --dependency-config='{"PodA":{"git":"xxx","branch":"xxx"},"PodB":{"source":"xxx"}}'
+```
+
+## xcframework
+
+### 介绍
 
 可以把现有的framework生成xcframework。
 
 - 内部可以判断是某个平台的framework（如ios、osx、watchos），直接在framework同级目录生成xcframework。
 
-### linksource
+![132d6cec7bc64488deca731d37438cdd.png](./assets/132d6cec7bc64488deca731d37438cdd.png)
+
+### 示例
+
+生成Alamofire的framework
+
+```
+$ pod util xcframework Alamofire.framework --force 
+```
+
+![e32ea9af2dfae1e3d6b03f0278c33057.png](./assets/e32ea9af2dfae1e3d6b03f0278c33057.png)
+
+![23332974a4941bae97010afb4b4d4c1c.png](./assets/23332974a4941bae97010afb4b4d4c1c.png)
+
+## linksource
 
+源码二进制链接功能。
+
+```
 $ pod util linksource --help
+```
+
+![b605570c681e5d7877f08458cfd1dbc7.png](./assets/b605570c681e5d7877f08458cfd1dbc7.png)
+
+## repo push
 
-源码二进制链接功能
+推送私有pods仓库的命令。
 
-### repo push
+- 可以通过添加--skip-validate的选项跳过验证步骤。
 
+```
 $ pod util repo push --help
+```
 
-推送私有pods仓库的命令
+![2947331da6ee0c269dbd6ea073d15d4e.png](./assets/2947331da6ee0c269dbd6ea073d15d4e.png)
 
-- 可以通过添加--skip-validate的选项跳过验证步骤。
+该命令是一个提效命令，在推送自己私有仓库的时候可以通过设置--skip-validate选项跳过验证直接推送到私有仓库。
+
+```
+$ pod util repo push [yourSpecs] [xxx.podspec] --skip-validate
+```
 
-### install list
+当然你也可以不使用--skip-validate，参数设置和`pod repo push`命令一致
 
+## install list
+
+列出安装的pod库及相关依赖信息。
+
+- 该命令同样为提效命令，可以省去开发者自己去阅读Podfile.lock文件的时间，直接友好的提示开发者
+- 可以清晰的看出引用的组件个数、组件依赖、组件分支tag信息、仓库地址等有效信息
+
+```
 $ pod util install list --help
+```
+
+![f839eae390ea7871a5afecec093dd39c.png](./assets/f839eae390ea7871a5afecec093dd39c.png)
+
+可以在Podfile.lock的同级目录下执行或指定Podfile.lock的路径
+
+```
+$ pod util install list --showmore
+$ pod util install list ~/Desktop/xxxx/ProjectA/Podfile.lock --showmore
+```
 
-列出安装的pod库
+![3be13cd62a8450a7c8b2a3fa728984c6.png](./assets/3be13cd62a8450a7c8b2a3fa728984c6.png)

data/lib/cocoapods-util/command/cocoapods-extend/extend.rb

@@ -1,3 +1,4 @@
 require_relative 'repo'
 require_relative 'install.rb'
+require_relative 'unique'
 # require File.expand_path('../install.rb', __FILE__)

data/lib/cocoapods-util/command/cocoapods-extend/install/list.rb

@@ -1,5 +1,3 @@
-require 'cocoapods/config'
-
 module Pod
     class Command
       class Util < Command
@@ -8,7 +6,7 @@ module Pod
             self.summary = '列出pod install安装的组件信息，Podfile.lock不传则在当前目录查找'
             self.command = 'list'
             self.arguments = [
-              CLAide::Argument.new('Podfile.lock', false)
+              CLAide::Argument.new('Podfile.lock', true)
             ]
             def self.options
               [
@@ -105,7 +103,7 @@ module Pod
               parents.uniq!
               UI.puts "   - SUBSPEC: ".yellow "#{subspecs.join('、')}".green unless subspecs.empty?
               UI.puts "   - DEPENDENCIES: ".yellow "#{dependencies.join('、')}".green unless dependencies.empty?
-              UI.puts "   - PARENTS: ".yellow "#{parents.join('、')}".green unless parents.empty?
+              UI.puts "   - DEPENDENTS: ".yellow "#{parents.join('、')}".green unless parents.empty?
             end
 
             def pod_tags_info

data/lib/cocoapods-util/command/cocoapods-extend/install.rb

@@ -7,7 +7,7 @@ module Pod
             self.description = <<-DESC
             使用`pod util install list`查看pod安装的组件
             DESC
-            self.command == 'install'
+            self.command = 'install'
             self.abstract_command = true
       end
     end

data/lib/cocoapods-util/command/cocoapods-extend/repo.rb

@@ -7,7 +7,7 @@ module Pod
             self.description = <<-DESC
             操作cocoapods的私有repo。如`pod util repo push`推送到私有仓库（可以设置参数跳过验证）
             DESC
-            self.command == 'repo'
+            self.command = 'repo'
             self.abstract_command = true
       end
     end

data/lib/cocoapods-util/command/cocoapods-extend/unique.rb

@@ -0,0 +1,58 @@
+module Pod
+    class Command
+        class Util < Command
+            class Unique < Util
+                self.summary = '对Xcode的工程文件做去重处理。'
+                self.description = <<-DESC
+                日常开发过程中难免会出现一些工程文件的冲突，在解决工程文件的冲突时，如果处理不好容易造成文件在编译选项中重复配置的情况。使用该命令可去除重复的编译文件
+                DESC
+                self.command = 'uniq'
+                self.arguments = [
+                    CLAide::Argument.new('project.xcodeproj', true)
+                ]
+                def self.options
+                    [
+                        ['--targetname=TargetName,TargetName', '指定需要操作的Target'],
+                        ['--uniq-compile-sources', '对Build Phase中的Compile Sources中文件去重'],
+                        ['--uniq-bundle-resources', '对Build Phase中Copy Bundle Resources中资源去重']
+                    ]
+                end
+                def initialize(argv)
+                    @proj_path = argv.shift_argument
+                    @target_names = argv.option('targetname', '').split(',')
+                    @uniq_compile_sources = argv.flag?('uniq-compile-sources', true)
+                    @uniq_bundle_resources = argv.flag?('uniq-bundle-resources', true)
+                    super
+                end
+      
+                def validate!
+                    super
+                  help! 'An project.xcodeproj is required.' unless @proj_path
+                end
+      
+                def run
+                    require 'xcodeproj'
+                    
+                    project = Xcodeproj::Project.open(@proj_path)
+
+                    # uniques array
+                    uniq_phases = []
+                    uniq_phases |= ['SourcesBuildPhase'] if @uniq_compile_sources
+                    uniq_phases |= ['ResourcesBuildPhase'] if @uniq_bundle_resources
+
+                    project.targets.each do |target|
+                        next if @target_names.count > 0 && !@target_names.include?(target.name)
+                        
+                        target.build_phases.each do |phase|
+                            phase.files.uniq! if uniq_phases.include?(phase.to_s)
+                        end
+                    end
+
+                    project.save
+
+                    puts 'xcodeproj files unique success'
+                end
+            end
+        end
+    end
+end

data/lib/cocoapods-util/command/package/helper/framework.rb

@@ -8,20 +8,21 @@ module Framework
     attr_reader :fwk_path
 
     def delete_resources
-      Pathname.new(@resources_path).rmtree
-      (Pathname.new(@fwk_path) + Pathname.new('Resources')).delete
+      Pathname.new(@resources_path).rmtree @contains_resources
+      (Pathname.new(@fwk_path) + Pathname.new('Resources')).delete @contains_resources
     end
 
-    def initialize(name, platform)
+    def initialize(name, platform, contains_resources=false)
       @name = name
       @platform = platform
+      @contains_resources = contains_resources
     end
 
     def make
       make_root
       make_framework
       make_headers
-      make_resources
+      make_resources if @contains_resources
       make_current_version
     end
 
@@ -31,7 +32,7 @@ module Framework
       current_version_path = @versions_path + Pathname.new('../Current')
       `ln -sf A #{current_version_path}`
       `ln -sf Versions/Current/Headers #{@fwk_path}/`
-      `ln -sf Versions/Current/Resources #{@fwk_path}/`
+      `ln -sf Versions/Current/Resources #{@fwk_path}/` if @contains_resources
       `ln -sf Versions/Current/#{@name} #{@fwk_path}/`
     end
 

data/lib/cocoapods-util/command/package/helper/framework_builder.rb

@@ -13,7 +13,7 @@ module Pod
               if @framework_contains_resources
                 framework_copy_resources(os)
               else
-                framework_copy_resources(os) if os = 'build'
+                framework_copy_resources(os) if os == 'build'
               end
             end
             frameworks
@@ -40,7 +40,7 @@ module Pod
         end
 
         def create_framework(os_name = '')
-            @fwk = Framework::Tree.new(@spec.name, "#{@platform.name.to_s}/#{os_name}")
+            @fwk = Framework::Tree.new(@spec.name, "#{@platform.name.to_s}/#{os_name}", @framework_contains_resources)
             @fwk.make
             @fwk
         end
@@ -126,9 +126,6 @@ SWIFT_MAP
                     `cp -rp #{resources.join(' ')} #{resources_path}`
                   end
                 end
-        
-                # delete framework resources
-                @fwk.delete_resources if @fwk
                 return
             end
     

data/lib/cocoapods-util/command/package/helper/pod_utils.rb

@@ -29,8 +29,8 @@ module Pod
             default_build_settings = Hash.new
             default_build_settings["CLANG_MODULES_AUTOLINK"] = "NO"
             default_build_settings["GCC_GENERATE_DEBUGGING_SYMBOLS"] = "YES" # 生成Debug编译信息
-            default_build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" unless @xcframework # 非xcframework排除ios simulator 64位架构
-            default_build_settings["EXCLUDED_ARCHS[sdk=appletvsimulator*]"] = "arm64" unless @xcframework # 非xcframework排除tvos simulator 64位架构
+            default_build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" unless @xcframework && self.match_pod_version?('~> 1.11') # 非xcframework排除ios simulator 64位架构
+            default_build_settings["EXCLUDED_ARCHS[sdk=appletvsimulator*]"] = "arm64" unless @xcframework && self.match_pod_version?('~> 1.11') # 非xcframework排除tvos simulator 64位架构
             default_build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES" # 编译swift生成swiftinterface文件
             
             # merge user setting
@@ -120,6 +120,10 @@ module Pod
 
           Specification.from_file(@path)
         end
+
+        def match_pod_version?(*version)
+          Gem::Dependency.new('', *version).match?('', Pod::VERSION)
+        end
       end
     end
   end

data/lib/cocoapods-util/command/util.rb

@@ -10,13 +10,26 @@ module Pod
       self.description = <<-DESC
       一个CocoaPods常用插件功能的集合，解决日常开发中遇到的一些问题。
       DESC
-      self.command == 'util'
+      self.command = 'util'
       self.abstract_command = true
+
+      def self.options
+        [
+          ['--version', 'Show cocoapods-util version'],
+        ].concat(super)
+      end
+
       def initialize(argv)
+        @version = argv.flag?('version', false)
         super
       end
 
       def validate!
+        if @version
+          require 'cocoapods-util/gem_version.rb'
+          puts "#{CocoapodsUtil::VERSION}"
+          return
+        end
         super
       end
 
@@ -24,4 +37,4 @@ module Pod
       end
     end
   end
-end
+end

data/lib/cocoapods-util/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsUtil
-  VERSION = "0.0.12"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-util
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - guojiashuang
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -65,13 +65,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
-- Rakefile
-- cocoapods-util.gemspec
 - lib/cocoapods-util.rb
 - lib/cocoapods-util/CocoapodsUtilHook.rb
 - lib/cocoapods-util/command.rb
@@ -81,6 +76,7 @@ files:
 - lib/cocoapods-util/command/cocoapods-extend/repo.rb
 - lib/cocoapods-util/command/cocoapods-extend/repo/push.rb
 - lib/cocoapods-util/command/cocoapods-extend/repo/push_helper.rb
+- lib/cocoapods-util/command/cocoapods-extend/unique.rb
 - lib/cocoapods-util/command/libsource/source.rb
 - lib/cocoapods-util/command/libsource/source_linker.rb
 - lib/cocoapods-util/command/package/helper/builder.rb
@@ -96,13 +92,11 @@ files:
 - lib/cocoapods-util/gem_version.rb
 - lib/cocoapods-util/hooks/installer.rb
 - lib/cocoapods_plugin.rb
-- spec/command/util_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/CaryGo/cocoapods-util
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -118,9 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: 一个常用插件功能的集合，致力于解决日常开发中遇到的一些问题。
-test_files:
-- spec/command/util_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-.DS_Store
-pkg
-.idea/
-.vscode/

data/Gemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in cocoapods-util.gemspec
-gemspec
-
-group :development do
-  gem 'cocoapods'
-
-  gem 'mocha'
-  gem 'bacon'
-  gem 'mocha-on-bacon'
-  gem 'prettybacon'
-end

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2022 guojiashuang <guojiashuang@58.com>
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,13 +0,0 @@
-require 'bundler/gem_tasks'
-
-def specs(dir)
-  FileList["spec/#{dir}/*_spec.rb"].shuffle.join(' ')
-end
-
-desc 'Runs all the specs'
-task :specs do
-  sh "bundle exec bacon #{specs('**')}"
-end
-
-task :default => :specs
-

data/cocoapods-util.gemspec

@@ -1,25 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'cocoapods-util/gem_version.rb'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'cocoapods-util'
-  spec.version       = CocoapodsUtil::VERSION
-  spec.authors       = ['guojiashuang']
-  spec.email         = ['guojiashuang@live.com']
-  spec.description   = %q{cocoapods-util是一个cocoapods插件，解决日常ios开发中遇到的一些问题。支持打包(编译)静态库、framework生成xcframework、二进制link源码、推送私有库跳过验证等功能。}
-  spec.summary       = %q{一个常用插件功能的集合，致力于解决日常开发中遇到的一些问题。}
-  spec.homepage      = 'https://github.com/CaryGo/cocoapods-util'
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.add_dependency "cocoapods", ">= 1.5.0", "< 2.0"
-
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-end

data/spec/command/util_spec.rb

@@ -1,12 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
-module Pod
-  describe Command::Util do
-    describe 'CLAide' do
-      it 'registers it self' do
-        Command.parse(%w{ util }).should.be.instance_of Command::Util
-      end
-    end
-  end
-end
-

data/spec/spec_helper.rb

@@ -1,50 +0,0 @@
-require 'pathname'
-ROOT = Pathname.new(File.expand_path('../../', __FILE__))
-$:.unshift((ROOT + 'lib').to_s)
-$:.unshift((ROOT + 'spec').to_s)
-
-require 'bundler/setup'
-require 'bacon'
-require 'mocha-on-bacon'
-require 'pretty_bacon'
-require 'pathname'
-require 'cocoapods'
-
-Mocha::Configuration.prevent(:stubbing_non_existent_method)
-
-require 'cocoapods_plugin'
-
-#-----------------------------------------------------------------------------#
-
-module Pod
-
-  # Disable the wrapping so the output is deterministic in the tests.
-  #
-  UI.disable_wrap = true
-
-  # Redirects the messages to an internal store.
-  #
-  module UI
-    @output = ''
-    @warnings = ''
-
-    class << self
-      attr_accessor :output
-      attr_accessor :warnings
-
-      def puts(message = '')
-        @output << "#{message}\n"
-      end
-
-      def warn(message = '', actions = [])
-        @warnings << "#{message}\n"
-      end
-
-      def print(message)
-        @output << message
-      end
-    end
-  end
-end
-
-#-----------------------------------------------------------------------------#