lg_pod_plugin 1.1.8.1 → 1.1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64cfe9f5818b1ad35a426e047a1639889db338c028923af2e2cbc9c4e31556da
-  data.tar.gz: ce53c502a2bbbeb261dfe3dc048a8e423848f7f29633956447c0abe1b474712d
+  metadata.gz: aafc9f0e84eb60f2f5a215573e20d4496446d31ad7fa4e8829c309872ad682cc
+  data.tar.gz: a1d6ef6d263704e67e90de93cd4d756e52e67ad385eaebfb2907691c1f83db4e
 SHA512:
-  metadata.gz: 6a6f5bc095f471f44cb2effd225be4bcf1c10622374adbe7f00d2b7953f0be3b09f763307ba167456169ba862e629e0cdf3e5596228f093461ee98fb35c3b21d
-  data.tar.gz: e081fa09f5ba85d7a9a581b30a8fabf9e83ce89c200bd020b3a9bdc0a8b6b955cf61b01fd1c0279ea2dbec406f77b6b790fd42397a2989632a3eb8fa918c5f28
+  metadata.gz: 7a002fe8a446c71ebc2d82f2d95f860571a58a68dfecf5816b01258c550e3ba2dceaf4765227f6caed75af4829908a195da4c9efa1875c0fa24e11d9e309f48f
+  data.tar.gz: f143f3a417584ef027c445d7ebaf6130187f4cce2b75d780fc3a4af1f8ac22f27e676bebacd85c5bac6efc805c2ab2d50129b4376b312d03c59a1ba348842ad9

data/lib/command/init.rb

@@ -38,7 +38,7 @@ module LgPodPlugin
         refresh_token = ""
         expires_in = 7879680
         created_at = Time.now.to_i
-        encrypt_access_token = LUtils.encrypt(self.token, "AZMpxzVxzbo3sFDLRZMpxzVxzbo3sFDZ")
+        encrypt_access_token = self.token
         hash = {"access_token": encrypt_access_token}
         hash["token_type"] = "Bearer"
         hash["expires_in"] = expires_in

data/lib/lg_pod_plugin/downloader/l_cache.rb

@@ -79,10 +79,10 @@ module LgPodPlugin
       [result, podspecs]
     end
 
-    def self.root_cache
-      cache_path = LFileManager.cache_root_path
-      return Pod::Downloader::Cache.new(cache_path)
-    end
+    # def self.root_cache
+    #   cache_path = LFileManager.cache_root_path
+    #   return Pod::Downloader::Cache.new(cache_path)
+    # end
 
     # MARK - 缓存方法
     def self.path_for_pod(request, slug_opts = {})
@@ -94,41 +94,66 @@ module LgPodPlugin
       return Pathname.new(path.to_path + '.podspec.json')
     end
 
-    def self.get_local_spec(request, target)
-      result = Pod::Downloader::Response.new
-      result.location = target
-      if request.released_pod?
-        result.spec = request.spec
-        local_specs = { request.name => request.spec }
-        return [request, local_specs]
-      else
-        local_specs = {}
-        pods_pecs = Pod::Sandbox::PodspecFinder.new(target).podspecs
-        pods_pecs[request.name] = request.spec if request.spec
-        pods_pecs.each do |name, spec|
-          if request.name == name
-            result.spec = spec
-            local_specs[request.name] = spec
-          end
+    #
+    # def self.get_local_spec(request, target)
+    #   result = Pod::Downloader::Response.new
+    #   result.location = target
+    #   if request.released_pod?
+    #     result.spec = request.spec
+    #     local_specs = { request.name => request.spec }
+    #     return [request, local_specs]
+    #   else
+    #     local_specs = {}
+    #     pods_pecs = Pod::Sandbox::PodspecFinder.new(target).podspecs
+    #     pods_pecs[request.name] = request.spec if request.spec
+    #     pods_pecs.each do |name, spec|
+    #       if request.name == name
+    #         result.spec = spec
+    #         local_specs[request.name] = spec
+    #       end
+    #     end
+    #   end
+    #   [result, local_specs]
+    # end
+
+    def self.group_subspecs_by_platform(spec)
+      specs_by_platform = {}
+      [spec, *spec.recursive_subspecs].each do |ss|
+        ss.available_platforms.each do |platform|
+          specs_by_platform[platform] ||= []
+          specs_by_platform[platform] << ss
         end
       end
-      [result, local_specs]
+      specs_by_platform
     end
 
     def self.copy_and_clean(source, destination, spec)
-      return self.root_cache.copy_and_clean(source, destination, spec)
+      attributes_hash = spec.send(:attributes_hash) || {}
+      name = attributes_hash["name"] ||= ""
+      specs_by_platform = self.group_subspecs_by_platform(spec)
+      destination.parent.mkpath
+      should_copy = source && source.exist? && !source.children.empty?
+      Pod::Downloader::Cache.write_lock(destination) do
+        if should_copy
+          FileUtils.rm_rf(destination)
+          FileUtils.cp_r(source, destination)
+          LgPodPlugin.log_green "-> Copy #{name} from #{source} to #{destination}"
+        end
+        Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
+        Pod::Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
+      end
     end
 
     public
