lg_pod_plugin 1.1.7.3 → 1.1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d4ceb34301dcc5a0312f8591cdbde166e1a4b7e2cb8a885738fa6997192de8
-  data.tar.gz: 0f770eba1a322ed7294d68d7ed81f9aef997f546a0d9c3c61f315cb563824e8d
+  metadata.gz: 64cfe9f5818b1ad35a426e047a1639889db338c028923af2e2cbc9c4e31556da
+  data.tar.gz: ce53c502a2bbbeb261dfe3dc048a8e423848f7f29633956447c0abe1b474712d
 SHA512:
-  metadata.gz: 06506e9cd1131a5932ea3e550cc641832f13f194cd9427edfafcff2bcdd93758da909a8f0542c282869be565b23f42b80fee02c2e0ae52515eabefee433bcbb3
-  data.tar.gz: 72be08ac45145844d3c7082bdf1fe53e68b8892ac3bef7b9c58d6bfabe35448c2033290e66aace828a3397490e641926c8a7297c5480eb4b6cb61770da2ebc41
+  metadata.gz: 6a6f5bc095f471f44cb2effd225be4bcf1c10622374adbe7f00d2b7953f0be3b09f763307ba167456169ba862e629e0cdf3e5596228f093461ee98fb35c3b21d
+  data.tar.gz: e081fa09f5ba85d7a9a581b30a8fabf9e83ce89c200bd020b3a9bdc0a8b6b955cf61b01fd1c0279ea2dbec406f77b6b790fd42397a2989632a3eb8fa918c5f28

data/lib/command/init.rb

@@ -52,7 +52,7 @@ module LgPodPlugin
         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))
+        user_model = LUserAuthInfo.new(user_id, "", "", self.host, self.token, "", (created_at + expires_in), created_at, 1)
         LSqliteDb.shared.insert_user_info(user_model)
         LgPodPlugin.log_green "设置私人访问令牌成功"
       end

data/lib/lg_pod_plugin/db/database.rb

@@ -1,6 +1,6 @@
 require 'singleton'
-# arch = %x(ruby -v)
 require 'sqlite3'
+
 module LgPodPlugin
 
   class ProjectModel
@@ -21,36 +21,13 @@ 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 LUserAuthInfo
-    REQUIRED_ATTRS ||= %i[id username password host access_token refresh_token expires_in update_time].freeze
+    REQUIRED_ATTRS ||= %i[id username password host access_token refresh_token expires_in update_time type].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
-    def initialize(id = nil, name = nil, pwd = nil, host = nil, token = nil, refresh_token = nil, time = nil, update_time = nil)
+    def initialize(id = nil, name = nil, pwd = nil, host = nil, token = nil, refresh_token = nil, time = nil, update_time = nil, type = 0)
       self.id = id
+      self.type = type
       self.host = host
       self.password = pwd
       self.username = name
@@ -114,6 +91,13 @@ module LgPodPlugin
         self.db.execute(alter)
       end
 
+      user_sel_sql2 = "select * from sqlite_master where name = '#{K_USER_TABLE}' and sql like '%type%'; "
+      resultSetPrincipal2 = self.db.execute(user_sel_sql2)
+      if resultSetPrincipal2.count == 0
+        alter = "ALTER TABLE #{K_USER_TABLE}  ADD 'type' INT;"
+        self.db.execute(alter)
+      end
+
       #添加项目表
       sql2 = "create table if not exists #{K_USER_PROJECTS}(
         id varchar(100) primary key not null,
@@ -128,27 +112,6 @@ 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)
-      #
-      # #添加项目表
-      # 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
@@ -156,11 +119,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), 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}
+          "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), type = (:type) 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, :type => user.type}
         )
       else
