lg_pod_plugin 1.1.7.4 → 1.1.8.1

data/lib/lg_pod_plugin/git/github_api.rb

@@ -5,7 +5,7 @@ module LgPodPlugin
 
   class GithubAPI
 
-    #获取 gitlab最新 commit_id
+    # 获取 gitlab最新 commit_id
     def self.request_github_refs_heads(git, branch)
       base_url = LUtils.get_gitlab_base_url git
       if base_url.include?("https://github.com/")
@@ -55,6 +55,7 @@ module LgPodPlugin
     end
 
     public
+
     def self.get_gitlab_repository_tree(git, sha)
       base_url = LUtils.get_gitlab_base_url git
       if base_url.include?("https://github.com/")
@@ -85,54 +86,6 @@ module LgPodPlugin
       end
     end
 
-    public
-
-    def self.get_podspec_file_content(git, sha, filename)
-      base_url = LUtils.get_gitlab_base_url git
-      if base_url.include?("https://github.com/")
-        repo_name = base_url.split("https://github.com/", 0).last
-      elsif base_url.include?("git@github.com:")
-        repo_name = base_url.split("git@github.com:", 0).last
-      else
-        repo_name = nil
-      end
-      return nil unless repo_name
-      trees = self.get_gitlab_repository_tree git, sha
-      return nil if trees.empty?
-      request_url = nil
-      trees.each do |dict|
-        type = dict["type"]
-        next if type == "tree"
-        path = dict["path"]
-        next unless path.include?(".podspec")
-        if path == filename
-          request_url = dict["url"]
-          break
-        end
-      end
-      begin
-        uri = URI(request_url)
-        res = Net::HTTP.get_response(uri)
-        if res.body
-          json = JSON.parse(res.body)
-        else
-          json = nil
-        end
-        return nil unless json && json.is_a?(Hash)
-        content = json["content"]
-        return nil unless content && LUtils.is_a_string?(content)
-        encoding = json["encoding"] ||= "base64"
-        if encoding == "base64"
-          content = LUtils.base64_decode(content)
-          return content
-        else
-          return nil
-        end
-      rescue
-        return nil
-      end
-    end
-
   end
 
 end

data/lib/lg_pod_plugin/git/github_archive.rb

@@ -1,15 +1,17 @@
 require 'uri'
 require_relative 'git_download'
 require_relative '../utils/l_util'
-require_relative '../config/podspec'
 
 module LgPodPlugin
 
   class GitHubArchive
     private
+
     attr_reader :checkout_options
+
     public
-    REQUIRED_ATTRS ||= %i[git tag name commit branch config path spec].freeze
+
+    REQUIRED_ATTRS ||= %i[git tag name commit branch config path].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
     def initialize(checkout_options = {})
@@ -17,7 +19,6 @@ module LgPodPlugin
       self.tag = checkout_options[:tag]
       self.name = checkout_options[:name]
       self.path = checkout_options[:path]
-      self.spec = checkout_options[:spec]
       self.config = checkout_options[:config]
       self.commit = checkout_options[:commit]
       self.branch = checkout_options[:branch]
@@ -41,15 +42,7 @@ module LgPodPlugin
       download_params["name"] = self.name
       download_params["type"] = "github-tag"
       download_params["path"] = root_path.to_path
-      download_params["download_urls"] = download_urls
-      if self.spec
-        download_params["podspec"] = self.spec
-        download_params["source_files"] = self.spec.source_files.keys
-        download_params["podspec_content"] = nil
-      else
-        download_params["podspec"] = nil
-        download_params["source_files"] = ["All"]
-      end
+      download_params = download_params.merge(download_urls)
       download_params
     end
 
@@ -60,14 +53,7 @@ module LgPodPlugin
       download_params["name"] = self.name
       download_params["type"] = "github-branch"
       download_params["path"] = root_path.to_path
