stool 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9087dc7a077981a605928ca0ddf072cdf0f89da5
-  data.tar.gz: 43801ab73b2147d3c025909c5558ddc9a1cf05a0
+  metadata.gz: ca7802d81948fa28cf6f1e5f6b58af037f4486f0
+  data.tar.gz: e96efdffc43381497d9daa490ec34c4953c7389b
 SHA512:
-  metadata.gz: 8e08b78b68d280ab6cc36f6a3f7746d3c946a3c5bdff0e8a417e69402082332322c8b59a32281e1360ffc27529aa7abaaf1014ca17a981b9722513ed8d14eb1c
-  data.tar.gz: 49f84777e00d90b37140dced8194c6d7d19e64297494e3bc2155806fd1dcba6af7843b7e1b423e717734ec5d1cc3b886d359d623dd00ead72d0afc64312e62a7
+  metadata.gz: 96b36aeb50ae71d9e0a2e838255e3ba7c8f52554d70773d742a27b2a247e42c965d75209296a5a58809760581f564e6b17fa023bd98d004aca12e0f173dea552
+  data.tar.gz: 3b56660f045840b496fa14a45fb569863eba8644b108e28be1953ddfb7d44d6aebb53fff0ddb42d73c9fe39353d0fbc2e498f1b067b690722bb5e899406d773c

data/lib/stool/Command/Lib.rb

@@ -77,8 +77,7 @@ module Stool
       #   }
       #
       #   arr
-      # end
-
+      # end    
     end
   end
 end

data/lib/stool/Command/LibPool/Add.rb

@@ -1,7 +1,4 @@
 #添加一个池
-
-require 'yaml'
-
 module Stool
   class Command
     class LibPool < Command
@@ -93,4 +90,4 @@ module Stool
       end
     end
   end
-end
+end

data/lib/stool/Command/Repo/CacheClean.rb

@@ -0,0 +1,32 @@
+#查看当前pool列表
+module Stool
+  class Command
+    class Repo < Command
+      class CacheClean < Repo
+
+        self.command = 'cc'
+        self.summary = '清除相关缓存'
+
+        self.arguments = [
+            CLAide::Argument.new('NAME',   false),
+        ]
+
+        def initialize(argv)
+          super
+        end
+
+        #查看当前的pool list
+        def run
+          pp('')
+          pp('**Pool list')
+          List::pools_from_config.map do |pInfo|
+            pInfo.info_tos
+          end
+        end
+
+        @public
+
+      end
+    end
+  end
+end

data/lib/stool/Command/Repo.rb

@@ -0,0 +1,21 @@
+#私有库的池，池中有多个lib
+require 'Core/RepoInfo'
+
+module Stool
+  class Command
+    class Repo < Command
+
+      require 'Command/Repo/CacheClean'
+
+      self.abstract_command = true
+      self.command = 'rp'
+      self.summary = 'cocoapods的repos信息，及相关操作'
+      # self.default_subcommand = 'list'
+
+      def initialize(argv)
+        super
+      end
+
+    end
+  end
+end

data/lib/stool/Command/WorkSpace/list.rb

@@ -1,7 +1,5 @@
 #查看当前workspace列表
 
-require 'yaml'
-
 module Stool
   class Command
     class WorkSpace < Command

data/lib/stool/Command/WorkSpace/update.rb

@@ -1,4 +1,5 @@
 #对执行pod update的整合
+require 'Utils/ArrayUtile'
 
 module Stool
   class Command
@@ -21,36 +22,27 @@ module Stool
           unless @tag
             help! 'need the tag of workspace you configed.'
           end
-
           unless existAtConfig?
             help! "To run, please ensure the tag(#{@tag}) exist."
           end
-
           unless hasPodfile?(@info.path)
             help! 'To run, please ensure the workspace contain a podfile in zhe folder.' + "#{@info.path}"
           end
-
           super
         end
 
         @public
 
         def run
-          repos_up
-
+          # repos_up
           localLibs_git_up
-
-          @info.task_git_up
-
-          @info.edit_podfile_use_loaclLibs
-
-          del_folers
-
-          pod_update
-
-          @info.resetPofile
-
-          @info.open_task
+          # @info.task_git_up
+          # @info.edit_podfile_use_loaclLibs
+          # del_folers
+          # check_lastUpdate
+          # pod_update
+          # @info.resetPofile
+          # @info.open_task
         end
 
         #更新相关repo(除了master)
@@ -86,26 +78,48 @@ module Stool
           end
         end
 