-
     def self.write_spec(spec, path)
-      self.root_cache.write_spec(spec, path)
+      path.dirname.mkpath
+      Pod::Downloader::Cache.write_lock(path) do
+        path.open('w') { |f| f.write spec.to_pretty_json }
+      end
     end
 
     # 拷贝 pod 缓存文件到 sandbox
-
     public
-
     def self.cache_pod(name, target, options = {}, spec = nil, released_pod = false)
       checkout_options = Hash.new.deep_merge(options).reject do |key, val|
         !key || !val

data/lib/lg_pod_plugin/downloader/overload_cache.rb

@@ -29,31 +29,6 @@ module Pod
         end
       end
 
-      public
-      def copy_and_clean(source, destination, spec)
-        attributes_hash = spec.send(:attributes_hash) || {}
-        name = attributes_hash["name"] ||= ""
-        specs_by_platform = group_subspecs_by_platform(spec)
-        destination.parent.mkpath
-        Pod::Downloader::Cache.write_lock(destination) do
-          if source && source.exist? && !source.children.empty?
-            FileUtils.rm_rf(destination)
-            FileUtils.cp_r(source, destination)
-          end
-          LgPodPlugin.log_green "-> Copy #{name} from #{source} to #{destination}"
-          Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
-          Pod::Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
-        end
-      end
-
-      public
-      def write_spec(spec, path)
-        path.dirname.mkpath
-        Pod::Downloader::Cache.write_lock(path) do
-          path.open('w') { |f| f.write spec.to_pretty_json }
-        end
-      end
-
     end
   end
 end

data/lib/lg_pod_plugin/downloader/request.rb

@@ -12,7 +12,6 @@ module LgPodPlugin
     attr_accessor :config
     attr_accessor :net_ping
     attr_accessor :params
-    # attr_accessor :lockfile
     attr_accessor :checkout_options
     def initialize(pod)
       @name = pod.name

data/lib/lg_pod_plugin/git/github_archive.rb

@@ -39,6 +39,7 @@ module LgPodPlugin
       project_name = LUtils.get_git_project_name self.git
       download_urls = self.download_archive_zip(project_name)
       download_params = Hash.new
+      download_params["token"] = ""
       download_params["name"] = self.name
       download_params["type"] = "github-tag"
       download_params["path"] = root_path.to_path
@@ -51,6 +52,7 @@ module LgPodPlugin
       download_urls = self.download_archive_zip(project_name)
       download_params = Hash.new
       download_params["name"] = self.name
+      download_params["token"] = ""
       download_params["type"] = "github-branch"
       download_params["path"] = root_path.to_path
       download_params = download_params.merge(download_urls)
@@ -61,6 +63,7 @@ module LgPodPlugin
       project_name = LUtils.get_git_project_name self.git
       download_urls = self.download_archive_zip(project_name)
       download_params = Hash.new
+      download_params["token"] = ""
       download_params["name"] = self.name
       download_params["type"] = "github-commit"
       download_params["path"] = root_path.to_path

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -14,13 +14,12 @@ module LgPodPlugin
       token_file = db_path.join("access_token.json")
       return self.get_gitlab_access_token_input(uri, user_id, nil, nil) unless token_file.exist?
       json = JSON.parse(File.read("#{token_file.to_path}"))
-      encrypt_access_token = json["access_token"]
-      return self.get_gitlab_access_token_input(uri, user_id, nil, nil) if encrypt_access_token.nil?
-      access_token = LUtils.decrypt(encrypt_access_token, "AZMpxzVxzbo3sFDLRZMpxzVxzbo3sFDZ")
+      access_token = json["access_token"]
+      return self.get_gitlab_access_token_input(uri, user_id, nil, nil) if access_token.nil?
       token_vaild = GitLabAPI.request_user_emails(uri.hostname, access_token)
       if token_vaild == "invalid token"
         FileUtils.rm_rf token_file
-        return self.get_gitlab_access_token_input(uri, user_id, nil, nil) if encrypt_access_token.nil?
+        return self.get_gitlab_access_token_input(uri, user_id, nil, nil)
       end
       user_id = LUserAuthInfo.get_user_id(uri.hostname)
       now_time = Time.now.to_i

data/lib/lg_pod_plugin/installer/install.rb

@@ -1,5 +1,4 @@
 require 'pp'
-# require 'git'
 require 'cgi'
 require 'cocoapods'
 require 'cocoapods-core'

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.8.1"
+  VERSION = "1.1.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.8.1
+  version: 1.1.8.2
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods