kookeeper 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33a8bec3932e96c58808fe6b50e205f181c58df2a24172b7cd2191064e973a2c
-  data.tar.gz: cad57a9f7876441d4b3224d7351988a1b7062b9ad34a9e77e9997d92cb799ecb
+  metadata.gz: 57f6a3e487540db4bdd18bf917a4ae6a6da9a01b5c703cc93ac1ff7fc44ea3c7
+  data.tar.gz: e8bf371127fe93b66c29bde4fc4d5dbcb4a19448cdc49706835bba5614929af1
 SHA512:
-  metadata.gz: ac32efeef82e52182881b5f160dde2ca17b283f02841bb5c99d0ee535ecf723597edf0ba259d7a1b3f142a77274af628589126f7ff069be749836ef19318669f
-  data.tar.gz: 9e8a021e6439a697e6dc0456d090c0db703973a4f2e1b3e3c4d9986f076cd57334838da2c70ee55e996354c7f74aad3b5d162b0d4310a7e040c62a052e1087d4
+  metadata.gz: 1b96c0d5aa8e3dca7eb245e11a99c6dc7981ff6d0592f2d2aa003219d259cec3b1e936e44d2e1726601720b4a42314997cf5e8702b82f3dc5c0ec029b44208a4
+  data.tar.gz: 0a45a6cd29b64e31a99dfa6e95c5e334111e88c50c2bc6b2e854e19f5d7f2bd13dba5f681b87045a773db8526dcf4c9fa3c28a477c446c810ac2835d2feef3b9

data/Gemfile.lock

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

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,7 +26,9 @@ 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}"

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

@@ -10,34 +10,35 @@ 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)
+      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.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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kookeeper
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 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