+        include ArrayUtile
+        #检测上一次更新用到的lib，源码是否与本次有冲突
+        def check_lastUpdate
+          lastTaskInfo = TaskInfo::fromYAML(pathForTaskInfo_last_pod_update)
+          unless lastTaskInfo
+            cleanAllCache
+            return
+          end
+
+          if lastTaskInfo.allUseCode != @info.allUseCode
+            cleanAllCache
+            return
+          end
+
+          diff = diffOf(lastTaskInfo.otherCode,@info.otherCode)
+          diff.each do |x|
+            puts "--- 清除lib缓存:#{x} ..."
+            `pod cache clean #{x} --all`
+          end
+        end
+
         #执行pod update
         def pod_update
           useCode = @info.localLibs + @info.otherCode
-
           useCode.collect! {|item|
-
             item + "_use_code=1 "
           }
+          libs_useCode = useCode.join
+          if @info.allUseCode
+            libs_useCode = 'use_code=1' + libs_useCode
+          end
 
-          puts "---源码库有" + useCode.join
+          @info.doCacheByYAML(pathForTaskInfo_last_pod_update)
 
+          puts "---源码库有" + libs_useCode
           Dir.chdir(@info.path)
-
           puts '---当前目录' + Dir.getwd
-
           puts "---update中...."
-          puts `#{useCode.join} pod update --no-repo-update`
+          # puts `#{libs_useCode} pod update --no-repo-update`
         end
 
       end
     end
   end
-end
+end

data/lib/stool/Command/WorkSpace.rb

@@ -48,6 +48,7 @@ module Stool
         @info
       end
 
+      #获取task用的所有repos
       def getAllRepos
         arr = []
         if @info.repos.count == 0
@@ -63,6 +64,34 @@ module Stool
         arr
       end
 
+      def pathForTaskInfo_last_pod_update
+        unless Dir.exist?(Config::logsDirPath)
+          Dir.mkdir(Config::logsDirPath)
+        end
+        File.join(Config::logsDirPath, 'TaskInfo_lastUpdate.yaml')
+      end
+
+      #清理所有pod缓存（除master repo的pod）
+      def cleanAllCache
+        puts "clean all cache"
+        hasClean = []
+        path = @@config.repoCachePath
+        Dir.entries(path).each{|file|
+          if file['.'] || file.eql?('master')
+            #do nothing
+          else
+            podCache = File.join(path,file)
+            Dir.entries(podCache).sort.each{|podName|
+              unless hasClean.include?(podName) || podName['.']
+                puts "清理缓存#{podName} "
+                puts `pod cache clean #{podName}`
+                hasClean.push(podName)
+              end
+            }
+          end
+        }
+      end
+
     end
   end
 end

data/lib/stool/Core/BaseObj.rb

@@ -1,9 +1,14 @@
+
+# require 'Object'
+require 'yaml'
+
 module Stool
-  class BaseObj
+  class BaseObj < Object
 
     @public
 
     def initialize
+      super
       yield self if block_given?
     end
 
@@ -14,5 +19,20 @@ module Stool
       end
     end
 
+    #加载从yaml
+    def self.fromYAML(path)
+      if File.exist?(path)
+        content = File.open(path)
+        YAML.load(content)
+      end
+    end
+
+    #以yaml缓存
+    def doCacheByYAML(path)
+      if path
+        File.open(path, "w") { |file| YAML.dump(self, file) }
+      end
+    end
+
   end
 end

data/lib/stool/Core/Cache.rb

@@ -0,0 +1,6 @@
+
+module Stool
+  class Cache
+    @@pathForSysCache = File.join('stool','slCache')
+  end
+end

data/lib/stool/Core/Config.rb

@@ -6,18 +6,19 @@ require 'Core/TaskInfo'
 module Stool
   class Config < BaseObj
 
-    #cache路径
+    @public
+    #cache相关的路径
     @@cachePath = File.join(Dir.home(),'stool')
     @@configFilePath = File.join(@@cachePath, 'ConfigFile.rb')
+    @@logsDirPath = File.join(@@cachePath, 'log')
+
     #本地lib池子
     attr_accessor :pools
     #主工程
     attr_accessor :tasks
-
+    #cocoapods的repo缓存路径
     attr_accessor :repoCachePath
 
-    @public
-
     def initialize
       @repoCachePath = File.join(Dir.home,'.cocoapods/repos')
       @pools = []
@@ -25,6 +26,10 @@ module Stool
       super
     end
 
+    def self.logsDirPath
+      @@logsDirPath
+    end
+
     #从配置中心读取
     def self.loadConfig
       checkConfigFile?
@@ -76,7 +81,6 @@ module Stool
       demo = <<-EOF
         #stool 配置
         Config.new do |c|
-
           #添加一个本地lib pool
           c.addPool do |p|
             p.name = '本地lib池 - 凤凰'
@@ -95,11 +99,15 @@ module Stool
             t.tag = '1'
             t.path = '/Users/syswin/Documents/Siyuan/Libs/phenix/tlauncher/TLauncher'
             #项目使用的本地lib，默认都是源码
