lg_pod_plugin 1.1.6.0 → 1.1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf74181198e5c879bdbf6ef84ca2de6286d56fa355665a9f68db20fda87b9ba
-  data.tar.gz: bc480be0ff2a011c60aa23a48355c03c6b329c0a6360708c9c7aa5e1a26b44a2
+  metadata.gz: 8ec02e7287d7905d93048a8620d22946077d9b60078df1531986db93559cd6d4
+  data.tar.gz: a13a7706ad353e97a931fcd96581f20d70e2c6aaef4d63c5dbf3eb1c7fa698a1
 SHA512:
-  metadata.gz: ce2163d8778eb68adef6fec76595ba9a2cd66be2abea079011c8294155b30f84d48bc659dc510f27e046a1637a9e554357e81d3ceb5cb0a45a11e23f364d34f7
-  data.tar.gz: 79005659b57432323474fc0237f1c0e01aff28602d6d72cd349e42f8e6ef755b2fc09519f3f577c4a483d17275cc2dac4bd0491d776a349aefbf32d8ceab234c
+  metadata.gz: b930234998ecfaa0376344d2e4c9efd74cb4be730bbd6e0379fad087718355e24805babe26443019a791df623fe1938c6e8d71def6480ec2b85f1505fd928c8a
+  data.tar.gz: ab48391439c46f2730f0133c9350ee256cc6bfb3690a142588da6633d6c0516b88c6d26e5e46b90ba3deafebe3ac9b78598b1a87b38c9290fc38c395da762bd9

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/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.6.0"
+  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.6.0
+  version: 1.1.6.2
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-15 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