lg_pod_plugin 1.1.5.9 → 1.1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebaf5437bed598ffa64a8ed94863d10c05c0cfcb848e9edbf726ad212662878b
-  data.tar.gz: 1e10a6ad2ec5b02e8771a2580db0374d635998320aaa8739bb4bebcf80eba0ba
+  metadata.gz: 8ec02e7287d7905d93048a8620d22946077d9b60078df1531986db93559cd6d4
+  data.tar.gz: a13a7706ad353e97a931fcd96581f20d70e2c6aaef4d63c5dbf3eb1c7fa698a1
 SHA512:
-  metadata.gz: 629fa53e19b009413466cd44b9c6ecf28bffcfd7e500524cdf449d4ef6ef0f298a925f7eb0390b734d0937f57712f7cc078227afbe60950d39a923f845b4c026
-  data.tar.gz: 7772b927826ef6fe0476db3933e9863b27a98aced13853b58583d3141cdf89c09ff5655e2da90e2258f82e1697155aa2a6c0d24d1bb1729b288df6b6b93578fe
+  metadata.gz: b930234998ecfaa0376344d2e4c9efd74cb4be730bbd6e0379fad087718355e24805babe26443019a791df623fe1938c6e8d71def6480ec2b85f1505fd928c8a
+  data.tar.gz: ab48391439c46f2730f0133c9350ee256cc6bfb3690a142588da6633d6c0516b88c6d26e5e46b90ba3deafebe3ac9b78598b1a87b38c9290fc38c395da762bd9

data/lib/lg_pod_plugin/config/target.rb

@@ -4,10 +4,11 @@ module LgPodPlugin
   class LPodTarget
     attr_reader :name
     attr_reader :dependencies
+    attr_reader :internal_hash
     def initialize(target)
-      internal_hash = target.send(:internal_hash)
-      @name = internal_hash["name"]
-      array = Array.new(internal_hash['dependencies'] ||= [])
+      @internal_hash = target.send(:internal_hash)
+      @name = @internal_hash["name"]
+      array = Array.new(@internal_hash['dependencies'] ||= [])
       dependencies = array.reject do |e|
         if LUtils.is_a_string?(e)
           true
@@ -29,5 +30,6 @@ module LgPodPlugin
       end
       @dependencies = external_pods
     end
+
   end
 end

data/lib/lg_pod_plugin/downloader/downloader.rb

@@ -49,13 +49,13 @@ module LgPodPlugin
         LgPodPlugin.log_green "Using `#{name}`"
       end
       hash_map = self.request.get_cache_key_params
+      self.request.checkout_options.delete(:branch) if commit
+      self.request.checkout_options[:commit] = commit if commit
       # 发现本地有缓存, 不需要更新缓存
       pod_is_exist, destination, cache_pod_spec = LCache.new.pod_cache_exist(name, hash_map, podspec, self.request.released_pod)
       if pod_is_exist
         is_delete = self.request.params["is_delete"] ||= false
         LProject.shared.need_update_pods.delete(name) if is_delete
-        self.request.checkout_options.delete(:branch) if commit
-        self.request.checkout_options[:commit] = commit if commit
         LgPodPlugin.log_green "find the cache of `#{name}`, you can use it now."
          nil
       else
@@ -106,8 +106,6 @@ module LgPodPlugin
           LgPodPlugin::LCache.cache_pod(name, download_params, self.request.get_cache_key_params,podspec, self.request.released_pod)
           FileUtils.chdir(LFileManager.download_director)
           FileUtils.rm_rf(download_params)
-          self.request.checkout_options.delete(:branch) if commit
-          self.request.checkout_options[:commit] = commit if commit
         end
         nil
       end

data/lib/lg_pod_plugin/downloader/l_cache.rb

@@ -17,7 +17,7 @@ module LgPodPlugin
       if (File.exist?(destination) && !destination.children.empty?) && cache_pod_spec.exist?
         return [true, destination, cache_pod_spec]
       else
-        [false, destination, cache_pod_spec]
+        return [false, destination, cache_pod_spec]
       end
     end
 
@@ -58,12 +58,12 @@ module LgPodPlugin
       Pathname.new(path.to_path + '.podspec.json')
     end
 
-    def self.cached_spec(request)
-      path = path_for_spec(request)
-      path.file? && Specification.from_file(path)
-    rescue JSON::ParserError
-      nil
-    end
+    # def self.cached_spec(request)
+    #   path = path_for_spec(request)
+    #   path.file? && Specification.from_file(path)
+    # rescue JSON::ParserError
+    #   nil
+    # end
 
     def self.get_local_spec(request, target)
       result = Pod::Downloader::Response.new
@@ -86,7 +86,7 @@ module LgPodPlugin
       [result, local_specs]
     end
 
