cocoapods-packager-ext 0.0.10 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b528b82748243fe242fdd5de031d79a94f501900c45c31fc27a055600d33db5
-  data.tar.gz: 06e6ce8b5a4563a51a470cce8164a5c03845996b39b5fc624875afdb1942770d
+  metadata.gz: 3fe4f327fcf1e83c2c98b3e7536e32d0a7a282d35d2a01785e976ec5d42ea490
+  data.tar.gz: 8e511d747b8cd997dad144f8bdbc07fb291798524022db110c63a23eb0a0d2d2
 SHA512:
-  metadata.gz: f9dc5b6c3327b3ad93d2424f82f7dd25e26de28f34dfc6a374fa0608153f54c7a7c30a2c7f210aa784ae9f2472c6c5a5ad9122cbe3f7b29a655681bd7933c57d
-  data.tar.gz: 3344d225c8bb06e167c79a312a65f9e9a95f8a35abc8e735921e6dfb22325f312c2243142de30e3235ea0fd956a102170e86319c348b36934b583383e748b511
+  metadata.gz: f3d309b76e55409eb00290a3a8417f748f78ebc381d3ad4276d262d602b87391381765e60e469caf0f4922de3846f0de8181f3d130cde37fa2da899f72024ffd
+  data.tar.gz: '05863f3099b61ba477b227eca7734f52fcb2deac2cd549f55042cdcd6b51ec9d9712df4acee2d572981ef768b3b0bbc06959f0ae2185d8596931b8ff7f73ed37'

data/cocoapods-packager-ext.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'cocoapods-packager'
+  spec.add_runtime_dependency(%q<cocoapods-packager>.freeze,["1.5.1"])
+  
 end

data/lib/cocoapods-packager-ext/command/install_ext.rb

@@ -6,6 +6,7 @@ module Pod
             if @dry_deps
                 prepare
                 resolve_dependencies
+                exit 0
             else
                 install_t!
             end
@@ -13,59 +14,82 @@ module Pod
 
     end
 
-  class Command
+    class Command
 
-    # This is an example of a cocoapods plugin adding a top-level subcommand
-    # to the 'pod' command.
-    #
-    # You can also create subcommands of existing or new commands. Say you
-    # wanted to add a subcommand to `list` to show newly deprecated pods,
-    # (e.g. `pod list deprecated`), there are a few things that would need
-    # to change.
-    #
-    # - move this file to `lib/pod/command/list/deprecated.rb` and update
-    #   the class to exist in the the Pod::Command::List namespace
-    # - change this class to extend from `List` instead of `Command`. This
-    #   tells the plugin system that it is a subcommand of `list`.
-    # - edit `lib/cocoapods_plugins.rb` to require this file
-    #
-    # @todo Create a PR to add your plugin to CocoaPods/cocoapods.org
-    #       in the `plugins.json` file, once your plugin is released.
-    #
-    class Install
-        class << self
-            alias options_t options
+        # This is an example of a cocoapods plugin adding a top-level subcommand
+        # to the 'pod' command.
+        #
+        # You can also create subcommands of existing or new commands. Say you
+        # wanted to add a subcommand to `list` to show newly deprecated pods,
+        # (e.g. `pod list deprecated`), there are a few things that would need
+        # to change.
+        #
+        # - move this file to `lib/pod/command/list/deprecated.rb` and update
+        #   the class to exist in the the Pod::Command::List namespace
+        # - change this class to extend from `List` instead of `Command`. This
+        #   tells the plugin system that it is a subcommand of `list`.
+        # - edit `lib/cocoapods_plugins.rb` to require this file
+        #
+        # @todo Create a PR to add your plugin to CocoaPods/cocoapods.org
+        #       in the `plugins.json` file, once your plugin is released.
+        #
+        module ClassMethods
             def options
-              o = options_t
-              o.push(['--dry-deps','only test depend'])
-              o.concat(super)
+                options = [
+                  ['--dry-deps','only test depend'],
+                ]
+                options.concat(super)
             end
-
         end
+        class Install
 