-        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])
+        self.db.execute("INSERT INTO #{K_USER_TABLE} (id, username, password, host, access_token,refresh_token, expires_in, update_time, type)
+            VALUES (?, ?, ?, ?,?,?,?, ?, ?)", [user.id, user.username, user.password, user.host, user.access_token, user.refresh_token, user.expires_in, user.update_time, user.type])
       end
 
     end
@@ -179,6 +142,7 @@ module LgPodPlugin
         user_info.refresh_token = row[5]
         user_info.expires_in = row[6]
         user_info.update_time = row[7]
+        user_info.type = row[8]
       end
       user_info
     end

data/lib/lg_pod_plugin/downloader/downloader.rb

@@ -15,27 +15,18 @@ module LgPodPlugin
     # 预下载处理
     def pre_download_pod
       name = self.request.name
-      if self.request.lg_spec
-        podspec = self.request.lg_spec.spec
-      else
-        podspec = nil
-      end
+      podspec = self.request.podspec
       checkout_options = Hash.new.merge!(self.request.checkout_options)
       http = checkout_options[:http]
       git = checkout_options[:git]
       tag = checkout_options[:tag]
       branch = checkout_options[:branch]
       checkout_options[:name] = name if name
-      checkout_options[:spec] = self.request.lg_spec if podspec
       unless branch
         branch = self.request.params[:branch] if self.request.params[:branch]
         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
       if branch
         LgPodPlugin.log_green "Using `#{name}` (#{branch})"
       elsif tag
@@ -49,10 +40,13 @@ 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
-      # 发现本地有缓存, 不需要更新缓存
-      pod_is_exist, destination, cache_pod_spec = LCache.new.pod_cache_exist(name, hash_map, podspec, self.request.released_pod)
+      if request.single_git
+        commit = hash_map[:commit] unless commit
+        checkout_options[:commit] = commit if commit
+        pod_is_exist, destination, cache_pod_spec = LCache.new.pod_cache_exist(name, {:git => git}, podspec, self.request.released_pod)
+      else
+        pod_is_exist, destination, cache_pod_spec = LCache.new.pod_cache_exist(name, hash_map, podspec, self.request.released_pod)
+      end
       if pod_is_exist
         LgPodPlugin.log_green "find the cache of `#{name}`, you can use it now."
         return nil
@@ -62,42 +56,9 @@ module LgPodPlugin
         # 本地 git 下载 pod 目录
         download_params = self.pre_download_git_repository(checkout_options)
         if download_params && download_params.is_a?(Hash)
+          download_params["dirname"] = destination.dirname
           download_params["destination"] = destination
           download_params["cache_pod_spec_path"] = cache_pod_spec
-          podspec = download_params["podspec"]
-          podspec_content = download_params["podspec_content"]
-          if podspec
-            podspec_json = podspec.to_pretty_json
-            download_params["podspec_json"] = podspec_json if podspec
-            download_params["prepare_command"] = podspec.prepare_command if podspec
-            download_params.delete("podspec")
-            unless self.request.lg_spec
-              self.request.lg_spec = podspec
-            end
-          elsif podspec_content
-            path = download_params["path"]
-            podspec_path = path + "/#{name}.podspec"
-            begin
-              File.open(podspec_path,"w+") do|f|
-                f.write podspec_content
-              end
-            end
-            if File.exist?(podspec_path)
-              lg_spec = LgPodPlugin::PodSpec.form_file podspec_path
-              if lg_spec
-                self.request.lg_spec = lg_spec
-                download_params["podspec_json"] = lg_spec.to_pretty_json
-                download_params["source_files"] = lg_spec.source_files.keys
-                download_params["prepare_command"] = lg_spec.prepare_command if lg_spec.prepare_command
-                download_params.delete("podspec_content")
-              else
-                download_params["source_files"] = ["All"]
-                download_params["prepare_command"] = nil
-                download_params["podspec_json"] = podspec_content
-                download_params.delete("podspec_content")
-              end
-            end
-          end
           return download_params
         elsif File.exist?(download_params.to_s) && download_params
           FileUtils.chdir download_params

data/lib/lg_pod_plugin/downloader/l_cache.rb

@@ -1,4 +1,4 @@
-# require 'git'
+
 require 'cocoapods/downloader'
 require 'cocoapods/downloader/cache'
 require 'cocoapods/downloader/response'
@@ -12,32 +12,34 @@ module LgPodPlugin
     end
 
     public
+
     def pod_cache_exist(name, options, spec = nil, released_pod = false)
       # 参数为空不执行下载任务, 交给 cocoapods 处理下载
       if options.nil?
-        return   [true, nil, 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"
+      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?
+      if destination && destination.exist? && !destination.children.empty?
         return [true, destination, cache_pod_spec]
       else
         return [false, destination, cache_pod_spec]
       end
     end
 
-    #判断缓存是否存在且有效命中缓存
+    # 判断缓存是否存在且有效命中缓存
+
     public
+
     def find_pod_cache(name, options, spec = nil, released_pod = false)
       hash_map = Hash.new.merge!(options)
       if hash_map.has_key?(:version)
         hash_map.delete(:version)
       end
-      request = LCache.download_request(name, hash_map, spec, released_pod)
+      request = LCache.create_download_request(name, hash_map, spec, released_pod)
       destination = LCache.path_for_pod(request)
       cache_pod_spec = LCache.path_for_spec(request)
       [destination, cache_pod_spec]
@@ -48,32 +50,50 @@ module LgPodPlugin
       Pathname(path)
     end
 
-    def self.download_request(name, params, spec = nil, released_pod = false)
+    def self.create_download_request(name, params, spec = nil, released_pod = false)
       if released_pod
-        Pod::Downloader::Request.new(spec: spec, released: true , name: name, params: params)
+        Pod::Downloader::Request.new(spec: spec, released: true, name: name, params: params)
+      else
+        Pod::Downloader::Request.new(spec: nil, released: false, name: name, params: params)
+      end
+    end
+
+    def self.create_downloader_manager(request, target)
+      result = Pod::Downloader::Response.new
+      result.checkout_options = request.params
+      result.location = target
+
+      if request.released_pod?
+        result.spec = request.spec
+        podspecs = { request.name => request.spec }
       else
-        Pod::Downloader::Request.new(spec: nil, released: false , name: name, params: params)
+        podspecs = Pod::Sandbox::PodspecFinder.new(target).podspecs
+        podspecs[request.name] = request.spec if request.spec
+        podspecs.each do |name, spec|
+          if request.name == name
+            result.spec = spec
+          end
+        end
       end
+
+      [result, podspecs]
     end
-    #MARK - 缓存方法
+
+    def self.root_cache
+      cache_path = LFileManager.cache_root_path
+      return Pod::Downloader::Cache.new(cache_path)
+    end
+
+    # MARK - 缓存方法
     def self.path_for_pod(request, slug_opts = {})
-      root = self.root_path
-      root + request.slug(**slug_opts)
+      root_path + request.slug(**slug_opts)
     end
 
     def self.path_for_spec(request, slug_opts = {})
-      root = self.root_path
-      path = root + 'Specs' + request.slug(**slug_opts)
-      Pathname.new(path.to_path + '.podspec.json')
+      path = root_path + 'Specs' + request.slug(**slug_opts)
+      return 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.get_local_spec(request, target)
       result = Pod::Downloader::Response.new
       result.location = target
@@ -95,62 +115,29 @@ module LgPodPlugin
       [result, local_specs]
     end
 
-    def self.group_subspecs_by_platform(spec)
-      specs_by_platform = {}
-      [spec, *spec.recursive_subspecs].each do |ss|
-        ss.available_platforms.each do |platform|
-          specs_by_platform[platform] ||= []
-          specs_by_platform[platform] << ss
-        end
-      end
-      specs_by_platform
-    end
-
     def self.copy_and_clean(source, destination, spec)
-      specs_by_platform = group_subspecs_by_platform(spec)
-      destination.parent.mkpath
-      self.write_lock(destination) do
-        FileUtils.rm_rf(destination)
-        FileUtils.cp_r(source, destination)
-        Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
-        Pod::Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
-      end
-    end
-
-    def self.clean_pod_unused_files(destination, 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!
-      end
-    end
-
-    def self.write_lock(location, &block)
-      Pod::Downloader::Cache.lock(location, File::LOCK_SH, &block)
+      return self.root_cache.copy_and_clean(source, destination, spec)
     end
 
     public
+
     def self.write_spec(spec, path)
-      path.dirname.mkpath
-      Pod::Downloader::Cache.write_lock(path) do
-        path.open('w') { |f|
-          f.write spec.to_pretty_json
-        }
-      end
+      self.root_cache.write_spec(spec, path)
     end
 
     # 拷贝 pod 缓存文件到 sandbox
+
     public
+
     def self.cache_pod(name, target, options = {}, spec = nil, released_pod = false)
       checkout_options = Hash.new.deep_merge(options).reject do |key, val|
         !key || !val
       end
-      request = LCache.download_request(name, checkout_options, spec, released_pod)
-      _, pods_pecs = get_local_spec(request, target)
-      pods_pecs.each do |_, s_spec|
-        destination = path_for_pod(request, :name => name, :params => checkout_options)
-        if !File.exist?(destination) || destination.children.empty?
+      request = create_download_request(name, checkout_options, spec, released_pod)
+      result, pods_pecs = create_downloader_manager(request, target)
+      pods_pecs.each do |name, s_spec|
+        destination = path_for_pod request, { :name => name, :params => checkout_options }
+        if !destination.exist? || destination.children.empty?
           LgPodPlugin.log_green "Copying #{name} from `#{target}` to `#{destination}` "
           copy_and_clean(target, destination, s_spec)
         end
@@ -158,8 +145,13 @@ module LgPodPlugin
         unless File.exist?(cache_pod_spec)
           write_spec(s_spec, cache_pod_spec)
         end
+        if request.name == name
+          result.location = destination
+        end
       end
 
+      result
+
     end
 
   end