-    def self.group_sub_specs_by_platform(spec)
+    def self.group_subspecs_by_platform(spec)
       specs_by_platform = {}
       [spec, *spec.recursive_subspecs].each do |ss|
         ss.available_platforms.each do |platform|
@@ -98,7 +98,7 @@ module LgPodPlugin
     end
 
     def self.copy_and_clean(source, destination, spec)
-      specs_by_platform = group_sub_specs_by_platform(spec)
+      specs_by_platform = group_subspecs_by_platform(spec)
       destination.parent.mkpath
       self.write_lock(destination) do
         FileUtils.rm_rf(destination)
@@ -109,7 +109,8 @@ module LgPodPlugin
     end
 
     def self.clean_pod_unused_files(destination, spec)
-      specs_by_platform = group_sub_specs_by_platform(spec)
+      specs_by_platform = group_subspecs_by_platform(spec)
+      destination.parent.mkpath
       self.write_lock(destination) do
         Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
         Pod::Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
@@ -117,37 +118,37 @@ module LgPodPlugin
     end
 
     def self.write_lock(location, &block)
-      self.lock(location, File::LOCK_EX, &block)
-    end
-
-    def self.lock(location, lock_type)
-      raise ArgumentError, 'no block given' unless block_given?
-      lockfile = "#{location}.lock"
-      f = nil
-      loop do
-        f.close if f
-        f = File.open(lockfile, File::CREAT, 0o644)
-        f.flock(lock_type)
-        break if self.valid_lock?(f, lockfile)
-      end
-      begin
-        yield location
-      ensure
-        if lock_type == File::LOCK_SH
-          f.flock(File::LOCK_EX)
-          File.delete(lockfile) if self.valid_lock?(f, lockfile)
-        else
-          File.delete(lockfile)
-        end
-        f.close
-      end
-    end
-
-    def self.valid_lock?(file, filename)
-      file.stat.ino == File.stat(filename).ino
-    rescue Errno::ENOENT
-      false
-    end
+      Pod::Downloader::Cache.lock(location, File::LOCK_SH, &block)
+    end
+
+    # def self.lock(location, lock_type)
+    #   raise ArgumentError, 'no block given' unless block_given?
+    #   lockfile = "#{location}.lock"
+    #   f = nil
+    #   loop do
+    #     f.close if f
+    #     f = File.open(lockfile, File::CREAT, 0o644)
+    #     f.flock(lock_type)
+    #     break if self.valid_lock?(f, lockfile)
+    #   end
+    #   begin
+    #     yield location
+    #   ensure
+    #     if lock_type == File::LOCK_SH
+    #       f.flock(File::LOCK_EX)
+    #       File.delete(lockfile) if self.valid_lock?(f, lockfile)
+    #     else
+    #       File.delete(lockfile)
+    #     end
+    #     f.close
+    #   end
+    # end
+
+    # def self.valid_lock?(file, filename)
+    #   file.stat.ino == File.stat(filename).ino
+    # rescue Errno::ENOENT
+    #   false
+    # end
 
     public
     def self.write_spec(spec, path)

data/lib/lg_pod_plugin/installer/install.rb

@@ -64,8 +64,6 @@ module LgPodPlugin
       if pod_is_exist
         is_delete = request.params["is_delete"] ||= false
         LProject.shared.need_update_pods.delete(name) if is_delete
-        request.checkout_options.delete(:branch) if commit
-        request.checkout_options[:commit] = commit if commit
       else
         git = checkout_options[:git]
         return unless git
@@ -91,8 +89,6 @@ module LgPodPlugin
         end
         FileUtils.chdir(LFileManager.download_director)
         FileUtils.rm_rf(download_params)
-        request.checkout_options.delete(:branch) if commit
-        request.checkout_options[:commit] = commit if commit
       end
 
     end

data/lib/lg_pod_plugin/installer/main.rb

@@ -19,7 +19,7 @@ module LgPodPlugin
 
     public
     def self.run(command, options = {})
-      self.clean_sandbox
+      clean_sandbox()
       workspace = Pathname(Dir.pwd)
       update = (command == "update")
       LSqliteDb.shared.init_database

data/lib/lg_pod_plugin/installer/project.rb

@@ -16,6 +16,7 @@ module LgPodPlugin
     attr_reader :external_pods
     attr_reader :need_update_pods
     attr_accessor :cache_specs
+    attr_accessor :redirect_url_hash
     def setup(workspace,podfile_path, update, repo_update)
       @podfile = Pod::Podfile.from_file(podfile_path)
       @update = update
@@ -35,7 +36,8 @@ module LgPodPlugin
       @cache_specs = Hash.new
       @external_pods = Hash.new.merge!(external_pods)
       @need_update_pods = Hash.new.merge!(external_pods)