-        def initialize(argv)
-            super
-            @deployment = argv.flag?('deployment', false)
-            @clean_install = argv.flag?('clean-install', false)
-            @dry_deps = argv.flag?('dry-deps',false)
-        end
+            def self.options
+                [
+                  ['--repo-update', 'Force running `pod repo update` before install'],
+                  ['--deployment', 'Disallow any changes to the Podfile or the Podfile.lock during installation'],
+                  ['--clean-install', 'Ignore the contents of the project cache and force a full pod installation. This only applies to projects that have enabled incremental installation.'],
+                  ['--dry-deps','only test depend'],
+                ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
+            end
 
-        alias run_t run
-        def run
-            if @dry_deps
-                verify_podfile_exists!
-                installer = installer_for_config
-                installer.repo_update = repo_update?(:default => false)
-                installer.update = false
-                installer.deployment = @deployment
-                installer.clean_install = @clean_install
-                installer.dry_deps = @dry_deps
-                installer.install!
-            else
-                run_t
+            # class << self
+            #     options_t = instance_method(:options)
+            #     # alias options_t options
+            #     define_method(:options) do
+            #     item = options_t.bind(self).call()
+            #
+            #         [
+            #           ['--dry-deps','only test depend'],
+            #         ].concat(item)
+            #     end
+            # end
+            # class << self
+            #     alias options_t options
+            #     def options
+            #         o = options_t
+            #         o.push(['--dry-deps','only test depend'])
+            #         o.concat(super)
+            #     end
+            #
+            # end
+
+            def initialize(argv)
+                super
+                @deployment = argv.flag?('deployment', false)
+                @clean_install = argv.flag?('clean-install', false)
+                @dry_deps = argv.flag?('dry-deps',false)
+            end
+
+            alias installer_for_config_t installer_for_config
+            def installer_for_config
+                item = installer_for_config_t
+                if @dry_deps
+                    item.dry_deps = @dry_deps
+                end
+                item
             end
-        end
 
+
+        end
     end
-  end
 end

data/lib/cocoapods-packager-ext/command/package_ext.rb

@@ -1,3 +1,5 @@
+require 'cocoapods-packager-ext/ext/downloader/lnpath'
+require 'cocoapods-packager-ext/ext/downloader_ext'
 module Pod
   class Command
     # This is an example of a cocoapods plugin adding a top-level subcommand
@@ -19,14 +21,22 @@ module Pod
     #
     class Package
         class << self
-            alias options_t options
-            def options
-              o = options_t
-              o.push(['--all-deps','add all-depends'])
-              o.push(['--archs','select archs'])
-              o.push(['--black-deps','select exclude deps'])
-              o.concat(super)
+
+            begin
+                alias options_t options
+                def options
+                    o = options_t
+                    o.push(['--all-deps','embedded all-depends'])
+                    o.push(['--archs','select archs'])
+                    o.push(['--black-deps','select exclude deps'])
+                    o.push(['--podfile','select deps version from podfile'])
+                    o.push(['--platform','select platform'])
+                    o.concat(super)
+                end
+            rescue
+                return 
             end
+           
 
         end
 
@@ -35,13 +45,40 @@ module Pod
             @all_deps = argv.flag?('all-deps',false)
             @select_archs = argv.option('archs','').split(',')
             @black_deps = argv.option('black-deps','').split(',')
+            @podfile = argv.option('podfile','')
+            @platform = argv.option('platform','')
             initialize_t argv
         end
 
+        alias build_package_t build_package
+        def build_package
+            if @platform == ''
+                build_package_t
+            else
+                builder = SpecBuilder.new(@spec, @source, @embedded, @dynamic)
+                newspec = builder.spec_metadata
+                
+                @spec.available_platforms.each do |platform|
+                    if @platform.include?(platform.name.to_s)
+                        UI.puts 'build package platform:'+platform.name.to_s
+                        build_in_sandbox(platform)
+                        newspec += builder.spec_platform(platform)
+                    else
+                        UI.puts 'jump build platforms:'+platform.to_s
+                    end
+                end
+
+                newspec += builder.spec_close
+                File.open(@spec.name + '.podspec', 'w') { |file| file.write(newspec) }
+            end
+
+
+
+        end
 
         alias perform_build_t perform_build
-        def perform_build(platform, static_sandbox, dynamic_sandbox)
-            if @all_deps
+        def perform_build(platform, static_sandbox, dynamic_sandbox,static_installer)
+            if @all_deps || @select_archs.length > 0
                 static_sandbox_root = config.sandbox_root.to_s
 
                 if @dynamic
@@ -50,28 +87,30 @@ module Pod
                 end
 
                 builder = Pod::Builder.new(
-                    @source_dir,
-                    static_sandbox_root,
-                    dynamic_sandbox_root,
-                    static_sandbox.public_headers.root,
-                    @spec,
-                    @embedded,
-                    @mangle,
-                    @dynamic,
-                    @config,
-                    @bundle_identifier,
-                    @exclude_deps,
-                    @all_deps,
-                    @black_deps,
-                    @select_archs
+                  platform,
+                  static_installer,
+                  @source_dir,
+                  static_sandbox_root,
+                  dynamic_sandbox_root,
+                  static_sandbox.public_headers.root,
+                  @spec,
+                  @embedded,
+                  @mangle,
+                  @dynamic,
+                  @config,
+                  @bundle_identifier,
+                  @exclude_deps,
+                  @all_deps,
+                  @black_deps,
+                  @select_archs
                 )
 
-                builder.build(platform, @library)
+                builder.build(@package_type)
 
                 return unless @embedded
                 builder.link_embedded_resources
             else
-                perform_build_t(platform,static_sandbox,dynamic_sandbox)
+                perform_build_t(platform,static_sandbox,dynamic_sandbox,static_installer)
             end
         end
 

data/lib/cocoapods-packager-ext/ext/builder.rb

@@ -2,7 +2,7 @@ require "fileutils"
 
 module Pod
   class Builder
-    
+    #移动资源文件和静态库文件到build目录
     def deal_target(path)
       for item in @target_type_ext
         if File.extname(path) == item
@@ -15,12 +15,16 @@ module Pod
           if isBlack
             return
           end
+          begin
           if File.directory? path
             FileUtils.copy_entry(path,"#{@target_dir_ext_ext}/#{File.basename(path)}", false,false, true)
           else
             FileUtils.cp(path,"#{@target_dir_ext_ext}/#{File.basename(path)}")
-          end 
-          return 
+          end
+          rescue Exception => e
+            puts e
+          end
+            return
         end
       end
       if File.directory? path
@@ -43,37 +47,12 @@ module Pod
       end
     end
 
-    alias build_library_t build_library
-    def build_library(platform, defines, output)
-      deal_target(@static_sandbox_root)
-
-
-      build_library_t platform,defines,output
-    end
-
-    alias ios_build_options_t ios_build_options
-    def ios_build_options
-      if @select_archs.size != 0
-        return "ARCHS=\'#{@select_archs.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
-      else
-        return "ARCHS=\'x86_64 i386 arm64 armv7\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
-      end
-    end
 
-    alias build_sim_libraries_t build_sim_libraries
-    def build_sim_libraries(platform, defines)
-        if @select_archs.size != 0 && !@select_archs.include?('i386') && !@select_archs.include?('x86_64')
-          return 
-        else
-          UI.puts 'start build sim'
-          build_sim_libraries_t platform,defines
-        end
-    end
-
-    alias build_static_lib_for_ios_t build_static_lib_for_ios
-    def build_static_lib_for_ios(static_libs, _defines, output)
+    alias build_static_library_for_ios_t build_static_library_for_ios
+    def build_library(output)
+      deal_target(@static_sandbox_root)
       if @all_deps
-        return if static_libs.count == 0
+        static_libs = static_libs_in_sandbox('build')
         sim_libs = static_libs_in_sandbox('build-sim')
         for item in @black_deps
           static_libs.delete_if do |obj|
@@ -86,20 +65,46 @@ module Pod
         UI.puts "links statics:#{static_libs.join(' ')}, sim_libs:#{sim_libs.join(' ')}"
         `xcrun -r libtool -no_warning_for_no_symbols -static -o #{output} #{static_libs.join(' ')} #{sim_libs.join(' ')}`
       else
-        build_static_lib_for_ios static_libs,_defines,output
+        build_static_library_for_ios output
+      end
+    end
+
+    # alias ios_build_options_t ios_build_options
+    # def ios_build_options
+    #   if @select_archs.size != 0
+    #     return "ARCHS=\'#{@select_archs.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
+    #   else
+    #     return ios_build_options_t
+    #   end
+    # end
+    alias ios_architectures_t ios_architectures
+    def ios_architectures
+      if @select_archs.size != 0
+        return @select_archs
+      else
+        return ios_architectures_t
       end
-      
+    end
+
+    alias build_sim_libraries_t build_sim_libraries
+    def build_sim_libraries(defines)
+        if @select_archs.size != 0 && !@select_archs.include?('i386') && !@select_archs.include?('x86_64')
+          return 
+        else
+          UI.puts 'start build sim'
+          build_sim_libraries_t defines
+        end
     end
 
     alias initialize_t initialize
-    def initialize(source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps, all_deps,black_deps,select_archs)
+    def initialize(platform, static_installer, source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps,all_deps= false ,black_deps=[],select_archs=[])
       @all_deps = all_deps
       @black_deps = black_deps
       @select_archs = select_archs
       @target_type_ext = ['.a','.bundle']
       @target_dir_ext_ext = "#{static_sandbox_root}/build"
       @black_list_ext = ["#{static_sandbox_root}/build","#{static_sandbox_root}/build-sim"]
-      initialize_t(source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps)
+      initialize_t(platform, static_installer,source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps)
     end 
   end
 end

data/lib/cocoapods-packager-ext/ext/downloader/lnpath.rb

@@ -0,0 +1,19 @@
+require 'cocoapods-downloader/remote_file'
+
+module Pod
+    module Downloader
+        class LocalPath < RemoteFile
+            DEFAULT_PORT = 22
+
+            private
+
+            executable :ln
+
+            def download_file(full_filename)
+
+                ln! "-s",url, full_filename
+            end
+
+        end
+    end
+end

data/lib/cocoapods-packager-ext/ext/downloader_ext.rb

@@ -0,0 +1,38 @@
+module Pod
+    module Downloader
+        autoload :LocalPath,'cocoapods-packager-ext/ext/downloader/lnpath'
+        class << self
+            alias downloader_class_by_key_t downloader_class_by_key
+            def downloader_class_by_key
+                keys = downloader_class_by_key_t
+                keys[:lnpath] = LocalPath
+                return keys
+            end
+        end
+        class RemoteFile
+            executable :ln
+
+            alias filename_with_type_t filename_with_type
+            def filename_with_type(type = :zip)
+                if not type
+                    "file"
+                else
+                    filename_with_type_t type
+                end
+            end
+            alias extract_with_type_t extract_with_type
+            def extract_with_type(full_filename, type = :zip)
+                if not type
+                    unpack_from = url
+                    unpack_to = @target_path
+                    FileUtils.rm_rf(unpack_to) if File.exist?(unpack_to)
+                    FileUtils.rm_rf(unpack_to) if Dir.exist?(unpack_to)
+                    ln! '-s',unpack_from,unpack_to
+                else
+                    extract_with_type_t full_filename,type
+                end
+
+            end
+        end
+    end
+end

data/lib/cocoapods-packager-ext/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPackagerExt
-  VERSION = "0.0.10"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.21
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: cocoapods-packager
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.5.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 description: A short description of cocoapods-packager-ext.
 email:
 - kyle.zhou@qq.com
@@ -70,6 +70,8 @@ files:
 - lib/cocoapods-packager-ext/command/install_ext.rb
 - lib/cocoapods-packager-ext/command/package_ext.rb
 - lib/cocoapods-packager-ext/ext/builder.rb
+- lib/cocoapods-packager-ext/ext/downloader/lnpath.rb
+- lib/cocoapods-packager-ext/ext/downloader_ext.rb
 - lib/cocoapods-packager-ext/gem_version.rb
 - lib/cocoapods_plugin.rb
 - spec/command/ext_spec.rb