kookeeper 3.0.3 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 392f6b968d0b0342ab566d1a46c798b36111dc20d225965be367610e29d7ced2
-  data.tar.gz: 6793a55d9248c6ed2d6f59c8c72bbd4351001b3971f5b3968bf401b86c18d44b
+  metadata.gz: 33a8bec3932e96c58808fe6b50e205f181c58df2a24172b7cd2191064e973a2c
+  data.tar.gz: cad57a9f7876441d4b3224d7351988a1b7062b9ad34a9e77e9997d92cb799ecb
 SHA512:
-  metadata.gz: 2b83e38623f0294e25f509207070bfb108ef9304918f216cb7d067f15b164952a7095b241f77641c4e72cdf5ae395ae6cf75503d9510260834371379f3d03036
-  data.tar.gz: 2873e13e8ecc546b4dcf068b00cf87d60d476d697c2593ca73f00894fc52c56465f7b2e17e7ce651e5b6e3309e9afcbf49b5eb237926e12af3028d54b0c2352f
+  metadata.gz: ac32efeef82e52182881b5f160dde2ca17b283f02841bb5c99d0ee535ecf723597edf0ba259d7a1b3f142a77274af628589126f7ff069be749836ef19318669f
+  data.tar.gz: 9e8a021e6439a697e6dc0456d090c0db703973a4f2e1b3e3c4d9986f076cd57334838da2c70ee55e996354c7f74aad3b5d162b0d4310a7e040c62a052e1087d4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kookeeper (3.0.3)
+    kookeeper (3.0.6)
       big_resources
       big_stash (~> 0.1)
       cocoapods

data/lib/big_keeper/command/feature&hotfix/finish.rb

@@ -19,7 +19,8 @@ module BigKeeper
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
 
-      branch_name = GitOperator.new.current_branch(path)
+      home_branch_name = GitOperator.new.current_branch(path)
+      branch_name = ModuleCacheOperator.new(path).branch_name
       Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
 
       # Cache git modules
@@ -38,7 +39,7 @@ module BigKeeper
       Logger.highlight("Finish branch '#{branch_name}' for 'Home'")
 
       # Delete all path modules
-      ModuleCacheOperator.new(path).cache_path_modules([], [], [])
+      # ModuleCacheOperator.new(path).cache_path_modules([], [], [])
 
       # Install
       DepService.dep_operator(path, user).install(false)
@@ -47,7 +48,7 @@ module BigKeeper
       DepService.dep_operator(path, user).open
 
       # Push home changes to remote
-      GitService.new.verify_push(path, "finish branch #{branch_name}", branch_name, 'Home')
+      GitService.new.verify_push(path, "finish branch #{home_branch_name}", home_branch_name, 'Home')
     ensure
     end
   end

data/lib/big_keeper/command/feature&hotfix/start.rb

@@ -20,53 +20,71 @@ module BigKeeper
   def self.start(path, version, user, name, modules, type)
     begin
       # Parse Bigkeeper file
+      p "----------1.开始解析#{path}/Bigkeeper"
       BigkeeperParser.parse("#{path}/Bigkeeper")
 
       version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+
+      p "----------2.version：#{version}"
       full_name = "#{version}_#{user}_#{name}"
+      p "----------3.full_name：#{full_name}"
       branch_name = "#{GitflowType.name(type)}/#{full_name}"
+      p "----------4.branch_name：#{branch_name}"
 
-      GitService.new.verify_home_branch(path, branch_name, OperateType::START)
+      ModuleCacheOperator.new(path).cache_branch_name(branch_name)
+      home_branch_name = "release/#{version}"
+      p "----------5.home_branch_name：#{home_branch_name}"
+      p "----------6.path：#{path}"
+      p "----------7.1验证home_branch"
+      GitService.new.verify_home_branch(path, home_branch_name, OperateType::START)
+      #GitService.new.verify_home_branch(path, branch_name, OperateType::START)
 
       stash_modules = ModuleCacheOperator.new(path).all_path_modules
-
+      p "----------8.stash_modules：#{stash_modules}"
       # Stash current branch
-      StashService.new.stash_all(path, branch_name, user, stash_modules)
+      #
+      p "----------9.stash_all：path:#{path} branch_name:#{branch_name} user:#{user} #{path} stash_modules:#{stash_modules}"
+      StashService.new.stash_all(path, branch_name, user, stash_modules,version)
 
       # Verify input modules
+      p "----------10.验证modules是否包含在Bigkeeper文件中"
       modules = BigkeeperParser.verify_modules(modules)