-      self
+      @redirect_url_hash = Hash.new
+      return self
     end
 
     def self.shared

data/lib/lg_pod_plugin/net/l_uri.rb

@@ -5,7 +5,7 @@ module LgPodPlugin
 
   class LURI
     public
-    attr_reader :path
+    # attr_reader :path
     attr_reader :host
     attr_reader :scheme
     attr_reader :hostname
@@ -13,51 +13,47 @@ module LgPodPlugin
     attr_reader :uri
     public
     def initialize(git)
-      begin
-        uri = URI(git)
-      rescue => exception
-        if git.include?("git@") && git.include?(":")
-          match = %r{(?<=git@).*?(?=:)}.match(git)
-          host = match ? match[0] : ""
+      if git.include?("git@") && git.include?(":")
+        match = %r{(?<=git@).*?(?=:)}.match(git)
+        host = match ? match[0] : ""
+        if is_address(host)
           base_url = LUtils.get_gitlab_base_url(git)
           path = base_url.split(":").last
-          uri = URI("http://#{host}/#{path}")
+          origin_uri = URI("http://#{host}/#{path}")
         else
-          LgPodPlugin.log_red exception
-          uri = nil
+          base_url = LUtils.get_gitlab_base_url(git)
+          path = base_url.split(":").last
+          origin_uri = URI("https://#{host}/#{path}")
         end
+      else
+        origin_uri = URI(git)
       end
-      return unless uri
-      if git.include?("ssh") || git.include?("git@gitlab") || git.include?("git@")
-        redirect_url = get_redirect_url("https://#{uri.host}#{uri.path}")
-        @uri = URI(redirect_url)
+      return if origin_uri.nil?
+      redirect_url = LProject.shared.redirect_url_hash[origin_uri.host]
+      if redirect_url
+        @uri = redirect_url
       else
-        redirect_url = get_redirect_url("#{uri.scheme}://#{uri.host}#{uri.path}")
-        @uri = URI(redirect_url)
+        @uri = URI(get_redirect_url(origin_uri.scheme + "://" + origin_uri.host))
+        LProject.shared.redirect_url_hash[origin_uri.host] = @uri
       end
-      @host = @uri.host ||= ""
-      @path = @uri.path ||= ""
-      @scheme = @uri.scheme ||= ""
+      @host = @uri.host
+      @scheme = @uri.scheme ||= "https"
       @hostname =  @scheme + "://" + @host
     end
 
     def get_redirect_url(host)
       redirect_url = Net::HTTP.get_response(URI(host))['location']
-      begin
-        uri = URI(redirect_url)
-        return uri.scheme + "://" + uri.host
-      rescue
-        return host
-      end
+      return host unless redirect_url
+      uri = URI(redirect_url)
+      return uri.scheme + "://" + uri.host
     end
 
-
     private
     #判断是否是 IP 地址
-    # def is_address(host)
-    #   match = %r{^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$}.match(host)
-    #   !(match.nil?)
-    # end
+    def is_address(host)
+      match = %r{^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$}.match(host)
+      !(match.nil?)
+    end
 
     # 获取 ip 地址
     # private

data/lib/lg_pod_plugin/pod/release-pod.rb

@@ -47,8 +47,7 @@ module LgPodPlugin
             http = "https://ghproxy.com/" + http
             source["http"] = http
           end
-          version = attributes_hash["version"]
-          requirements = {:http => http, :version => version}
+          requirements = {:http => http }
         elsif git && tag
           tag = tag.to_s unless LUtils.is_a_string? tag
           requirements = { :git => git, :tag => tag }
@@ -74,14 +73,17 @@ module LgPodPlugin
       # 通过 swift 可执行文件进行异步下载任务
       LgPodPlugin::Concurrency.async_download_pods all_installers
     end
+    
 
     def self.dependencies(installer)
       installer.download_dependencies
       installer.send(:validate_targets)
+      installer.send(:clean_sandbox)
       installation_options = installer.send(:installation_options)
       skip_pods_project_generation = installation_options.send(:skip_pods_project_generation)
       if skip_pods_project_generation
         installer.show_skip_pods_project_generation_message
+        installer.send(:run_podfile_post_install_hooks)
       else
         installer.integrate
       end
@@ -132,7 +134,7 @@ module LgPodPlugin
         raise Pod::Informative, "No `Podfile.lock' found in the project directory, run `pod install'."
       end
     end
-
+    
     def self.install_release_pod(update, repo_update, verbose, clean_install)
       #切换工作目录到当前工程下, 开始执行pod install
       workspace = LProject.shared.workspace

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.5.9"
+  VERSION = "1.1.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.5.9
+  version: 1.1.6.2
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement