kookeeper 3.0.9 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 886b326b907296e3ddeeac5e62b4614815151265401e5b67bf34a59af4174c2f
-  data.tar.gz: d5a76a7cb2bcca2271c1536946f2a5f07aab71542bc83c19318f6b4e0a26baa9
+  metadata.gz: cfabea23fd7bf2e0197cbf2c147a2f3684c85fc9e580633086fda7c6c8bc4b6c
+  data.tar.gz: 1ebb55ae84fa925a6a9bd6ee0b95591d6bee0c8a85a503d8272a27d7eec6d4f7
 SHA512:
-  metadata.gz: cdc9706567ef75dc19977213a4ba85b1ef3f2433411d5604aa7dfd0da201ba896638843b9ac15338765dd6df2647f5ff26286d1a2f9d1e65f62b08dfc8d5a136
-  data.tar.gz: 01161b62cae921cb92e5e91b99b9d2a97f6968e39bc4b4bb50ccd8c721e5b1e316d253567f2a6f4bcdc35202567c803a968aa7ebcbbfda10f8e7449dbf87bd12
+  metadata.gz: 40b2dce0ab4c9b0b2b1e99c1677c0b1c002a070c5b363040b22e37d99d4455d390edb923ea548beadb3bd0e5eec5a02d1bd2b7b1f9f1f655346b4ac15c94ae7f
+  data.tar.gz: 1c7ef42ff4c4e239f19fe7efba66a5ab2aa66cbbc7ea7fe8ae86b340bf158fbc364cd8623d08f704c8903cf67572a10c44bdf23c40aee0ba3c5fbc619936a1fd

data/Gemfile.lock

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

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

metadata

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