-      download_params["download_urls"] = download_urls
-      if self.spec
-        download_params["podspec"] = self.spec
-        download_params["source_files"] = self.spec.source_files.keys
-      else
-        download_params["podspec"] = nil
-        download_params["source_files"] = ["All"]
-      end
+      download_params = download_params.merge(download_urls)
       download_params
     end
 
@@ -78,14 +64,7 @@ module LgPodPlugin
       download_params["name"] = self.name
       download_params["type"] = "github-commit"
       download_params["path"] = root_path.to_path
-      download_params["download_urls"] = download_urls
-      if self.spec
-        download_params["podspec"] = self.spec
-        download_params["source_files"] = self.spec.source_files.keys
-      else
-        download_params["podspec"] = nil
-        download_params["source_files"] = ["All"]
-      end
+      download_params = download_params.merge(download_urls)
       download_params
     end
 
@@ -102,18 +81,18 @@ module LgPodPlugin
       return nil unless repo_name
       if self.git && self.tag
         download_url = "https://codeload.github.com/#{repo_name}/tar.gz/refs/tags/#{self.tag}"
-        [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
+        { "filename" => "#{project_name}.tar.gz", "url" => download_url }
       elsif self.git && self.branch
         if self.branch == "HEAD"
           download_url = "https://gh.api.99988866.xyz/" + "#{base_url}" + "/archive/#{self.branch}.tar.gz"
-          [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
+          { "filename" => "#{project_name}.tar.gz", "url" => download_url }
         else
           download_url = "https://codeload.github.com/#{repo_name}/tar.gz/refs/heads/#{self.branch}"
-          [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
+          { "filename" => "#{project_name}.tar.gz", "url" => download_url }
         end
       elsif self.git && self.commit
         download_url = "https://codeload.github.com/#{repo_name}/tar.gz/#{self.commit}"
-        return [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
+        return { "filename" => "#{project_name}.tar.gz", "url" => download_url }
       else
         nil
       end

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -68,11 +68,11 @@ module LgPodPlugin
       else
         # 判断 token 是否失效
         if user_info.expires_in  <= time_now
-          return refreshUserToken uri, refresh_token, user_info.id, user_info.username, user_info.password
+          return refresh_user_token uri, refresh_token, user_info.id, user_info.username, user_info.password
         else
           update_time = user_info.update_time.to_i
           if time_now - update_time > 1800
-            user_info = refreshUserToken uri, refresh_token, user_info.id, user_info.username, user_info.password
+            user_info = refresh_user_token uri, refresh_token, user_info.id, user_info.username, user_info.password
             return  user_info
           else
             return user_info
@@ -264,46 +264,46 @@ module LgPodPlugin
       end
     end
 
-    public
-    def self.get_podspec_file_content(host, token, project_id, sha, filepath)
-      begin
-        hash_map = Hash.new
-        hash_map["ref"] = sha
-        hash_map["access_token"] = token
-        uri = URI("#{host}/api/v4/projects/#{project_id}/repository/files/#{filepath}")
-        uri.query = URI.encode_www_form(hash_map)
-        res = Net::HTTP.get_response(uri)
-        case res
-        when Net::HTTPSuccess, Net::HTTPRedirection
-          json = JSON.parse(res.body)
-        else
-          body = JSON.parse(res.body)
-          message = body["message"]
-          if message == "404 Project Not Found"
-            LSqliteDb.shared.delete_project_by_id(project_id)
-          end
-          json = nil
-        end
-        return nil unless json && json.is_a?(Hash)
-        content = json["content"]
-        return nil unless content && LUtils.is_a_string?(content)
-        encoding = json["encoding"] ||= "base64"
-        if encoding == "base64"
-          require 'base64'
-          content = Base64.decode64(content)
-          if content.respond_to?(:encoding) && content.encoding.name != 'UTF-8'
-            text = content.force_encoding("gb2312").force_encoding("utf-8")
-            return text
-          else
-            return content
-          end
-        else
-          return nil
-        end
-      rescue
-        return nil
-      end
-    end
+    # public
+    # def self.get_podspec_file_content(host, token, project_id, sha, filepath)
+    #   begin
+    #     hash_map = Hash.new
+    #     hash_map["ref"] = sha
+    #     hash_map["access_token"] = token
+    #     uri = URI("#{host}/api/v4/projects/#{project_id}/repository/files/#{filepath}")
+    #     uri.query = URI.encode_www_form(hash_map)
+    #     res = Net::HTTP.get_response(uri)
+    #     case res
+    #     when Net::HTTPSuccess, Net::HTTPRedirection
+    #       json = JSON.parse(res.body)
+    #     else
+    #       body = JSON.parse(res.body)
+    #       message = body["message"]
+    #       if message == "404 Project Not Found"
+    #         LSqliteDb.shared.delete_project_by_id(project_id)
+    #       end
+    #       json = nil
+    #     end
+    #     return nil unless json && json.is_a?(Hash)
+    #     content = json["content"]
+    #     return nil unless content && LUtils.is_a_string?(content)
+    #     encoding = json["encoding"] ||= "base64"
+    #     if encoding == "base64"
+    #       require 'base64'
+    #       content = Base64.decode64(content)
+    #       if content.respond_to?(:encoding) && content.encoding.name != 'UTF-8'
+    #         text = content.force_encoding("gb2312").force_encoding("utf-8")
+    #         return text
+    #       else
+    #         return content
+    #       end
+    #     else
+    #       return nil
+    #     end
+    #   rescue
+    #     return nil
+    #   end
+    # end
 
     # 通过名称搜索项目信息
     public

data/lib/lg_pod_plugin/git/gitlab_archive.rb

@@ -12,7 +12,7 @@ module LgPodPlugin
     attr_reader :checkout_options
 
     public
-    REQUIRED_ATTRS ||= %i[git tag name commit branch config path spec].freeze
+    REQUIRED_ATTRS ||= %i[git tag name commit branch config path].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
     def initialize(checkout_options = {})
@@ -20,7 +20,6 @@ module LgPodPlugin
       self.tag = checkout_options[:tag]
       self.name = checkout_options[:name]
       self.path = checkout_options[:path]
-      self.spec = checkout_options[:spec]
       self.config = checkout_options[:config]
       self.commit = checkout_options[:commit]
       self.branch = checkout_options[:branch]
@@ -57,51 +56,9 @@ module LgPodPlugin
       else
         return nil
       end
-      lg_spec = self.spec
-      unless lg_spec
-        podspec_filename = self.name + ".podspec"
-        podspec_content = GitLabAPI.get_podspec_file_content(host, token, project.id, sha, podspec_filename)
-        unless podspec_content && LUtils.is_a_string?(podspec_content)
-          download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2\\?" + "sha\\=#{sha}"
-          download_url += "\\&access_token\\=#{token}" if token
-          return [{ "filename" => "#{self.name}.tar.bz2", "url" => download_url }]
-        end
-        pod_spec_file_path = sandbox_path.join("#{podspec_filename}")
-        lg_spec = LgPodPlugin::PodSpec.form_string(podspec_content, pod_spec_file_path)
-        if podspec_content
-          begin
-            File.open(pod_spec_file_path, "w+") do |f|
-              f.write podspec_content
-            end
-          rescue => exception
-            LgPodPlugin.log_red "#{exception}"
-          end
-          @podspec_content = podspec_content
-        end
-        unless lg_spec
-          download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2\\?" + "sha\\=#{sha}"
-          download_url += "\\&access_token\\=#{token}" if token
-          return [{ "filename" => "#{self.name}.tar.bz2", "url" => download_url }]
-        end
-        self.spec = lg_spec
-      end
-      download_params = Array.new
-      @source_files = lg_spec.source_files.keys
-      lg_spec.source_files.each_key do |key|
-        next if key == "All" || key == "LICENSE" || key == "License"
-        path = LUtils.url_encode(key)
-        # download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2#{"\\?"}" + "sha#{"\\="}#{sha}"
-        download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2#{"\\?"}" + "path#{"\\="}#{path}#{"\\&"}sha#{"\\="}#{sha}"
-        download_url += "\\&access_token\\=#{token}" if token
-        download_params.append({ "filename" => "#{path}.tar.bz2", "url" => download_url })
-      end
-      if download_params.empty?
-        download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2\\?" + "sha\\=#{sha}"
-        download_url += "\\&access_token\\=#{token}" if token
-        [{ "filename" => "#{self.name}.tar.bz2", "url" => download_url }]
-      else
-        download_params
-      end
+      download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2\\?" + "sha\\=#{sha}"
+      download_url += "\\&access_token\\=#{token}" if token
+      download_params = { "filename" => "#{self.name}.tar.bz2", "url" => download_url }
     end
 
     # 根据branch 下载 zip 包
@@ -113,18 +70,8 @@ module LgPodPlugin
       download_params["token"] = token
       download_params["name"] = self.name
       download_params["type"] = "gitlab-branch"
-      if self.spec
-        download_params["podspec"] = self.spec
-      else
-        download_params["podspec_content"] = @podspec_content
-      end
       download_params["path"] = root_path.to_path
-      if @source_files
-        download_params["source_files"] = @source_files
-      else
-        download_params["source_files"] = "All"
-      end
-      download_params["download_urls"] = download_urls
+      download_params = download_params.merge(download_urls)
       download_params
     end
 
@@ -137,18 +84,8 @@ module LgPodPlugin
       download_params["token"] = token
       download_params["name"] = self.name
       download_params["type"] = "gitlab-tag"
-      if self.spec
-        download_params["podspec"] = self.spec
-      else
-        download_params["podspec_content"] = @podspec_content
-      end
       download_params["path"] = root_path.to_path
-      if @source_files
-        download_params["source_files"] = @source_files
-      else
-        download_params["source_files"] = "All"
-      end
-      download_params["download_urls"] = download_urls
+      download_params = download_params.merge(download_urls)
       download_params
     end
 
@@ -160,19 +97,9 @@ module LgPodPlugin
       download_params = Hash.new
       download_params["token"] = token
       download_params["name"] = self.name
-      if self.spec
-        download_params["podspec"] = self.spec
-      else
-        download_params["podspec_content"] = @podspec_content
-      end
       download_params["type"] = "gitlab-commit"
       download_params["path"] = root_path.to_path
-      if @source_files
-        download_params["source_files"] = @source_files
-      else
-        download_params["source_files"] = "All"
-      end
-      download_params["download_urls"] = download_urls
+      download_params = download_params.merge(download_urls)
       download_params
     end
 

data/lib/lg_pod_plugin/git/http_download.rb

@@ -1,7 +1,6 @@
 require 'uri'
 require_relative 'git_download'
 require_relative '../utils/l_util'
-require_relative '../config/podspec'
 
 module LgPodPlugin
 
@@ -10,13 +9,12 @@ module LgPodPlugin
     private
     attr_reader :checkout_options
     public
-    REQUIRED_ATTRS ||= %i[http name path lg_spec].freeze
+    REQUIRED_ATTRS ||= %i[http name path].freeze
     attr_accessor(*REQUIRED_ATTRS)
     def initialize(checkout_options = {})
       self.name = checkout_options[:name]
       self.path = checkout_options[:path]
       self.http = checkout_options[:http]
-      self.lg_spec = checkout_options[:spec]
       @checkout_options = checkout_options
     end
 
@@ -26,11 +24,8 @@ module LgPodPlugin
       download_params["path"] = self.path.to_path
       download_params["name"] = self.name
       download_params["type"] = "http"
-      download_params["download_urls"] = [{ "filename" => (new_filename ? new_filename : filename), "url" => http }]
-      if self.lg_spec
-        download_params["podspec"] = self.lg_spec
-        download_params["source_files"] = self.lg_spec.source_files.keys
-      end
+      download_params["filename"] = (new_filename ? new_filename : filename)
+      download_params["url"] = http
       download_params
     end
 

data/lib/lg_pod_plugin/installer/install.rb

@@ -29,34 +29,37 @@ module LgPodPlugin
 
     public
     def copy_file_to_caches
-      request = @downloader.send(:request)
-      name = request.send(:name)
+      request = downloader.request
+      name = request.name
       params = Hash.new.merge!(request.params)
       checkout_options = Hash.new.merge!(request.checkout_options)
       commit = checkout_options[:commit] ||= params[:commit]
-      if request.lg_spec
-        cache_podspec = request.lg_spec.spec
+      if request.podspec
+        cache_podspec = request.podspec
       else
         cache_podspec = LProject.shared.cache_specs[name]
-        request.lg_spec = LgPodPlugin::PodSpec.form_pod_spec cache_podspec if cache_podspec
+        request.podspec = cache_podspec if cache_podspec
       end
       destination = self.download_params["destination"]
       cache_pod_spec_path = self.download_params["cache_pod_spec_path"]
-      # podspec.json 不存在
-      unless cache_podspec
-        local_spec_path = destination.glob("#{name}.podspec{,.json}").last
+      if cache_podspec.nil?
+        local_spec_path = Pathname(destination).glob("#{name}.podspec{,.json}").last
         if local_spec_path && File.exist?(local_spec_path)
           cache_podspec = Pod::Specification.from_file local_spec_path
           if cache_podspec
             LProject.shared.cache_specs[name] = cache_podspec
+            LCache.copy_and_clean nil, destination, cache_podspec
             LCache.write_spec cache_podspec, cache_pod_spec_path
-            LCache.clean_pod_unused_files destination, cache_podspec
           end
         end
-        request.lg_spec = LgPodPlugin::PodSpec.form_pod_spec cache_podspec if cache_podspec
+        request.podspec = cache_podspec if cache_podspec
+      else
+        LProject.shared.cache_specs[name] = cache_podspec
+        LCache.copy_and_clean nil, destination, cache_podspec
+        LCache.write_spec cache_podspec, cache_pod_spec_path
       end
       # 判断缓存是否下载成功
-      if (destination && File.exist?(destination) && !Pathname(destination).children.empty?) && (cache_pod_spec_path && File.exist?(cache_pod_spec_path))
+      if destination && destination.exist? && !destination.children.empty?
         pod_is_exist = true
       else
         pod_is_exist = false
@@ -65,7 +68,7 @@ module LgPodPlugin
 
       git = checkout_options[:git]
       return unless git
-      cache_podspec = request.lg_spec.spec if request.lg_spec
+      cache_podspec = request.podspec
       branch = checkout_options[:branch] ||= request.params[:branch]
       checkout_options[:name] = name if name
       checkout_options[:branch] = branch if branch

data/lib/lg_pod_plugin/installer/main.rb

@@ -16,9 +16,14 @@ module LgPodPlugin
       end
     end
 
+    def self.ensure_matching_version
+      cache = Pod::Downloader::Cache.new(LFileManager.cache_root_path)
+    end
+
     public
     def self.run(command, options = {})
       clean_sandbox()
+      ensure_matching_version()
       workspace = Pathname(Dir.pwd)
       update = (command == "update")
       LSqliteDb.shared.init_database

data/lib/lg_pod_plugin/net/l_uri.rb

@@ -35,46 +35,13 @@ module LgPodPlugin
       @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
-
     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
-
-    # 获取 ip 地址
-    # private
-    # def getaddress(uri)
-    #   begin
-    #     if self.is_address(uri.host)
-    #       ip = uri.host
-    #       return ip
-    #     else
-    #       ip_address = Resolv.getaddress uri.host
-    #       return ip_address
-    #     end
-    #   rescue
-    #     result = %x(ping #{uri.host} -t 1)
-    #     return if !result || result == "" || result.include?("timeout")
-    #     match = %r{\d+.\d+.\d+.\d+}.match(result)
-    #     return if match.nil?
-    #     ip_address = match ? match[0] : ""
-    #     begin
-    #       return ip_address if IPAddr.new(ip_address)
-    #     rescue => exception
-    #       LgPodPlugin.log_red exception
-    #       return nil
-    #     end
-    #   end
-    # end
-
+    
     public def to_s
       return "" unless @uri
       @uri.to_s

data/lib/lg_pod_plugin/pod/external_pod.rb

@@ -1,5 +1,4 @@
 
-require_relative '../config/podspec'
 
 module LgPodPlugin
 

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

@@ -1,7 +1,7 @@
 require 'cocoapods'
 require 'cocoapods-core'
 require 'cocoapods/user_interface'
-require_relative '../config/podspec'
+# require_relative '../config/podspec'
 require_relative '../installer/concurrency'
 
 module LgPodPlugin
@@ -46,7 +46,8 @@ module LgPodPlugin
             http = "https://ghproxy.com/" + http
             source["http"] = http
           end
-          requirements = {:http => http }
+          version = attributes_hash["version"] ||= ""
+          requirements = {:http => http, :version => version}
         elsif git && tag
           tag = tag.to_s unless LUtils.is_a_string? tag
           requirements = { :git => git, :tag => tag }
@@ -55,8 +56,7 @@ module LgPodPlugin
         end
         next if check_release_pod_exist(pod_name, requirements, spec, true)
         LProject.shared.cache_specs[pod_name] = spec
-        lg_spec = LgPodPlugin::PodSpec.form_pod_spec spec
-        release_pod = ReleasePod.new(nil, pod_name, requirements, lg_spec)
+        release_pod = ReleasePod.new(nil, pod_name, requirements, spec)
         pod_install = LgPodPlugin::LPodInstaller.new
         download_params = pod_install.install(release_pod)
         all_installers.append pod_install if download_params

data/lib/lg_pod_plugin/utils/file_path.rb

@@ -23,6 +23,11 @@ module LgPodPlugin
       return self.download_director.join(director)
     end
 
+    def self.cache_root_path
+      cache_path = Pod::Config.instance.cache_root + 'Pods'
+      cache_path
+    end
+
   end
 
 end

data/lib/lg_pod_plugin/utils/l_util.rb

@@ -1,36 +1,12 @@
-require 'json'
-require 'resolv'
-require "ipaddr"
-require 'base64'
-require 'fileutils'
-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.md5(text)
       return "" unless text
       return Digest::MD5.hexdigest(text)
     end
 
-    def self.base64_encode(text)
-      Base64.encode64(text)
-    end
-
-    def self.base64_decode(text)
-      Base64.decode64(text)
-    end
-
     #判断对象是不是 String
     def self.is_a_string?(obj)
       if "#{obj.class}" == "String"

data/lib/lg_pod_plugin/version.rb

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

data/lib/lg_pod_plugin.rb

@@ -22,7 +22,7 @@ require_relative 'lg_pod_plugin/utils/l_util'
 require_relative 'lg_pod_plugin/git/gitlab_api'
 require_relative 'lg_pod_plugin/net/net-ping'
 require_relative 'lg_pod_plugin/git/gitlab_archive'
-require_relative 'lg_pod_plugin/config/lockfile_model'
+# require_relative 'lg_pod_plugin/config/lockfile_model'
 require_relative 'lg_pod_plugin/downloader/downloader'
 require_relative 'lg_pod_plugin/git/git_download'
 require_relative 'lg_pod_plugin/git/git_clone'