lg_pod_plugin 1.1.6.3 → 1.1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b2349a1ddeb538035e926a25be2f3a18589e307c158dce81e3282e9c656e5d
-  data.tar.gz: 284ee67f49b9d6dba2123aba1c0649f8c525a5528666f772568a81c24c489b87
+  metadata.gz: 7af2ac8a760f94c57f82d9005cd1b366a7dc9b51ab09c887e43dff3e0f43b0c4
+  data.tar.gz: f120886f336ce31ea35dcc38300a24561878a7a49963017484d26b59eb3e671e
 SHA512:
-  metadata.gz: dd8f333635e20d8f19a76bb0077ba52e48dd92d700941b22584ec5c875044ff827dec95eba287f8af1f820ac592140b98d76869f29b5d38e5fd21678e9c4ca08
-  data.tar.gz: 99c8fe2a58f062dc236862e2af6802afa2d7832a8a3a0a9c4d2c1ba9a1c814c18fb51fd8bde6686e301e4a9d61a1baef1bb77f7c788f51d0ae347c6167c922a6
+  metadata.gz: e304fe0bbafee6d7ad797c3bc32e60c4fb050109d29a2d04d27d0a22630a7e9abf024820e54891792c16b8953f0574b0876e4df2b67cf27f22e57af7c89a6352
+  data.tar.gz: 13029c1d8e46a6dc0388fc7de8e78b470dbd6f040834d6554bab1c615a4344d7f8584efbf56714c1429262fb6478ec2fa6792cfedef7570b0ad3cd4b354ddfb4

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/downloader/l_cache.rb

@@ -121,35 +121,6 @@ module LgPodPlugin
       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)
       path.dirname.mkpath

data/lib/lg_pod_plugin/downloader/request.rb

@@ -82,27 +82,11 @@ module LgPodPlugin
 
     public
     def get_lock_params
-      begin
-        _release_pods = self.lockfile.release_pods ||= []
-        _external_source = (self.lockfile.external_sources_data[self.name])
-        _external_source = {} unless _external_source
-        _checkout_options = self.lockfile.checkout_options_for_pod_named(self.name)
-      rescue
-        _release_pods = {}
-        _external_source = {}
-        _checkout_options = {}
-      end
-
       git = self.checkout_options[:git]
       tag = self.checkout_options[:tag]
       commit = self.checkout_options[:commit]
       branch = self.checkout_options[:branch]
 
-      lock_git = _external_source[:git] ||= _checkout_options[:git]
-      lock_tag = _external_source[:tag] ||= _release_pods[self.name]
-      lock_branch = _external_source[:branch] ||= ""
-      lock_commit = _checkout_options[:commit] ||= ""
-
       hash_map = Hash.new
       hash_map[:git] = git if git
       if git && tag
@@ -110,53 +94,15 @@ module LgPodPlugin
         return hash_map
       elsif git && branch
         hash_map[:branch] = branch
-        if lock_commit && !lock_commit.empty? && !LProject.shared.update
-          pod_info = LSqliteDb.shared.query_branch_with_sha(self.name, git, lock_commit)
-          lock_branch = pod_info[:branch] if lock_branch.empty?
-          new_commit = pod_info[:sha] ||= ""
-          if lock_branch == branch && new_commit == lock_commit
-            hash_map[:commit] = lock_commit
-            return hash_map
-          end
-        end
         _, new_commit = git_ls_remote_refs(self.name, git, branch)
-        if new_commit && !new_commit.empty?
-          hash_map[:commit] = new_commit
-        elsif lock_commit && !lock_commit.empty?
-          hash_map[:commit] = lock_commit
-        end
+        hash_map[:commit] = new_commit if new_commit
       elsif git && commit
         hash_map[:commit] = commit
         return hash_map
       else
-        if lock_git && !LProject.shared.update
-          id = LPodLatestRefs.get_pod_id(self.name, git)
-          pod_info = LSqliteDb.shared.query_pod_refs(id)
-          if pod_info&.commit
-            if pod_info
-              new_commit = pod_info.commit
-            else
-              new_commit = nil
-            end
-            if pod_info
-              new_branch = pod_info.branch
-            else
-              new_branch = nil
-            end
-            if new_commit
-              hash_map[:commit] = new_commit
-            end
-            if new_branch
-              hash_map[:branch] = new_branch
-            end
-            return hash_map
-          end
-        end
         new_branch, new_commit = git_ls_remote_refs(self.name, git, nil)
         hash_map[:branch] = new_branch if new_branch
-        if new_commit && !new_commit.empty?
-          hash_map[:commit] = new_commit
-        end
+        hash_map[:commit] = new_commit if new_commit
       end
       hash_map
     end

data/lib/lg_pod_plugin/git/github_api.rb

@@ -22,6 +22,7 @@ module LgPodPlugin
       else
         request_url += ("/commits/" + "HEAD")
       end
+      LgPodPlugin.log_blue "http reqeust: #{request_url}"
       begin
         uri = URI(request_url)
         res = Net::HTTP.get_response(uri)

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -182,7 +182,8 @@ module LgPodPlugin
       if commit
         return [commit, branch]
       else
-        return self.use_default_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/net/l_uri.rb

@@ -29,24 +29,25 @@ module LgPodPlugin
         origin_uri = URI(git)
       end
       return if origin_uri.nil?
-      redirect_url = LProject.shared.redirect_url_hash[origin_uri.host]
-      if redirect_url
-        @uri = redirect_url
-      else
-        @uri = URI(get_redirect_url(origin_uri.scheme + "://" + origin_uri.host))
-        LProject.shared.redirect_url_hash[origin_uri.host] = @uri
-      end
+      @uri = origin_uri
+      # redirect_url = LProject.shared.redirect_url_hash[origin_uri.host]
+      # if redirect_url
+      #   @uri = redirect_url
+      # else
+      #   @uri = URI(get_redirect_url(origin_uri.scheme + "://" + origin_uri.host))
+      #   LProject.shared.redirect_url_hash[origin_uri.host] = @uri
+      # end
       @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']
-      return host unless redirect_url
-      uri = URI(redirect_url)
-      return uri.scheme + "://" + uri.host
-    end
+    # def get_redirect_url(host)
+    #   redirect_url = Net::HTTP.get_response(URI(host))['location']
+    #   return host unless redirect_url
+    #   uri = URI(redirect_url)
+    #   return uri.scheme + "://" + uri.host
+    # end
 
     private
     #判断是否是 IP 地址

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.3"
+  VERSION = "1.1.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.6.3
+  version: 1.1.6.5
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-05-15 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