-
-      Logger.highlight("Add branch '#{branch_name}' for 'Home'...")
+      p "----------11.home 添加 release/#{version} 分支"
+      Logger.highlight("Add branch release/#{version} for 'Home'...")
       # Start home feature
-      GitService.new.start(path, full_name, type)
-
+      # GitService.new.start(path, full_name, type)
+      GitService.new.startHome(path, version, GitflowType::RELEASE)
       # Clean module cache
+      #
+      p "----------11.清空modules缓存"
       ModuleCacheOperator.new(path).clean_modules
 
       # Cache all path modules
+      p "----------12.Cache all path modules"
       ModuleCacheOperator.new(path).cache_path_modules(modules, modules, [])
       modules = ModuleCacheOperator.new(path).remain_path_modules
-
+      p "----------13.Backup home"
       # Backup home
       DepService.dep_operator(path, user).backup
 
+      p "----------14.为模块建立分支并将podfile中地址切换到本地"
       # Start modules feature and modify module as path
       modules.each do |module_name|
         ModuleService.new.add(path, user, module_name, full_name, type)
       end
-
+      p "----------15.pod update"
       # install
-      DepService.dep_operator(path, user).install(true)
-
+      DepService.dep_operator(path, user).install(false )
+      p "----------16.打开 workspace"
       # Open home workspace
       DepService.dep_operator(path, user).open
-
+      p "----------17.Push home changes to remote"
       # Push home changes to remote
-      Logger.highlight("Push branch '#{branch_name}' for 'Home'...")
+      Logger.highlight("Push branch release/#{version} for 'Home'...")
       GitService.new.verify_push(
         path,
-        "init #{GitflowType.name(type)} #{full_name}",
-        branch_name,
+        "start branch  #{home_branch_name}",
+        home_branch_name,
         'Home')
     ensure
     end

data/lib/big_keeper/command/feature&hotfix/update.rb

@@ -21,9 +21,12 @@ module BigKeeper
     begin
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
-      branch_name = GitOperator.new.current_branch(path)
+      home_branch_name = GitOperator.new.current_branch(path)
+      branch_name = ModuleCacheOperator.new(path).branch_name
+      # Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
+
+      # Logger.error("Not a #{GitflowType.name(GitflowType::RELEASE)} branch, exit.") unless branch_name.include? GitflowType.name(GitflowType::RELEASE)
 
