lg_pod_plugin 1.1.6.6 → 1.1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49669409fc52a28372c3033cd25e908b939267d30147689f982b84c9cea0d748
-  data.tar.gz: ddd14338375b62677fd81ee52e0a3f15170b58a852870c203b3a27f2121a7151
+  metadata.gz: 44d4ceb34301dcc5a0312f8591cdbde166e1a4b7e2cb8a885738fa6997192de8
+  data.tar.gz: 0f770eba1a322ed7294d68d7ed81f9aef997f546a0d9c3c61f315cb563824e8d
 SHA512:
-  metadata.gz: 2a9bb5866675919b09e0ebcad919085431ec96eb103caa56477356a833e9369365e9fed62506c8919866d4c6ae8ecb2bfb918a5dd22dc956cf16adc28cc674c7
-  data.tar.gz: 85604ebf38280f2c65d929dcf60c0af3a29434b244290a4f67682b337090f81e8fc93e51bd165ee10529d0ee1bd826c9ac794894e344732fc93ebbf3531c1a37
+  metadata.gz: 06506e9cd1131a5932ea3e550cc641832f13f194cd9427edfafcff2bcdd93758da909a8f0542c282869be565b23f42b80fee02c2e0ae52515eabefee433bcbb3
+  data.tar.gz: 72be08ac45145844d3c7082bdf1fe53e68b8892ac3bef7b9c58d6bfabe35448c2033290e66aace828a3397490e641926c8a7297c5480eb4b6cb61770da2ebc41

data/lib/command/command.rb

@@ -6,6 +6,7 @@ module LgPodPlugin
     require_relative 'update'
     require_relative 'init'
     require_relative 'install'
+    require_relative 'doctor'
     self.command = 'lg'
     self.version = VERSION
     self.abstract_command = true

data/lib/command/doctor.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require 'claide'
+require_relative 'command'
+
+module LgPodPlugin
+  class Command
+    class Doctor < Command
+      self.abstract_command = false
+      self.summary = 'Manipulate the CocoaPods cache'
+
+      self.description = <<-DESC
+        Manipulate the download cache for pods, like printing the cache content
+        or cleaning the pods cache.
+      DESC
+
+      def initialize(argv)
+        # pp argv
+        super
+      end
+
+      def run
+        pwd = Pathname.new(File.dirname(__FILE__)).realpath
+        exexPath = pwd.parent.join("lg_pod_plugin/installer")
+        FileUtils.chdir  exexPath
+        pp  "sudo xattr -rd com.apple.quarantine ./PodDownload"
+        result = %x(sudo xattr -rd com.apple.quarantine ./PodDownload)
+      end
+
+    end
+  end
+end

data/lib/command/init.rb

@@ -1,4 +1,5 @@
 require 'claide'
+require 'json'
 require_relative 'command'
 
 module LgPodPlugin
@@ -7,8 +8,7 @@ module LgPodPlugin
       self.command = "init"
       self.abstract_command = false
       self.summary = '初始化gitlab projects 信息'
-      attr_accessor :username
-      attr_accessor :password
+      attr_accessor :token
       attr_accessor :host
       self.description = <<-DESC
         Manipulate the download cache for pods, like printing the cache content
@@ -17,16 +17,44 @@ module LgPodPlugin
 
       def initialize(argv)
         self.host = argv.option('host')
-        self.username = argv.option('username')
-        self.password = argv.option('password')
+        self.token = argv.option('token')
         super
       end
 
       def run
-        raise unless self.host
-        raise unless self.username
-        raise unless self.password
-        GitLabAPI.request_gitlab_access_token(self.host, self.username, self.password)
+        if self.host.nil? || self.host == ""
+          LgPodPlugin.log_red  "传入host不能为空"
+          return
+        end
+        if self.token.nil? || self.token == ""
+          LgPodPlugin.log_red "传入token不能为空"
+          return
+        end
+        token_vaild = GitLabAPI.request_user_emails(self.host, self.token)
+        if token_vaild == "invalid token"
+          LgPodPlugin.log_red "无效的access_token, 请检查私人令牌是否在有限期内"
+          return
+        end
+        refresh_token = ""
+        expires_in = 7879680
+        created_at = Time.now.to_i
+        encrypt_access_token = LUtils.encrypt(self.token, "AZMpxzVxzbo3sFDLRZMpxzVxzbo3sFDZ")
+        hash = {"access_token": encrypt_access_token}
+        hash["token_type"] = "Bearer"
+        hash["expires_in"] = expires_in
+        hash["scope"] = "api"
+        hash["created_at"] = created_at
+        hash["refresh_token"] = refresh_token
+        db_path = LFileManager.download_director.join("database")
+        db_path.mkdir unless db_path.exist?
+        token_file = db_path.join("access_token.json")
+        str = JSON.generate(hash)
+        File.open(token_file.to_path, 'w+') { |f| f.write(str) }
+        LSqliteDb.shared.init_database
+        user_id = LUserAuthInfo.get_user_id(self.host)
+        user_model = LUserAuthInfo.new(user_id, "", "", self.host, self.token, "", (created_at + expires_in))
+        LSqliteDb.shared.insert_user_info(user_model)
+        LgPodPlugin.log_green "设置私人访问令牌成功"
       end
 
     end

data/lib/command/install.rb

@@ -42,7 +42,7 @@ module LgPodPlugin
         self.log = argv.flag?('verbose')
         repo_flag = argv.flag?('repo-update')
         if repo_flag.nil?
-          self.repo_update = true
+          self.repo_update = false
         else
           self.repo_update = repo_flag
         end

data/lib/command/update.rb

@@ -29,7 +29,7 @@ module LgPodPlugin
         self.log = argv.flag?('verbose')
         repo_flag = argv.flag?('repo-update')
         if repo_flag.nil?
-          self.repo_update = true
+          self.repo_update = false
         else
           self.repo_update = repo_flag
         end

data/lib/lg_pod_plugin/config/l_config.rb

@@ -17,29 +17,16 @@ module LgPodPlugin
 
     public
     def self.get_config(git, uri)
-      return nil unless uri&.host
+      return nil unless uri&.hostname
       return nil unless LUtils.is_gitlab_uri(git, uri.hostname)
       user_id = LUserAuthInfo.get_user_id(uri.hostname)
       user_info = LSqliteDb.shared.query_user_info(user_id)
-      # 用户授权 token 不存在, 提示用户输入用户名密码
-      unless user_info
-        user_info = GitLabAPI.get_gitlab_access_token_input(uri, user_id,nil ,nil )
-        return nil unless user_info
-      end
-      time_now = Time.now.to_i
-      # 判断 token 是否失效
-      if user_info.expires_in <= time_now
-        # 刷新 token 失败时, 通过已经保存的用户名密码来刷新 token
-        new_user_info = GitLabAPI.refresh_gitlab_access_token uri.hostname, user_info.refresh_token
-        if new_user_info.nil?
-          username = user_info.username
-          password = user_info.password
-          user_info = GitLabAPI.get_gitlab_access_token_input(uri, user_id, username, password)
-          return nil unless user_info
-        else
-          user_info = new_user_info
-        end
+      if user_info != nil
+        user_info = GitLabAPI.check_gitlab_access_token_valid(uri, user_info)
+      else
+        user_info = GitLabAPI.get_gitlab_access_token(uri, user_id)
       end
+      return nil unless user_info
       config = LConfig.new
       config.host = uri.hostname
       config.access_token = user_info.access_token

data/lib/lg_pod_plugin/db/database.rb

@@ -1,10 +1,6 @@
 require 'singleton'
-arch = %x(ruby -v)
-if arch.include?("arm64")
-  require_relative '../../sqlite3-1.5.3-arm64-darwin/lib/sqlite3'
-else
-  require_relative '../../sqlite3-1.5.3-x86_64-darwin/lib/sqlite3'
-end
+# arch = %x(ruby -v)
+require 'sqlite3'
 module LgPodPlugin
 
   class ProjectModel
@@ -25,41 +21,42 @@ module LgPodPlugin
 
   end
 
-  class LPodLatestRefs
-    attr_accessor :id
-    attr_accessor :name
-    attr_accessor :tag
-    attr_accessor :git
-    attr_accessor :branch
-    attr_accessor :commit
-
-    def initialize(id, name, git, branch, tag, commit)
-      self.id = id
-      self.git = git
-      self.tag = tag
-      self.name = name
-      self.branch = branch
-      self.commit = commit
-    end
-
-    def self.get_pod_id(name, git, branch)
-      key = name + git + branch
-      return Digest::MD5.hexdigest(key)
-    end
-
-  end
+  # class LPodLatestRefs
+  #   attr_accessor :id
+  #   attr_accessor :name
+  #   attr_accessor :tag
+  #   attr_accessor :git
+  #   attr_accessor :branch
+  #   attr_accessor :commit
+  #
+  #   def initialize(id, name, git, branch, tag, commit)
+  #     self.id = id
+  #     self.git = git
+  #     self.tag = tag
+  #     self.name = name
+  #     self.branch = branch
+  #     self.commit = commit
+  #   end
+  #
+  #   def self.get_pod_id(name, git, branch)
+  #     key = name + git + branch
+  #     return Digest::MD5.hexdigest(key)
+  #   end
+  #
+  # end
 
   class LUserAuthInfo