-            t.localLibs = ['tcardReader',
+            addLocalLib(['tcardReader',
               'tcardLibrary',
               'tcardKit',
               'tcontentGroup',
-              'tcontentCommon']
+              'tcontentCommon'])
+            #非本地lib，配置使用源码
+            addOtherLibUseCode(['tcard'])
+            #是否所有lib都使用源码，默认false
+            #allLibsUseCode
           end
 
         end

data/lib/stool/Core/LibInfo.rb

@@ -88,9 +88,13 @@ module Stool
         Dir.chdir(@path)
         puts "*** git处理<#{@name}>"
         git_st
-        git_stash
+        result = git_stash
         git_up
-        git_stash_pop
+        if result['Saved working']
+          git_stash_pop
+        else
+          puts "no stash to pop"
+        end
       end
     end
 

data/lib/stool/Core/TaskInfo.rb

@@ -16,6 +16,7 @@ module Stool
     attr_accessor :localLibs
     #其他源码指定
     attr_accessor :otherCode
+    attr_accessor :allUseCode
 
     #指定的repo
     attr_accessor :repos
@@ -24,6 +25,7 @@ module Stool
       @localLibs = []
       @otherCode = []
       @repos = []
+      @allUseCode = false
       super
     end
 
@@ -35,9 +37,32 @@ module Stool
       self.localLibs.sort.map do |lib|
         puts('  ' + lib.to_s)
       end
+      puts('--' + 'otherCode:')
+      self.otherCode.sort.map do |lib|
+        puts('  ' + lib.to_s)
+      end
+      puts('--' + 'allUseCode:'+ self.allUseCode.to_s)
       puts('')
     end
 
+    def addLocalLib(libs)
+      libs.each do |lib|
+        @localLibs.push(lib)
+      end
+    end
+
+    def addOtherLibUseCode(libs)
+      libs.each do |lib|
+        @otherCode.push(lib)
+      end
+    end
+
+    def allLibsUseCode
+      @allUseCode = true
+    end
+
+    ########################
+
     def open_task
       `open *.xcworkspace`
     end
@@ -123,9 +148,8 @@ module Stool
             file.write(newStr)
           end
         end
-
       end
-
     end
+
   end
 end

data/lib/stool/Core/repoInfo.rb

@@ -0,0 +1,39 @@
+#本地lib池
+require 'Core/BaseObj'
+
+module Stool
+  class RepoInfo < BaseObj
+    attr_accessor :name
+    attr_accessor :path
+
+    def info_tos
+      puts('--' + 'name:'+ self.name)
+      puts('--' + 'path:'+ self.path)
+      puts('--' + 'Repos:')
+      subDirs.sort.each do |f|
+        unless f['.']
+          puts '  ' + f.to_s
+        end
+      end
+      puts('')
+    end
+
+    #本地搜索一个lib
+    def searchLib(name)
+      libInfo = nil
+      if subDirs.include?(name)
+        libInfo = LibInfo::loadFromPath(File.join(@path,name))
+      end
+      libInfo
+    end
+
+    def subDirs
+      arr = []
+      if @path
+        arr = Dir.entries(@path)
+      end
+      arr
+    end
+
+  end
+end

data/lib/stool/Utils/ArrayUtile.rb

@@ -0,0 +1,9 @@
+module ArrayUtile
+
+  #找到两个数组中，不同的元素
+  def diffOf(a,b)
+    sum = a + b
+    sum.uniq
+  end
+
+end

data/lib/stool/version.rb

@@ -1,3 +1,3 @@
 module Stool
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Fiend
@@ -138,7 +138,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/sl
-- lib/VERSION.rb
 - lib/stool.rb
 - lib/stool/Command.rb
 - lib/stool/Command/Lib.rb
@@ -146,15 +145,20 @@ files:
 - lib/stool/Command/LibPool.rb
 - lib/stool/Command/LibPool/Add.rb
 - lib/stool/Command/LibPool/List.rb
+- lib/stool/Command/Repo.rb
+- lib/stool/Command/Repo/CacheClean.rb
 - lib/stool/Command/WorkSpace.rb
 - lib/stool/Command/WorkSpace/list.rb
 - lib/stool/Command/WorkSpace/update.rb
 - lib/stool/Core/BaseObj.rb
+- lib/stool/Core/Cache.rb
 - lib/stool/Core/Config.rb
 - lib/stool/Core/Git.rb
 - lib/stool/Core/LibInfo.rb
 - lib/stool/Core/PoolInfo.rb
 - lib/stool/Core/TaskInfo.rb
+- lib/stool/Core/repoInfo.rb
+- lib/stool/Utils/ArrayUtile.rb
 - lib/stool/Utils/StringUtil.rb
 - lib/stool/version.rb
 homepage: https://rubygems.org/gems/Stool

data/lib/VERSION.rb

@@ -1,3 +0,0 @@
-module Stool
-  VERSION = '0.1.0'
-end