kookeeper 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f6a3e487540db4bdd18bf917a4ae6a6da9a01b5c703cc93ac1ff7fc44ea3c7
-  data.tar.gz: e8bf371127fe93b66c29bde4fc4d5dbcb4a19448cdc49706835bba5614929af1
+  metadata.gz: cfabea23fd7bf2e0197cbf2c147a2f3684c85fc9e580633086fda7c6c8bc4b6c
+  data.tar.gz: 1ebb55ae84fa925a6a9bd6ee0b95591d6bee0c8a85a503d8272a27d7eec6d4f7
 SHA512:
-  metadata.gz: 1b96c0d5aa8e3dca7eb245e11a99c6dc7981ff6d0592f2d2aa003219d259cec3b1e936e44d2e1726601720b4a42314997cf5e8702b82f3dc5c0ec029b44208a4
-  data.tar.gz: 0a45a6cd29b64e31a99dfa6e95c5e334111e88c50c2bc6b2e854e19f5d7f2bd13dba5f681b87045a773db8526dcf4c9fa3c28a477c446c810ac2835d2feef3b9
+  metadata.gz: 40b2dce0ab4c9b0b2b1e99c1677c0b1c002a070c5b363040b22e37d99d4455d390edb923ea548beadb3bd0e5eec5a02d1bd2b7b1f9f1f655346b4ac15c94ae7f
+  data.tar.gz: 1c7ef42ff4c4e239f19fe7efba66a5ab2aa66cbbc7ea7fe8ae86b340bf158fbc364cd8623d08f704c8903cf67572a10c44bdf23c40aee0ba3c5fbc619936a1fd

data/Gemfile.lock

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

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

@@ -15,13 +15,14 @@ module BigKeeper
 
       version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
       branch_name = "#{GitflowType.name(type)}/#{full_name}"
+      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,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)

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/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.7"
+  VERSION = "3.1.0"
 end

metadata

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