-    REQUIRED_ATTRS ||= %i[id username password host access_token refresh_token expires_in].freeze
+    REQUIRED_ATTRS ||= %i[id username password host access_token refresh_token expires_in update_time].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
-    def initialize(id = nil, name = nil, pwd = nil, host = nil, token = nil, refresh_token = nil, time = nil)
+    def initialize(id = nil, name = nil, pwd = nil, host = nil, token = nil, refresh_token = nil, time = nil, update_time = nil)
       self.id = id
       self.host = host
       self.password = pwd
       self.username = name
       self.expires_in = time
       self.access_token = token
+      self.update_time = update_time
       self.refresh_token = refresh_token
     end
 
@@ -110,6 +107,13 @@ module LgPodPlugin
         expires_in TimeStamp NOT NULL DEFAULT CURRENT_TIMESTAMP);"
       self.db.execute(sql1)
 
+      sel_sql = "select * from sqlite_master where name = '#{K_USER_TABLE}' and sql like '%update_time%'; "
+      resultSetPrincipal = self.db.execute(sel_sql)
+      if resultSetPrincipal.count == 0
+        alter = "ALTER TABLE #{K_USER_TABLE}  ADD 'update_time' TimeStamp;"
+        self.db.execute(alter)
+      end
+
       #添加项目表
       sql2 = "create table if not exists #{K_USER_PROJECTS}(
         id varchar(100) primary key not null,
@@ -124,26 +128,27 @@ module LgPodPlugin
        );"
       self.db.execute(sql2)
 
-      #添加项目表
-      sql3 = "create table if not exists #{K_POD_LATEST_REFS}(
-        id varchar(100) primary key not null,
-        name varchar(100),
-	      git varchar(100),
-	      branch varchar(100),
-        tag varchar(100),
-        sha varchar(100)
-        );"
-      self.db.execute(sql3)
+      # #添加项目表
+      # sql3 = "create table if not exists #{K_POD_LATEST_REFS}(
+      #   id varchar(100) primary key not null,
+      #   name varchar(100),
+	    #   git varchar(100),
+	    #   branch varchar(100),
+      #   tag varchar(100),
+      #   sha varchar(100)
+      #   );"
+      # self.db.execute(sql3)
+      #
+      # #添加项目表
+      # sql4 = "create table if not exists #{K_POD_SHA_BRANCH}(
+      #   id varchar(100) primary key not null,
+      #   name varchar(100),
+      #   git varchar(100),
+	    #   branch varchar(100),
+      #   sha varchar(100)
+      #   );"
+      # self.db.execute(sql4)
 
-      #添加项目表
-      sql4 = "create table if not exists #{K_POD_SHA_BRANCH}(
-        id varchar(100) primary key not null,
-        name varchar(100),
-        git varchar(100),
-	      branch varchar(100),
-        sha varchar(100)
-        );"
-      self.db.execute(sql4)
     end
 
     public
@@ -151,11 +156,11 @@ module LgPodPlugin
       # pp "user.id => #{user.id}"
       if self.query_user_info(user.id) != nil
         self.db.execute_batch(
-          "UPDATE #{K_USER_TABLE} SET username = (:username), password = (:password), host = (:host), access_token = (:access_token), expires_in = (:expires_in), refresh_token = (:refresh_token) where (id = :id)", { "username" => user.username, "password" => user.password, "host" => user.host, "access_token" => user.access_token, :expires_in => user.expires_in, :id => user.id, :refresh_token => user.refresh_token }
+          "UPDATE #{K_USER_TABLE} SET username = (:username), password = (:password), host = (:host), access_token = (:access_token), expires_in = (:expires_in), refresh_token = (:refresh_token), update_time = (:update_time) where (id = :id)", { "username" => user.username, "password" => user.password, "host" => user.host, "access_token" => user.access_token, :expires_in => user.expires_in, :id => user.id, :refresh_token => user.refresh_token , :update_time => user.update_time}
         )
       else
