kookeeper 3.0.5 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7718447d06913c05171af6d4ec81c0953c3d4d9e887459c985bc3ee9771dce7e
-  data.tar.gz: ac5205ec448541b9f18a290cf45d23bc040d9d0e541c8688b748d8b37382f76b
+  metadata.gz: dd6c22dfb14b333e9e1e2d3ba129cfb6a5d5cd68b0e2f1f760576131cd34e75e
+  data.tar.gz: ed7ae0bc9bd3146ac128c523a5de31df19a30ef51e4aa5e40964c1d987163c99
 SHA512:
-  metadata.gz: c76b56a8b141755cc2c50ad3a4932514d4eeec66149cfbf8a2829b8480cdb0a5ae873531b96aaae193098e0678efe714beb62a2ff16dc561f6332f076a7c16c6
-  data.tar.gz: 751772b95fb8e95f95ac6ffca60209846abac3a7fe9df09ee3f0cc611e45ed68c0623f47fe23caefc119b6ae402592986cf7f609ab90acf23a8c8a49ea61f382
+  metadata.gz: 9f4aca38e2e35f715f1f07ff6e602228e757b304e8dfd601e69baceb237a9aa5188c51b48a48f48e8d7f999fac9b77b9331a2dc681922496ca23e6428f612486
+  data.tar.gz: 131e6fc9c0b074b37d61b9a511efce1e2cc8ff18422081e0c14c7add3c203b42c20973769857f183f6e0542b4ce130068286445d6dffdeec4e1b18d5da53d5f9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kookeeper (3.0.5)
+    kookeeper (3.0.8)
       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

@@ -17,7 +17,7 @@ require 'big_keeper/service/module_service'
 
 
 module BigKeeper
-  def self.start(path, version, user, name, modules, type)
+  def self.start(path, version, user, modules, type)
     begin
       # Parse Bigkeeper file
       p "----------1.开始解析#{path}/Bigkeeper"
@@ -26,15 +26,20 @@ module BigKeeper
       version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
 
       p "----------2.version：#{version}"
-      full_name = "#{version}_#{user}_#{name}"
+
+      full_name = "#{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}"
+
+      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, branch_name, OperateType::START)
+      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}"
@@ -57,31 +62,31 @@ module BigKeeper
       ModuleCacheOperator.new(path).clean_modules
 
       # Cache all path modules
-      p "----------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 "----------Backup home"
+      p "----------13.Backup home"
       # Backup home
       DepService.dep_operator(path, user).backup
 
-      p "----------Start modules feature and modify module as path"
+      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 "----------install"
+      p "----------15.pod update"
       # install
       DepService.dep_operator(path, user).install(false )
-      p "----------Open home workspace"
+      p "----------16.打开 workspace"
       # Open home workspace
       DepService.dep_operator(path, user).open
-      p "----------Push home changes to remote"
+      p "----------17.Push home changes to remote"
       # Push home changes to remote
       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/switch.rb

@@ -10,34 +10,36 @@ module BigKeeper
   def self.switch_to(path, version, user, full_name, type)
     begin
       # Parse Bigkeeper file
+      p "1.switch_to #{version} 解析Bigkeeper"
       BigkeeperParser.parse("#{path}/Bigkeeper")
 
       version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
       branch_name = "#{GitflowType.name(type)}/#{full_name}"
-
-      GitService.new.verify_home_branch(path, branch_name, OperateType::SWITCH)
+      ModuleCacheOperator.new(path).cache_branch_name(branch_name)
+      home_branch_name = "release/#{full_name}"
+      GitService.new.verify_home_branch(path, home_branch_name, OperateType::SWITCH)
 
       stash_modules = ModuleCacheOperator.new(path).all_path_modules
-
+      p "2.switch_to 暂存所有"
       # Stash current branch
-      StashService.new.stash_all(path, branch_name, user, stash_modules)
-
+      StashService.new.stash_all(path, branch_name, user, stash_modules,version)
+      p "3.switch_to checkout #{home_branch_name}"
       # Switch to new feature
