kookeeper 3.0.8 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd6c22dfb14b333e9e1e2d3ba129cfb6a5d5cd68b0e2f1f760576131cd34e75e
-  data.tar.gz: ed7ae0bc9bd3146ac128c523a5de31df19a30ef51e4aa5e40964c1d987163c99
+  metadata.gz: 5f71d885879aa95039511f78d5771166a44994f862a45b4bed927f3002ceb5e8
+  data.tar.gz: 4c2ddfdbbd0981917ac6b22de832e4c46a09550fb4a81ca6a9a9f97f8929f41b
 SHA512:
-  metadata.gz: 9f4aca38e2e35f715f1f07ff6e602228e757b304e8dfd601e69baceb237a9aa5188c51b48a48f48e8d7f999fac9b77b9331a2dc681922496ca23e6428f612486
-  data.tar.gz: 131e6fc9c0b074b37d61b9a511efce1e2cc8ff18422081e0c14c7add3c203b42c20973769857f183f6e0542b4ce130068286445d6dffdeec4e1b18d5da53d5f9
+  metadata.gz: a5565e95c940d75542d2de6dceeabef4302b765178c5256a4dfe3633951f83366c9327f1d1881458e8d0e41a36aff1996a0a1f0ee41fd04b4edecb3dae593634
+  data.tar.gz: 8eefdfbd881c0ac68b39bb4f20c96c2d3f3c9ab0a9687a5302d27319481ac1b8a1d351e2eac044f4048a1e2d7af1c1cf2d11d7ecdb8e5f94f820b629f1d4b679

data/Gemfile.lock

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

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

@@ -30,7 +30,9 @@ module BigKeeper
 
       ModuleCacheOperator.new(path).cache_git_modules(ModuleCacheOperator.new(path).all_path_modules)
 
-      modules = ModuleCacheOperator.new(path).remain_git_modules
+      modules = ModuleCacheOperator.new(path).current_path_modules_path(path)
+
+      #modules = ModuleCacheOperator.new(path).remain_git_modules
       # Rebase modules and modify module as git
       modules.each do |module_name|
         ModuleService.new.finish(path, user, module_name, branch_name, type)

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

@@ -22,7 +22,7 @@ module BigKeeper
       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,version)
+      StashService.new.stash_all(path, branch_name, user, stash_modules,full_name)
       p "3.switch_to checkout #{home_branch_name}"
       # Switch to new feature
       GitOperator.new.checkout(path, home_branch_name)
@@ -31,8 +31,8 @@ module BigKeeper
       # Apply home stash
       StashService.new.pop_stash(path, home_branch_name, 'Home')
 
-      modules = ModuleCacheOperator.new(path).all_path_modules
-
+      #modules = ModuleCacheOperator.new(path).all_path_modules
+      modules = ModuleCacheOperator.new(path).current_path_modules_path(path)
       modules.each do |module_name|
         ModuleService.new.switch_to(path, user, module_name, branch_name, type)
       end

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

@@ -30,7 +30,7 @@ module BigKeeper
 
       full_name = branch_name.gsub(/#{GitflowType.name(type)}\//, '')
 
-      current_modules = ModuleCacheOperator.new(path).current_path_modules
+      current_modules = ModuleCacheOperator.new(path).current_path_modules_path(path)
 
       # Verify input modules
       modules = BigkeeperParser.verify_modules(modules)

data/lib/big_keeper/service/git_service.rb

@@ -99,6 +99,7 @@ module BigKeeper
             Logger.error(%Q('#{name}' has unpushed commits, you should fix it manually...))
           end
           p "------------------------------git pull"
+          git.checkout(path, name)
           pull(path, name)
         else
           p "------------------------------没有本地#{name}分支"

data/lib/big_keeper/service/module_service.rb

@@ -27,6 +27,8 @@ module BigKeeper
 
         StashService.new.pop_stash(module_full_path, home_branch_name, module_name)
       end
+
+      StashService.new.pop_stash(module_full_path, home_branch_name, module_name)
     end
 
     def push(path, user, module_name, home_branch_name, type, comment)

data/lib/big_keeper/util/cache_operator.rb

@@ -54,7 +54,27 @@ module BigKeeper
       @modules["path"]["del"]
     end
 
+    def current_path_modules_path(path)
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      # Get modules' name
+      module_list = BigkeeperParser.module_names
+      detector = PodfileDetector.new(path, module_list)
+      # Get unlocked third party pods list
+      current_module_list = detector.get_current_module_list
+      current_module_list
+      #@modules["path"]["current"]
+    end
+
     def current_path_modules
+      # BigkeeperParser.parse("#{@path}/Bigkeeper")
+      # # Get modules' name
+      # module_list = BigkeeperParser.module_names
+      # detector = PodfileDetector.new(@path, module_list)
+      # # Get unlocked third party pods list
+      # current_module_list = detector.get_current_module_list
+      # current_module_list
+      # #@modules["path"]["current"]
+      # #
       @modules["path"]["current"]
     end
 

data/lib/big_keeper/util/podfile_detector.rb

@@ -7,6 +7,7 @@ module BigKeeper
 class PodfileDetector
 
   attr_accessor :module_list, :main_path
+  $current_module_list = []
   $unlock_pod_list = []
   $modify_pod_list = {}
 
@@ -15,6 +16,31 @@ class PodfileDetector
     @main_path = main_path
   end
 
+
+  def get_current_module_list
+    $current_module_list = []
+    podfile_lines = File.readlines("#{@main_path}/Podfile")
+    Logger.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
+    podfile_lines.collect do |sentence|
+      deal_podfile_line_forCurrent(sentence)
+    end
+    $current_module_list
+  end
+
+  def deal_podfile_line_forCurrent(sentence)
+    return unless !sentence.strip.start_with?("#")
+    if sentence.strip.include?('pod ')
+      pod_model = PodfileModel.new(sentence)
+      if !pod_model.name.empty? &&
+        pod_model.path != nil &&
+        pod_model.tag == nil
+            $current_module_list << pod_model.name if @module_list.include?(pod_model.name)
+      end
+      pod_model
+    end
+  end
+
+
   def get_unlock_pod_list
     podfile_lines = File.readlines("#{@main_path}/Podfile")
     Logger.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?

data/lib/big_keeper/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kookeeper
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.1.2
 platform: ruby
 authors:
 - mmoaay