-        self.db.execute("INSERT INTO #{K_USER_TABLE} (id, username, password, host, access_token,refresh_token, expires_in)
-            VALUES (?, ?, ?, ?,?,?,?)", [user.id, user.username, user.password, user.host, user.access_token, user.refresh_token, user.expires_in])
+        self.db.execute("INSERT INTO #{K_USER_TABLE} (id, username, password, host, access_token,refresh_token, expires_in, update_time)
+            VALUES (?, ?, ?, ?,?,?,?, ?)", [user.id, user.username, user.password, user.host, user.access_token, user.refresh_token, user.expires_in, user.update_time])
       end
 
     end
@@ -173,6 +178,7 @@ module LgPodPlugin
         user_info.access_token = row[4]
         user_info.refresh_token = row[5]
         user_info.expires_in = row[6]
+        user_info.update_time = row[7]
       end
       user_info
     end
@@ -220,67 +226,67 @@ module LgPodPlugin
       ps.execute('n' => project_id)
     end
 
-    def insert_pod_refs(name, git, branch, tag, commit)
-      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(
-          "UPDATE #{K_POD_LATEST_REFS} SET name = (:name), git = (:git), branch = (:branch), tag = (:tag), sha = (:sha) where (id = :id)", { "name" => pod.name, "git" => pod.git, "sha" => pod.commit, "branch" => pod.branch, :tag => pod.tag, :id => pod.id }
-        )
-      else
-        self.db.execute("INSERT INTO #{K_POD_LATEST_REFS} (id, name, git, branch, tag, sha)
-            VALUES (?, ?, ?, ?, ?, ?)", [pod.id, pod.name, pod.git, pod.branch, pod.tag, pod.commit])
-      end
-      self.insert_pod_sha_with_branch(name, git, commit, branch)
-    end
-
-    def query_pod_refs(id)
-      pod_info = nil
-      self.db.execute("select * from #{K_POD_LATEST_REFS} where id = '#{id}';") do |row|
-        id = row[0]
-        name = row[1]
-        git = row[2]
-        branch = row[3]
-        tag = row[4]
-        commit = row[5]
-        pod_info = LPodLatestRefs.new(id, name, git, branch, tag, commit)
-      end
-      pod_info
-    end
+    # def insert_pod_refs(name, git, branch, tag, commit)
+    #   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(
+    #       "UPDATE #{K_POD_LATEST_REFS} SET name = (:name), git = (:git), branch = (:branch), tag = (:tag), sha = (:sha) where (id = :id)", { "name" => pod.name, "git" => pod.git, "sha" => pod.commit, "branch" => pod.branch, :tag => pod.tag, :id => pod.id }
+    #     )
+    #   else
+    #     self.db.execute("INSERT INTO #{K_POD_LATEST_REFS} (id, name, git, branch, tag, sha)
+    #         VALUES (?, ?, ?, ?, ?, ?)", [pod.id, pod.name, pod.git, pod.branch, pod.tag, pod.commit])
+    #   end
+    #   self.insert_pod_sha_with_branch(name, git, commit, branch)
+    # end
+    #
+    # def query_pod_refs(id)
+    #   pod_info = nil
+    #   self.db.execute("select * from #{K_POD_LATEST_REFS} where id = '#{id}';") do |row|
+    #     id = row[0]
+    #     name = row[1]
+    #     git = row[2]
+    #     branch = row[3]
+    #     tag = row[4]
+    #     commit = row[5]
+    #     pod_info = LPodLatestRefs.new(id, name, git, branch, tag, commit)
+    #   end
+    #   pod_info
+    # end
 
     # 保存 sha, branch 到数据库
-    def insert_pod_sha_with_branch(name, git, sha, branch)
-      return unless name && git && sha
-      id = Digest::MD5.hexdigest(name + git + sha)
-      if self.query_branch_with_sha(name, git, sha)[:sha] != nil
-        self.db.execute_batch(
-          "UPDATE #{K_POD_SHA_BRANCH} SET name = (:name), git = (:git), branch = (:branch), sha = (:sha) where (id = :id)", { "name" => name, "git" => git, "branch" => branch, :id => id, :sha => sha }
-        )
-      else
-        self.db.execute("INSERT INTO #{K_POD_SHA_BRANCH} (id, name, git, branch, sha)
-            VALUES (?, ?, ?, ?, ?)", [id, name, git, branch, sha])
-      end
-    end
+    # def insert_pod_sha_with_branch(name, git, sha, branch)
+    #   return unless name && git && sha
+    #   id = Digest::MD5.hexdigest(name + git + sha)
+    #   if self.query_branch_with_sha(name, git, sha)[:sha] != nil
+    #     self.db.execute_batch(
+    #       "UPDATE #{K_POD_SHA_BRANCH} SET name = (:name), git = (:git), branch = (:branch), sha = (:sha) where (id = :id)", { "name" => name, "git" => git, "branch" => branch, :id => id, :sha => sha }
+    #     )
+    #   else
+    #     self.db.execute("INSERT INTO #{K_POD_SHA_BRANCH} (id, name, git, branch, sha)
+    #         VALUES (?, ?, ?, ?, ?)", [id, name, git, branch, sha])
+    #   end
+    # end
 
     # 通过 sha 查询对应 branch
-    def query_branch_with_sha(id = nil, name, git, sha)
-      hash_map = Hash.new
-      id = Digest::MD5.hexdigest(name + git + sha) unless id
-      self.db.execute("select * from #{K_POD_SHA_BRANCH} where id = '#{id}' and name = '#{name}' and git = '#{git}' ;") do |row|
-        new_id = row[0]
-        new_sha = row[4]
-        new_git = row[2]
-        new_name = row[1]
-        new_branch = row[3]
-        hash_map[:id] = new_id
-        hash_map[:git] = new_git
-        hash_map[:sha] = new_sha
-        hash_map[:name] = new_name
-        hash_map[:branch] = new_branch
-      end
-      hash_map
-    end
-
+  #   def query_branch_with_sha(id = nil, name, git, sha)
+  #     hash_map = Hash.new
+  #     id = Digest::MD5.hexdigest(name + git + sha) unless id
+  #     self.db.execute("select * from #{K_POD_SHA_BRANCH} where id = '#{id}' and name = '#{name}' and git = '#{git}' ;") do |row|
+  #       new_id = row[0]
+  #       new_sha = row[4]
+  #       new_git = row[2]
+  #       new_name = row[1]
+  #       new_branch = row[3]
+  #       hash_map[:id] = new_id
+  #       hash_map[:git] = new_git
+  #       hash_map[:sha] = new_sha
+  #       hash_map[:name] = new_name
+  #       hash_map[:branch] = new_branch
+  #     end
+  #     hash_map
+  #   end
+  #
   end
 
 end

data/lib/lg_pod_plugin/downloader/downloader.rb

@@ -32,10 +32,10 @@ module LgPodPlugin
         checkout_options[:branch] = branch if branch
       end
       commit = checkout_options[:commit]
-      unless commit
-        commit = self.request.params[:commit] if self.request.params[:commit]
-        checkout_options[:commit] = commit if commit
-      end
+      # unless commit
+      #   commit = self.request.params[:commit] if self.request.params[:commit]
+      #   checkout_options[:commit] = commit if commit
+      # end
       if branch
         LgPodPlugin.log_green "Using `#{name}` (#{branch})"
       elsif tag
@@ -49,8 +49,8 @@ module LgPodPlugin
         LgPodPlugin.log_green "Using `#{name}`"
       end
       hash_map = self.request.get_cache_key_params
-      self.request.checkout_options.delete(:branch) if commit
-      self.request.checkout_options[:commit] = commit if commit
+      # self.request.checkout_options.delete(:branch) if commit
+      # self.request.checkout_options[:commit] = commit if commit
       # 发现本地有缓存, 不需要更新缓存
       pod_is_exist, destination, cache_pod_spec = LCache.new.pod_cache_exist(name, hash_map, podspec, self.request.released_pod)
       if pod_is_exist
@@ -58,6 +58,7 @@ module LgPodPlugin
         return nil
       else
         LgPodPlugin.log_green "find the new commit of `#{name}`, Git downloading now."
+
         # 本地 git 下载 pod 目录
         download_params = self.pre_download_git_repository(checkout_options)
         if download_params && download_params.is_a?(Hash)

data/lib/lg_pod_plugin/downloader/l_cache.rb

@@ -13,7 +13,16 @@ module LgPodPlugin
 
     public
     def pod_cache_exist(name, options, spec = nil, released_pod = false)
+      # 参数为空不执行下载任务, 交给 cocoapods 处理下载
+      if options.nil?
+        return   [true, nil, nil]
+      end
+
       destination, cache_pod_spec = self.find_pod_cache name, options, spec, released_pod
+      lock_temp_file = destination.to_path+ ".lock"
+      if File.exist?(lock_temp_file)
+        FileUtils.rm_rf lock_temp_file
+      end
       if (File.exist?(destination) && !destination.children.empty?) && cache_pod_spec.exist?
         return [true, destination, cache_pod_spec]
       else
@@ -29,8 +38,8 @@ module LgPodPlugin
         hash_map.delete(:version)
       end
       request = LCache.download_request(name, hash_map, spec, released_pod)
-      destination = LCache.path_for_pod(request, {})
-      cache_pod_spec = LCache.path_for_spec(request, {})
+      destination = LCache.path_for_pod(request)
+      cache_pod_spec = LCache.path_for_spec(request)
       [destination, cache_pod_spec]
     end