-      GitOperator.new.checkout(path, branch_name)
+      GitOperator.new.checkout(path, home_branch_name)
       GitOperator.new.pull(path)
-
+      p "4.switch_to"
       # Apply home stash
-      StashService.new.pop_stash(path, branch_name, 'Home')
+      StashService.new.pop_stash(path, home_branch_name, 'Home')
 
       modules = ModuleCacheOperator.new(path).all_path_modules
 
       modules.each do |module_name|
         ModuleService.new.switch_to(path, user, module_name, branch_name, type)
       end
-
+      p "5.switch_to"
       # Install
       DepService.dep_operator(path, user).install(false)
-
+      p "6.switch_to"
       # Open home workspace
       DepService.dep_operator(path, user).open
     ensure

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

@@ -21,11 +21,11 @@ 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(GitflowType::RELEASE)} branch, exit.") unless branch_name.include? GitflowType.name(GitflowType::RELEASE)
 
 
       full_name = branch_name.gsub(/#{GitflowType.name(type)}\//, '')
@@ -65,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/command/feature&hotfix.rb

@@ -24,9 +24,11 @@ module BigKeeper
 
           help_now!('user name is required') if user and user.empty?
           help_now!("#{GitflowType.name(type)} name is required") if args.length < 1
-          name = args[0]
-          modules = args[(1...args.length)] if args.length > 1
-          start(path, version, user, name, modules, type)
+          #name = args[0]
+          #modules = args[(1...args.length)] if args.length > 1
+          modules = args[(0...args.length)] if args.length > 0
+          #start(path, version, user, name, modules, type)
+          start(path, version, user, modules, type)
         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

@@ -9,12 +9,12 @@ module BigKeeper
   class GitService
 
     def startHome(path, name, type)
-      p "----------startHome"
+      p "--------------------11.1.startHome"
       git = GitOperator.new
       branch_name = "#{GitflowType.name(type)}/#{name}"
-      p "----------branch_name：#{branch_name}"
+      p "--------------------11.2branch_name：#{branch_name}"
       if !git.has_remote_branch(path, branch_name) && !git.has_local_branch(path, branch_name)
-        p "----------如果远程和本地没有#{branch_name}分支"
+        p "------------------------------11.2.1如果远程和本地没有#{branch_name}分支"
         verify_special_branch(path, 'master')
 
 
@@ -25,7 +25,7 @@ module BigKeeper
         #GitflowOperator.new.start(path, name, type)
         #
         Dir.chdir(path) do
-          p "git checkout -b #{branch_name}"
+          p "------------------------------11.2.2git checkout -b #{branch_name}"
           `git checkout -b #{branch_name}`
         end
         git.push_to_remote(path, branch_name)
@@ -33,7 +33,7 @@ module BigKeeper
         verify_checkout(path, branch_name)
 
         if !git.has_remote_branch(path, branch_name)
-          p "如果远程没有 #{branch_name}"
+          p "------------------------------11.3.1如果远程没有 #{branch_name}"
           git.push_to_remote(path, branch_name)
         end
       end
@@ -49,9 +49,9 @@ 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)
@@ -65,14 +65,15 @@ module BigKeeper
     end
 
     def verify_checkout(path, branch_name)
+      p "++++++++++verify_checkout：#{path} #{branch_name}"
       Dir.chdir(path) do
-        p "----------cd：#{path}"
+        p "++++++++++cd：#{path}"
         cmd = "git checkout -b #{branch_name}"
         if GitOperator.new.has_branch(path, branch_name)
-          p "有#{branch_name}"
+          p "++++++++++有#{branch_name}"
           cmd = "git checkout #{branch_name}"
         end
-        p "cmd：#{cmd}"
+        p "++++++++++cmd：#{cmd}"
         IO.popen(cmd) do |io|
           io.each do |line|
             Logger.error("Checkout #{branch_name} failed.") if line.include? 'error'

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,7 +114,8 @@ 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
 

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "3.0.5"
+  VERSION = "3.0.8"
 end

metadata

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