-      Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
 
       full_name = branch_name.gsub(/#{GitflowType.name(type)}\//, '')
 
@@ -45,6 +48,8 @@ module BigKeeper
       if add_modules.empty? and del_modules.empty?
         Logger.default("There is nothing changed with modules #{modules}.")
       else
+
+        type =
         # Modify podfile as path and Start modules feature
         remain_path_modules.each do |module_name|
           ModuleService.new.add(path, user, module_name, full_name, type)
@@ -60,6 +65,9 @@ module BigKeeper
 
       # Open home workspace
       DepService.dep_operator(path, user).open
+
+      # Push home changes to remote
+      GitService.new.verify_push(path, "update branch #{home_branch_name}", home_branch_name, 'Home')
     ensure
     end
   end

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -58,7 +58,8 @@ module BigKeeper
           end
         elsif ModuleOperateType::FINISH == module_operate_type
           module_git = BigkeeperParser.module_git(module_name)
-          branch_name = GitOperator.new.current_branch(@path)
+          #branch_name = GitOperator.new.current_branch(@path)
+          branch_name = ModuleCacheOperator.new(@path).branch_name
           "#{$1}pod '#{module_name}', :git => '#{module_git}', :branch => '#{branch_name}'"
         elsif ModuleOperateType::PUBLISH == module_operate_type
           module_git = BigkeeperParser.module_git(module_name)

data/lib/big_keeper/service/git_service.rb

@@ -7,6 +7,39 @@ require 'big_keeper/util/logger'
 module BigKeeper
   # Operator for got
   class GitService
+
+    def startHome(path, name, type)
+      p "--------------------11.1.startHome"
+      git = GitOperator.new
+      branch_name = "#{GitflowType.name(type)}/#{name}"
+      p "--------------------11.2branch_name：#{branch_name}"
+      if !git.has_remote_branch(path, branch_name) && !git.has_local_branch(path, branch_name)
+        p "------------------------------11.2.1如果远程和本地没有#{branch_name}分支"
+        verify_special_branch(path, 'master')
+
+
+        #verify_special_branch(path, 'develop')
+
+        #GitflowOperator.new.verify_git_flow(path)
+
+        #GitflowOperator.new.start(path, name, type)
+        #
+        Dir.chdir(path) do
+          p "------------------------------11.2.2git checkout -b #{branch_name}"
+          `git checkout -b #{branch_name}`
+        end
+        git.push_to_remote(path, branch_name)
+      else
+        verify_checkout(path, branch_name)
+
+        if !git.has_remote_branch(path, branch_name)
+          p "------------------------------11.3.1如果远程没有 #{branch_name}"
+          git.push_to_remote(path, branch_name)
+        end
+      end
+    end
+
+
     def start(path, name, type)
       git = GitOperator.new
 
@@ -16,9 +49,11 @@ module BigKeeper
         verify_special_branch(path, 'master')
         #verify_special_branch(path, 'develop')
 
-        GitflowOperator.new.verify_git_flow(path)
+        #GitflowOperator.new.verify_git_flow(path)
+
+        #GitflowOperator.new.start(path, name, type)
 
-        GitflowOperator.new.start(path, name, type)
+        verify_checkout(path, branch_name)
         git.push_to_remote(path, branch_name)
       else
         verify_checkout(path, branch_name)
@@ -30,11 +65,15 @@ module BigKeeper
     end
 
     def verify_checkout(path, branch_name)
+      p "++++++++++verify_checkout：#{path} #{branch_name}"
       Dir.chdir(path) do
+        p "++++++++++cd：#{path}"
         cmd = "git checkout -b #{branch_name}"
         if GitOperator.new.has_branch(path, branch_name)
+          p "++++++++++有#{branch_name}"
           cmd = "git checkout #{branch_name}"
         end
+        p "++++++++++cmd：#{cmd}"
         IO.popen(cmd) do |io|
           io.each do |line|
             Logger.error("Checkout #{branch_name} failed.") if line.include? 'error'
@@ -50,26 +89,34 @@ module BigKeeper
 
     def verify_special_branch(path, name)
       git = GitOperator.new
-
+      p "----------检查#{name}分支"
       if git.has_remote_branch(path, name)
+        p "--------------------有远程#{name}分支"
         if git.has_local_branch(path, name)
+          p "------------------------------有本地#{name}分支"
           if git.has_commits(path, name)
+            p "----------------------------------------有commits"
             Logger.error(%Q('#{name}' has unpushed commits, you should fix it manually...))
           end
+          p "------------------------------git pull"
           pull(path, name)
         else
+          p "------------------------------没有本地#{name}分支"
           git.checkout(path, name)
         end
       else
+        p "--------------------没有远程#{name}分支"
         verify_checkout(path, name)
         git.push_to_remote(path, name)
       end
     end
 
     def verify_home_branch(path, branch_name, type)
+
+      p "--------------------7.1.从远程同步本地分支"
       Logger.highlight('Sync local branchs from remote, waiting...')
       git = GitOperator.new
-
+      p "--------------------7.2.git fetch origin"
       git.fetch(path)
 
       if OperateType::START == type
@@ -126,6 +173,9 @@ module BigKeeper
     def pull(path, branch_name)
       git = GitOperator.new
       current_branch_name = git.current_branch(path)
+
+      p "----------current_branch_name：#{current_branch_name}"
+      p "----------branch_name：#{branch_name}"
       if current_branch_name == branch_name
         git.pull(path)
       else

data/lib/big_keeper/service/stash_service.rb

@@ -22,24 +22,37 @@ module BigKeeper
       end
     end
 
-    def stash_all(path, new_branch_name, user, modules)
+    def stash_all(path, new_branch_name, user, modules,version)
       # Stash modules
       Logger.highlight('Stash for current workspace...')
-
+      p "--------------------9.1.Stash modules----------"
       modules.each do |module_name|
         module_path = BigkeeperParser.module_full_path(path, user, module_name)
         branch_name = GitOperator.new.current_branch(module_path)
 
+        p "------------------------------module_path：#{module_path}"
+        p "------------------------------branch_name：#{branch_name}"
+        p "------------------------------new_branch_name：#{new_branch_name}"
         if branch_name != new_branch_name
           stash(module_path, branch_name, module_name)
         end
       end
-
+      p "--------------------end Stash modules----------"
       # Stash home
       branch_name = GitOperator.new.current_branch(path)
-      if branch_name != new_branch_name
+      p "--------------------9.2.Stash home----------"
+
+
+      home_branch_name = "release/#{version}"
+
+      p "------------------------------branch_name：#{branch_name}"
+      p "------------------------------home_branch_name：#{home_branch_name}"
+
+      if branch_name != home_branch_name
         stash(path, branch_name, 'Home')
       end
+
+      p "--------------------end Stash home----------"
     end
   end
 end

data/lib/big_keeper/util/cache_operator.rb

@@ -34,10 +34,14 @@ module BigKeeper
         @modules = JSON.load(file.read())
         file.close
       else
-        @modules = {"git" => {"all" => [], "current" => []}, "path" => {"all" => [], "add" => [], "del" => [], "current" => []}}
+        @modules = {"git" => {"all" => [], "current" => []}, "path" => {"all" => [], "add" => [], "del" => [], "current" => []},"branch_name" => ""}
       end
     end
 
+    def branch_name
+      @modules["branch_name"]
+    end
+
     def all_path_modules
       @modules["path"]["all"]
     end
@@ -70,6 +74,13 @@ module BigKeeper
       @modules["git"]["all"] - @modules["git"]["current"]
     end
 
+
+    def cache_branch_name(branch_name)
+      @modules["branch_name"] = branch_name
+      cache_modules
+    end
+
+
     def cache_path_modules(modules, add_modules, del_modules)
       @modules["path"]["all"] = modules.uniq
       @modules["path"]["add"] = add_modules.uniq
@@ -103,12 +114,14 @@ module BigKeeper
     end
 
     def clean_modules
-      @modules = {"git" => {"all" => [], "current" => []}, "path" => {"all" => [], "add" => [], "del" => [], "current" => []}}
+      branch_name = @modules["branch_name"]
+      @modules = {"git" => {"all" => [], "current" => []}, "path" => {"all" => [], "add" => [], "del" => [], "current" => []},"branch_name" => branch_name}
       cache_modules
     end
 
     def cache_modules
       file = File.new("#{@cache_path}/module.cache", 'w')
+      p "module缓存地址：#{@cache_path}/module.cache"
       file << @modules.to_json
       file.close
     end

data/lib/big_keeper/util/git_operator.rb

@@ -41,6 +41,8 @@ module BigKeeper
 
     def checkout(path, branch_name)
       Dir.chdir(path) do
+        p "----------cd：#{path}"
+        p "----------git checkout #{branch_name}"
         IO.popen("git checkout #{branch_name}") do |io|
           io.each do |line|
             Logger.error("Checkout #{branch_name} failed.") if line.include? 'error'
@@ -76,6 +78,7 @@ module BigKeeper
 
     def push_to_remote(path, branch_name)
       Dir.chdir(path) do
+        p  "git push -u origin #{branch_name}"
         `git push -u origin #{branch_name}`
       end
       GitOperator.new.check_push_success(path, branch_name, "origin/#{branch_name}")
@@ -83,6 +86,8 @@ module BigKeeper
 
     def pull(path)
       Dir.chdir(path) do
+        p "----------cd：#{path}"
+        p "----------git pull"
         `git pull`
       end
     end

data/lib/big_keeper/util/pod_operator.rb

@@ -8,14 +8,14 @@ module BigKeeper
       if repo_update
         PodOperator.pod_update_private_repos(true)
       end
-      Logger.highlight('Start pod install, waiting...')
-      cmd = "pod install --project-directory='#{path}'"
+      Logger.highlight('Start pod update, waiting...')
+      cmd = "pod update --project-directory='#{path}'"
       Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
         while line = stdout.gets
           p line
         end
       end
-      Logger.highlight('Finish pod install.')
+      Logger.highlight('Finish pod update.')
     end
 
     def self.pod_repo_push(path, module_name, source, version)
@@ -47,6 +47,7 @@ module BigKeeper
 
     def self.pod_update_private_repos(update_private)
       if update_private
+        p "BigkeeperParser.sources = #{BigkeeperParser.sources}"
         BigkeeperParser.sources.map { |spec|
           Logger.highlight('Start pod repo update, waiting...')
           cmd = "pod repo update #{spec}"

data/lib/big_keeper/util/xcode_operator.rb

@@ -4,12 +4,12 @@ module BigKeeper
   class XcodeOperator
     def self.open_workspace(path)
       # Close Xcode
-      # `pkill Xcode`
+      `pkill Xcode`
 
-      # sleep 0.5
+      sleep 0.5
 
       # Open home workspace
-      # `open #{path}/*.xcworkspace`
+      `open #{path}/*.xcworkspace`
     end
   end
 end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "3.0.3"
+  VERSION = "3.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kookeeper
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.6
 platform: ruby
 authors:
 - mmoaay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli