lg_pod_plugin 1.1.6.4 → 1.1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa46fff13f24c1345099a41de0fd69d57f52ea6d701944c964dc602fc71f82be
-  data.tar.gz: 1918987895e07fed61e3a07e521f571210472f0baade5aad98e91a0a19145dd7
+  metadata.gz: 49669409fc52a28372c3033cd25e908b939267d30147689f982b84c9cea0d748
+  data.tar.gz: ddd14338375b62677fd81ee52e0a3f15170b58a852870c203b3a27f2121a7151
 SHA512:
-  metadata.gz: 81ff396511000ce3a021c365d2dd1d5959373e5d3005af4c768a09bd22fd203ba0e858ab9d79d4e128428b0cc358f1dbe23f6c32490316551d70dc1783d83cac
-  data.tar.gz: e8354d1b63266ec23978d13c6abcdac7a2a2b9e137f00cedc83ee1712fb19928d9c96fac552df26d9550b2eb2d77ed712c17b44ce01cba47395db1d2192ea34c
+  metadata.gz: 2a9bb5866675919b09e0ebcad919085431ec96eb103caa56477356a833e9369365e9fed62506c8919866d4c6ae8ecb2bfb918a5dd22dc956cf16adc28cc674c7
+  data.tar.gz: 85604ebf38280f2c65d929dcf60c0af3a29434b244290a4f67682b337090f81e8fc93e51bd165ee10529d0ee1bd826c9ac794894e344732fc93ebbf3531c1a37

data/lib/command/install.rb

@@ -55,7 +55,6 @@ module LgPodPlugin
       end
 
       def run
-
         begin_time = Time.now.to_i
         LgPodPlugin::Main.run("install", { :verbose => self.log, :repo_update => self.repo_update, :clean_install => self.clean_install })
         end_time = Time.now.to_i

data/lib/lg_pod_plugin/db/database.rb

@@ -42,8 +42,8 @@ module LgPodPlugin
       self.commit = commit
     end
 
-    def self.get_pod_id(name, git)
-      key = name + git
+    def self.get_pod_id(name, git, branch)
+      key = name + git + branch
       return Digest::MD5.hexdigest(key)
     end
 
@@ -221,7 +221,7 @@ module LgPodPlugin
     end
 
     def insert_pod_refs(name, git, branch, tag, commit)
-      id = LPodLatestRefs.get_pod_id(name, git)
+      id = LPodLatestRefs.get_pod_id(name, git, branch)
       pod = LPodLatestRefs.new(id, name, git, branch, tag, commit)
       if self.query_pod_refs(id) != nil
         self.db.execute_batch(

data/lib/lg_pod_plugin/downloader/request.rb

@@ -125,7 +125,7 @@ module LgPodPlugin
       if branch
         new_commit, _ = GitLabAPI.request_github_refs_heads git, branch, self.net_ping.uri
         unless new_commit
-          id = LPodLatestRefs.get_pod_id(name, git)
+          id = LPodLatestRefs.get_pod_id(name, git, branch)
           pod_info = LSqliteDb.shared.query_pod_refs(id)
           new_commit = pod_info ? pod_info.commit : nil
           return [branch, new_commit]
@@ -137,14 +137,14 @@ module LgPodPlugin
       else
         new_commit, new_branch = GitLabAPI.request_github_refs_heads git, nil, self.net_ping.uri
         unless new_commit
-          id = LPodLatestRefs.get_pod_id(name, git)
+          id = LPodLatestRefs.get_pod_id(name, git, "HEAD")
           pod_info = LSqliteDb.shared.query_pod_refs(id)
           new_commit = pod_info ? pod_info.commit : nil
           new_branch = pod_info ? pod_info.branch : nil
           return [new_branch, new_commit]
         end
         if new_commit
-          LSqliteDb.shared.insert_pod_refs(name, git, new_branch, nil, new_commit)
+          LSqliteDb.shared.insert_pod_refs(name, git, "HEAD", nil, new_commit)
         end
         [new_branch, new_commit]
       end

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -178,11 +178,12 @@ module LgPodPlugin
         end
         return self.use_default_refs_heads git, branch
       end
-      commit, _ = self.use_default_refs_heads git, branch
+      commit, _ = GithubAPI.request_github_refs_heads git, branch
       if commit
         return [commit, branch]
       else
-        return GithubAPI.request_github_refs_heads git, branch
+        commit, _ = self.use_default_refs_heads git, branch
+        return [commit, branch]
       end
     end
 

data/lib/lg_pod_plugin/installer/concurrency.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'aescrypt'
+# require 'aescrypt'
 
 module  LgPodPlugin
 
@@ -8,12 +8,14 @@ module  LgPodPlugin
     public
     def self.async_download_pods(installers)
       return if installers.empty?
-      json_text = installers.map(&:download_params).uniq.to_json
-      arvg = LUtils.encrypt json_text, "AZMpxzVxzbo3sFDLRZMpxzVxzbo3sFDZ"
-      return unless arvg && !arvg.empty?
+      hash = installers.map(&:download_params).uniq
+      json_text = JSON.generate(hash)
+      file_path = LFileManager.download_director.join(LUtils.md5(json_text)).to_path + ".json"
+      # pp file_path
+      File.open(file_path, 'w+') { |f| f.write(json_text) }
       pwd = Pathname.new(File.dirname(__FILE__)).realpath
       FileUtils.chdir pwd
-      system("./PodDownload #{arvg}")
+      system("./PodDownload #{file_path}")
       installers.each(&:copy_file_to_caches)
     end
 

data/lib/lg_pod_plugin/installer/install.rb

@@ -69,12 +69,9 @@ module LgPodPlugin
       git = checkout_options[:git]
       return unless git
       cache_podspec = request.lg_spec.spec if request.lg_spec
-      branch = checkout_options[:branch]
+      branch = checkout_options[:branch] ||= request.params[:branch]
       checkout_options[:name] = name if name
-      unless branch
-        branch = self.request.params[:branch] if request.params[:branch]
-        checkout_options[:branch] = branch if branch
-      end
+      checkout_options[:branch] = branch if branch
       lg_pod_path = LFileManager.cache_workspace(LProject.shared.workspace)
       lg_pod_path.mkdir(0700) unless lg_pod_path.exist?
       checkout_options[:path] = lg_pod_path

data/lib/lg_pod_plugin/installer/main.rb

@@ -11,7 +11,6 @@ module LgPodPlugin
       sand_box = LFileManager.download_director
       sand_box.each_child do |f|
         ftype = File::ftype(f)
-        next unless ftype == "directory"
         next if f.to_path.include?("database")
         FileUtils.rm_rf f.to_path
       end

data/lib/lg_pod_plugin/installer/project.rb

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

data/lib/lg_pod_plugin/utils/l_util.rb

@@ -3,20 +3,20 @@ require 'resolv'
 require "ipaddr"
 require 'base64'
 require 'fileutils'
-require_relative 'aes-crypt'
+# require_relative 'aes-crypt'
 
 module LgPodPlugin
 
   class LUtils
 
-    def self.encrypt(message, password)
-      encrypted_data = AESCrypt.encrypt(message, password)
-      encrypted_data.tr("\n", "")
-    end
-
-    def self.decrypt(message, password)
-      AESCrypt.decrypt message, password
-    end
+    # def self.encrypt(message, password)
+    #   encrypted_data = AESCrypt.encrypt(message, password)
+    #   encrypted_data.tr("\n", "")
+    # end
+    #
+    # def self.decrypt(message, password)
+    #   AESCrypt.decrypt message, password
+    # end
 
     def self.md5(text)
       return "" unless text

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.6.4"
+  VERSION = "1.1.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.6.4
+  version: 1.1.6.6
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -44,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: aescrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +160,7 @@ files:
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/2.7/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.0/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.1/sqlite3_native.bundle
+- lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/3.2/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/constants.rb
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/database.rb
 - lib/sqlite3-1.5.3-arm64-darwin/lib/sqlite3/errors.rb
@@ -229,6 +216,7 @@ files:
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/2.7/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.0/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.1/sqlite3_native.bundle
+- lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/3.2/sqlite3_native.bundle
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/constants.rb
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/database.rb
 - lib/sqlite3-1.5.3-x86_64-darwin/lib/sqlite3/errors.rb
@@ -276,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: 封装了自定义podfile 中pod 方法