bigkeeper 0.8.9 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: accc51fc75fc6d9d662aee5a2f6201682d3eaf1f
-  data.tar.gz: 1de9680bcb63b9bd8c0062945d96bd173e57adfe
+  metadata.gz: 1ad21818615753657a7b1d3132495d7906703993
+  data.tar.gz: ba755aa80b7eaed3ef46e8160425d2bd2833538f
 SHA512:
-  metadata.gz: 00df2a04ec69be4a786849b4f7138ec4e282eba92f3364696ae393e35598a693f132ba0ad352beef2f9bab3ce178bc815d7e14d8c0a70ed32b7dffd3167f2518
-  data.tar.gz: bb9473f395ff7729223cd50ad0f855c3f3db0e031c8e9706913907665ddb9432e802f30784e0415f73e8f713462f09cd0e30caf3e157d3084c48206146d6b095
+  metadata.gz: a59d3b3a12ac0b58693a3b616dfdf3b7d53b3f01fb2dd495112088014ebcb37bacf9a8624073eb0682e7d5d3a0b7b540372ce99075ff159c008e6f260b54ec56
+  data.tar.gz: a189a9bec318f410cb675ff29905078f32d2d70668412748b9a2cfa781a3737030d83823858be4857d95cae1f28496ce2c83866582053e0088dceaa79aa987c5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.8.8)
+    bigkeeper (0.9.0)
       big_resources
       big_stash (~> 0.1)
       cocoapods
@@ -12,14 +12,14 @@ PATH
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    CFPropertyList (2.3.3)
-    activesupport (4.2.7.1)
+    CFPropertyList (3.0.0)
+    activesupport (4.2.11)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ast (2.3.0)
+    atomos (0.1.3)
     big_resources (0.1.1)
       chunky_png
       cocoapods
@@ -28,59 +28,60 @@ GEM
       plist
     big_stash (0.6.0)
       gli (~> 2.16)
-    chunky_png (1.3.10)
-    claide (1.0.1)
-    cocoapods (1.2.1)
+    chunky_png (1.3.11)
+    claide (1.0.2)
+    cocoapods (1.5.3)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.2.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.5.3)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.4.4, < 2.0)
-    cocoapods-core (1.2.1)
-      activesupport (>= 4.0.2, < 5)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.3)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.2.0)
+    cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
     colorize (0.8.1)
+    concurrent-ruby (1.1.4)
     escape (0.0.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.2)
-    gli (2.17.1)
-    i18n (0.7.0)
-    json (1.8.6)
-    minitest (5.8.3)
-    molinillo (0.5.7)
-    nanaimo (0.2.3)
+    gh_inspector (1.1.3)
+    gli (2.18.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.8.5)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
     nap (1.1.0)
-    netrc (0.7.8)
+    netrc (0.11.0)
     parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    plist (3.3.0)
+    plist (3.5.0)
     powerpack (0.1.1)
     rainbow (2.2.2)
       rake
@@ -92,17 +93,18 @@ GEM
       rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-macho (1.1.0)
+    ruby-macho (1.3.1)
     ruby-progressbar (1.9.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
-    xcodeproj (1.4.4)
-      CFPropertyList (~> 2.3.3)
-      claide (>= 1.0.1, < 2.0)
+    xcodeproj (1.7.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
@@ -120,4 +122,4 @@ DEPENDENCIES
   rubocop (~> 0.50.0)
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

data/bin/big

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# require "bundler/setup"
+require "bundler/setup"
 require "big_keeper"
 
 # You can add fixtures and/or initialization code here to make experimenting

data/lib/big_keeper/command/pod.rb

@@ -20,12 +20,25 @@ module BigKeeper
 
       podfile.desc 'Lock podname should be locked.'
       podfile.command :lock do |lock|
-        lock.action do |global_options, options, args|
-          LeanCloudLogger.instance.set_command("podfile/lock")
-
-          path = File.expand_path(global_options[:path])
-          podfile_lock(path)
+        lock.desc 'Lock pods accouding to Podfile.'
+        lock.command :module do |m|
+          m.action do |global_options, options, args|
+            LeanCloudLogger.instance.set_command("podfile/lock/module")
+
+            path = File.expand_path(global_options[:path])
+            podfile_lock(path, false)
+          end
         end
+        lock.desc 'Lock pods accouding to Podfile.lock.'
+        lock.command :submodule do |s|
+          s.action do |global_options, options, args|
+            LeanCloudLogger.instance.set_command("podfile/lock/submodule")
+
+            path = File.expand_path(global_options[:path])
+            podfile_lock(path, true)
+          end
+        end
+
       end
 
       podfile.desc 'Update modules should be upgrade.'

data/lib/big_keeper/command/pod/podfile.rb

@@ -5,6 +5,7 @@ require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/logger'
+require 'big_keeper/util/lockfile_parser'
 
 module BigKeeper
 
@@ -12,9 +13,10 @@ module BigKeeper
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
       # Get modules' name
-      module_list = BigkeeperParser.module_names
+      # module_list = BigkeeperParser.module_names
       # initialize PodfileDetector
-      detector = PodfileDetector.new(path, module_list)
+      detector = PodfileParser.instance
+      detactor.parse
       # Get unlocked third party pods list
       unlock_pod_list = detector.get_unlock_pod_list
       # Print out unlock pod list
@@ -25,27 +27,28 @@ module BigKeeper
 
   end
 
-  def self.podfile_lock(path)
+  def self.podfile_lock(path, is_all)
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
-      # Get modules' name
-      module_list = BigkeeperParser.module_names
       # initialize PodfileDetector
-      detector = PodfileDetector.new(path, module_list)
+      pod_parser = PodfileParser.instance
+      #Parser Podfile.lock
+      pod_parser.parse(path)
+      #initialize LockfileParser
+      lock_parser = LockfileParser.instance
+      #Parser Podfile.lock
+      lock_parser.parse(path)
       # Get unlocked third party pods list
-      unlock_pod_list = detector.get_unlock_pod_list
-      # Get Version
-      dictionary = detector.deal_lock_file(path, unlock_pod_list)
-      if dictionary.empty?
+      unlock_pod_info = lock_parser.get_unlock_pod_list(is_all)
+      # Lock modules in podfile
+      if unlock_pod_info.empty?
         Logger.warning("There is nothing to be locked.")
       else
-        PodfileOperator.new.find_and_lock("#{path}/Podfile", dictionary)
+        PodfileOperator.new.find_and_lock("#{path}/Podfile", unlock_pod_info)
         Logger.highlight("The Podfile has been changed.")
         Logger.separator
       end
 
-
-
   end
 
   def self.podfile_modules_update(path)

data/lib/big_keeper/command/release/module.rb

@@ -10,6 +10,8 @@ require 'big_keeper/util/pod_operator'
 module BigKeeper
   def self.release_module_start(path, version, user, module_name, ignore)
     BigkeeperParser.parse("#{path}/Bigkeeper")
+
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
     module_path = BigkeeperParser.module_full_path(path, user, module_name)
 
     # stash
@@ -32,6 +34,8 @@ module BigKeeper
 ## release finish
   def self.release_module_finish(path, version, user, module_name, spec)
     BigkeeperParser.parse("#{path}/Bigkeeper")
+
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
     module_path = BigkeeperParser.module_full_path(path, user, module_name)
 
     # check commit

data/lib/big_keeper/dependency/dep_gradle_operator.rb

@@ -1,50 +1,73 @@
 require 'big_keeper/dependency/dep_operator'
-require 'big_keeper/util/gradle_operator'
+
 
 module BigKeeper
   # Operator for podfile
   class DepGradleOperator < DepOperator
 
+    PATH_VERSION_CONFIG = "doc/config/version-config.gradle"
+
     def backup
-      GradleOperator.new(@path).backup
-      modules = ModuleCacheOperator.new(@path).all_path_modules
-      modules.each do |module_name|
-        module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
-        GradleOperator.new(module_full_path).backup
-      end
+      cache_operator = CacheOperator.new(@path)
+      cache_operator.save(PATH_VERSION_CONFIG)
     end
 
     def recover
-      GradleOperator.new(@path).recover(true, false)
+      cache_operator = CacheOperator.new(@path)
+      cache_operator.load(PATH_VERSION_CONFIG)
+      cache_operator.clean
     end
 
     def update_module_config(module_name, module_operate_type)
-      module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
-
-      # get modules
-      if ModuleOperateType::ADD == module_operate_type
-        GradleOperator.new(module_full_path).backup
-
-        add_modules = ModuleCacheOperator.new(@path).add_path_modules
-        GradleOperator.new(module_full_path).update_build_config(module_name, add_modules, ModuleOperateType::ADD)
-        GradleOperator.new(module_full_path).update_settings_config(module_name, add_modules, ModuleOperateType::ADD, @user)
-
-        del_modules = ModuleCacheOperator.new(@path).del_path_modules
-        GradleOperator.new(module_full_path).update_build_config(module_name, del_modules, ModuleOperateType::DELETE)
-        GradleOperator.new(module_full_path).update_settings_config(module_name, del_modules, ModuleOperateType::DELETE, @user)
-      elsif ModuleOperateType::DELETE == module_operate_type
-        GradleOperator.new(module_full_path).recover(true, true)
-      elsif ModuleOperateType::FINISH == module_operate_type
-        modules = ModuleCacheOperator.new(@path).all_path_modules
-        GradleOperator.new(module_full_path).update_build_config(module_name, modules, ModuleOperateType::FINISH)
-      elsif ModuleOperateType::PUBLISH == module_operate_type
-        modules = ModuleCacheOperator.new(@path).all_git_modules
-        GradleOperator.new(module_full_path).update_build_config(module_name, modules, ModuleOperateType::PUBLISH)
-        GradleOperator.new(module_full_path).recover(true, false)
+      temp_file = Tempfile.new('.version-config.gradle.tmp')
+      begin
+        File.open("#{@path}/#{PATH_VERSION_CONFIG}", 'r') do |file|
+          file.each_line do |line|
+            new_line = generate_version_config_of_line(
+              line,
+              module_name,
+              module_operate_type)
+            temp_file.puts(new_line)
+          end
+        end
+        temp_file.close
+        FileUtils.mv(temp_file.path, "#{@path}/#{PATH_VERSION_CONFIG}")
+      ensure
+        temp_file.close
+        temp_file.unlink
       end
+    end
+
+    def generate_version_config_of_line(line, module_name, module_operate_type)
+      if line.downcase.match(/([\s\S]*)#{module_name.downcase}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
+        branch_name = GitOperator.new.current_branch(@path)
+        version_name = ''
+        # Get version part of source.addition
 
-      GradleOperator.new(@path).update_build_config('', [module_name], module_operate_type)
-      GradleOperator.new(@path).update_settings_config('', [module_name], module_operate_type, @user)
+        if ModuleOperateType::ADD == module_operate_type
+          version_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
+        elsif ModuleOperateType::DELETE == module_operate_type
+          return origin_config_of_module(module_name)
+        else
+          version_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){ $2 }
+        end
+      return line.sub(/([\s\S]*)Version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/){
+          "#{$1}Version = '#{version_name}'"}
+      end
+      line
+    end
+
+    def origin_config_of_module(module_name)
+      origin_config = ''
+      File.open("#{@path}/.bigkeeper/#{PATH_VERSION_CONFIG}", 'r') do |file|
+        file.each_line do |line|
+          if line.downcase.match(/([\s\S]*)#{module_name.downcase}version(\s*)=(\s*)('|")(\S*)('|")([\s\S]*)/)
+            origin_config = line
+            break
+          end
+        end
+      end
+      origin_config.chop
     end
 
     def install(should_update)

data/lib/big_keeper/util/gradle_operator.rb

@@ -3,207 +3,5 @@ require 'big_keeper/util/cache_operator'
 module BigKeeper
   # Operator for podfile
   class GradleOperator
-    def initialize(path)
-      @path = path
-    end
-
-    def backup
-      cache_operator = CacheOperator.new(@path)
-
-      cache_operator.save('settings.gradle')
-
-      Dir.glob("#{@path}/*/build.gradle").each do |build_gradle_file_path|
-        build_gradle_file = build_gradle_file_path.gsub!(/#{@path}/, '')
-        cache_operator.save(build_gradle_file)
-      end
-    end
-
-    def recover(settings_config, build_config)
-      cache_operator = CacheOperator.new(@path)
-
-      cache_operator.load('settings.gradle') if settings_config
-
-      if build_config
-        Dir.glob("#{@path}/*/build.gradle").each do |build_gradle_file_path|
-          build_gradle_file = build_gradle_file_path.gsub!(/#{@path}/, '')
-          cache_operator.load(build_gradle_file)
-        end
-      end
-
-      cache_operator.clean
-    end
-
-    def update_settings_config(current_module_name, modules, module_operate_type, user)
-      return if modules.empty?
-
-      if ModuleOperateType::ADD == module_operate_type
-        modules.each do |module_name|
-          next if current_module_name == module_name
-
-          File.open("#{@path}/settings.gradle", 'a') do |file|
-            file.puts "\r\ninclude ':module:#{module_name.downcase}'\r\n"
-            file.puts "project(':module:#{module_name.downcase}')." \
-              "projectDir = new File(rootProject.projectDir," \
-              "'#{BigkeeperParser.module_path(user, module_name)}/#{module_name.downcase}-lib')\r\n"
-          end
-        end
-      else
-        modules.each do |module_name|
-          next if current_module_name == module_name
-          temp_file = Tempfile.new('.settings.gradle.tmp')
-          begin
-            File.open("#{@path}/settings.gradle", 'r') do |file|
-              file.each_line do |line|
-                unless line =~ /(\s*)include(\s*)('|")(\S*):#{module_name.downcase}('|")(\S*)/ ||
-                  line =~ /(\s*)project\(('|")(\S*):#{module_name.downcase}('|")\).(\S*)/
-                  temp_file.puts(line)
-                end
-              end
-            end
-            temp_file.close
-            FileUtils.mv(temp_file.path, "#{@path}/settings.gradle")
-          ensure
-            temp_file.close
-            temp_file.unlink
-          end
-        end
-      end
-    end
-
-    def update_build_config(current_module_name, modules, module_operate_type)
-      return if modules.empty?
-
-      Dir.glob("#{@path}/*/build.gradle").each do |file_path|
-        modules.each do |module_name|
-          next if current_module_name == module_name
-
-          temp_file = Tempfile.new('.build.gradle.tmp')
-          begin
-            version_flag = false
-            version_index = 0
-
-            File.open(file_path, 'r') do |file|
-              file.each_line do |line|
-                new_line, version_index, version_flag = generate_build_config(
-                  line,
-                  module_name,
-                  module_operate_type,
-                  version_index,
-                  version_flag)
-
-                temp_file.puts(new_line)
-              end
-            end
-            temp_file.close
-            FileUtils.mv(temp_file.path, file_path)
-          ensure
-            temp_file.close
-            temp_file.unlink
-          end
-        end
-      end
-    end
-
-    def generate_build_config(line, module_name, module_operate_type, version_index, version_flag)
-      new_line = line
-
-      version_flag = true if line.downcase.include? 'modifypom'
-      if version_flag
-        version_index += 1 if line.include? '{'
-        version_index -= 1 if line.include? '}'
-
-        version_flag = false if 0 == version_flag
-
-        new_line = generate_version_config(line, module_name, module_operate_type)
-      else
-        new_line = generate_compile_config(line, module_name, module_operate_type)
-      end
-
-      [new_line, version_index, version_flag]
-    end
-
-    def generate_version_config(line, module_name, module_operate_type)
-      if ModuleOperateType::FINISH == module_operate_type || ModuleOperateType::PUBLISH == module_operate_type
-        branch_name = GitOperator.new.current_branch(@path)
-        full_name = ''
-
-        # Get version part of source.addition
-        if ModuleOperateType::PUBLISH == module_operate_type
-          full_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){ $2 }
-        else
-          full_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
-        end
-
-        line.sub(/(\s*)version ('|")(\S*)('|")([\s\S]*)/){
-          "#{$1}version '#{full_name}'#{$5}"
-        }
-      else
-        line
-      end
-    end
-
-    def generate_compile_config(line, module_name, module_operate_type)
-      if ModuleOperateType::ADD == module_operate_type
-        line.sub(/(\s*)compile(\s*)('|")(\S*):#{module_name.downcase}:(\S*)('|")(\S*)/){
-          "#{$1}compile project(':module:#{module_name.downcase}')"
-        }
-      elsif ModuleOperateType::DELETE == module_operate_type
-        line.sub(/(\s*)([\s\S]*)('|")(\S*):#{module_name.downcase}:(\S*)('|")(\S*)/){
-          origin_config_of_module = origin_config_of_module(module_name)
-          if origin_config_of_module.empty?
-            line
-          else
-            origin_config_of_module
-          end
-        }
-      elsif ModuleOperateType::FINISH == module_operate_type || ModuleOperateType::PUBLISH == module_operate_type
-        branch_name = GitOperator.new.current_branch(@path)
-        full_name = ''
-
-        # Get version part of source.addition
-        if ModuleOperateType::PUBLISH == module_operate_type
-          full_name = branch_name.sub(/([\s\S]*)\/(\d+.\d+.\d+)_([\s\S]*)/){ $2 }
-        else
-          full_name = branch_name.sub(/([\s\S]*)\/([\s\S]*)/){ $2 }
-        end
-        line.sub(/(\s*)([\s\S]*)('|")(\S*):#{module_name.downcase}(:\S*)*('|")(\S*)/){
-          if $2.downcase.include? 'modulecompile'
-            "#{$1}moduleCompile '#{prefix_of_module(module_name)}:#{module_name.downcase}:#{full_name}-SNAPSHOT'"
-          else
-            "#{$1}compile '#{prefix_of_module(module_name)}:#{module_name.downcase}:#{full_name}-SNAPSHOT'"
-          end
-        }
-      else
-        line
-      end
-    end
-
-    def origin_config_of_module(module_name)
-      origin_config = ''
-
-      Dir.glob("#{@path}/.bigkeeper/*/build.gradle").each do |file|
-        File.open(file, 'r') do |file|
-          file.each_line do |line|
-            if line =~ /(\s*)([\s\S]*)('|")(\S*):#{module_name.downcase}:(\S*)('|")(\S*)/
-              origin_config = line
-              break
-            end
-          end
-        end
-        break unless origin_config.empty?
-      end
-
-      origin_config.chop
-    end
-
-    def prefix_of_module(module_name)
-      origin_config = origin_config_of_module(module_name)
-      prefix = origin_config.sub(/(\s*)([\s\S]*)('|")(\S*)#{module_name.downcase}(\S*)('|")(\S*)/){
-        $4
-      }
-      prefix.chop
-    end
-
-    private :generate_build_config, :generate_compile_config, :generate_version_config, :origin_config_of_module, :prefix_of_module
   end
 end

data/lib/big_keeper/util/lockfile_parser.rb

@@ -0,0 +1,143 @@
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/util/logger'
+require 'big_keeper/util/podfile_detector'
+require 'Singleton'
+
+module BigKeeper
+  class LockfileParser
+    include Singleton
+    attr_accessor :main_path, :dependencies, :pods, :podfile_hash
+    $mode = 'PODS'
+
+    def initialize
+      self.pods = {}
+      self.dependencies = []
+    end
+
+    def parse(main_path)
+      self.main_path = main_path
+      $mode = 'PODS'
+      podfile_lock_lines = File.readlines("#{main_path}/Podfile.lock")
+      Logger.highlight("Analyzing Podfile.lock...")
+      podfile_lock_lines.each do |sentence|
+        if sentence.include?('PODS')
+          $mode = 'PODS'
+        elsif sentence.include?('DEPENDENCIES')
+          $mode = 'DEPENDENCIES'
+        elsif sentence.include?('SPEC REPOS')
+          $mode = 'SPEC REPOS'
+        elsif sentence.include?('SPEC CHECKSUMS')
+          $mode = 'SPEC CHECKSUMS'
+        elsif sentence.include?('CHECKOUT OPTIONS')
+          $mode = 'CHECKOUT OPTIONS'
+        elsif sentence.include?('EXTERNAL SOURCES')
+          $mode = 'EXTERNAL SOURCES'
+        elsif sentence.include?('PODFILE CHECKSUM')
+          $mode = 'PODFILE CHECKSUM'
+        else
+          if $mode == 'PODS'
+             deal_pod(sentence.strip.delete('\n'))
+          end
+          if $mode == 'SPEC CHECKSUMS'
+             deal_spec(sentence.strip.delete('\n'))
+          end
+        end
+       end
+     end
+
+     def get_unlock_pod_list(is_all)
+       result = {}
+       pod_parser = PodfileParser.instance
+       #podfile 中 unlock pods
+       unlock_pods = pod_parser.get_unlock_pod_list
+       # @unlock_pod_list << pod_name unless @module_list.include pod_name
+       if is_all
+         self.dependencies.each do |pod_name|
+           if pod_parser.pod_list.include?(pod_name)
+             next
+           end
+           if self.pods[pod_name] != nil
+             result[pod_name] = self.pods[pod_name]
+           end
+         end
+
+         unlock_pods.each do |pod_name|
+           if self.pods[pod_name] != nil
+             result[pod_name] = self.pods[pod_name]
+           end
+         end
+         return result
+       else
+         unlock_pods.each do |pod_name|
+           if self.pods[pod_name] != nil
+             result[pod_name] = self.pods[pod_name]
+           end
+         end
+         return result
+       end
+     end
+
+    #处理PODS
+    # TODO 去除重复
+    def deal_pod(s)
+      pod_name = get_lock_podname(s)
+      return if pod_name == nil
+      pod_version = get_lock_version(s)
+      if self.pods.keys.include?(pod_name)
+        current_version = self.pods[pod_name]
+        if pod_version != nil && current_version != nil
+            self.pods[pod_name] = chose_version(current_version, pod_version)
+        else
+            self.pods[pod_name] = pod_version unless pod_version == nil
+        end
+      end
+      self.pods[pod_name] = pod_version unless pod_version == nil
+    end
+    #
+    # #处理EXTERNAL SOURCES
+    # def deal_sources(s)
+    #
+    # end
+    # #处理CHECKOUT OPTIONS
+    # def deal_checkout(s)
+    #
+    # end
+
+    #处理SPEC CHECKSUMS
+    def deal_spec(s)
+        if /: +/ =~ s
+        dependency = $~.pre_match.strip
+        self.dependencies << dependency unless self.dependencies.include?(dependency)
+        end
+    end
+
+    def get_lock_podname(sentence) #获得lock pod名称
+      match_result = /(\d+.){1,2}\d+/.match(sentence.delete('- :~>='))
+      pod_name = match_result.pre_match unless match_result == nil
+      return pod_name.delete('()') unless pod_name == nil
+    end
+
+    def get_lock_version(sentence)#获得lock pod版本号
+      match_result = /(\d+.){1,2}\d+/.match(sentence)
+      return match_result[0].strip unless match_result == nil
+    end
+
+    def chose_version(cur_version,temp_version)
+      # p "cur:#{cur_version},temp:#{temp_version}"
+      cur_list = cur_version.split('.')
+      temp_list = temp_version.split('.')
+      cur_list << 0.to_s if cur_list.size == 2
+      temp_list << 0.to_s if temp_list.size == 2
+      if cur_list[0] >= temp_list[0]
+        if cur_list[1] >= temp_list[1]
+          if cur_list[2] > temp_list[2]
+            return cur_version
+          end
+          return temp_version
+        end
+        return temp_version
+      end
+      return temp_version
+     end
+  end
+end

data/lib/big_keeper/util/podfile_detector.rb

@@ -1,27 +1,39 @@
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/model/podfile_model'
 require 'big_keeper/util/logger'
-
+require 'Singleton'
 module BigKeeper
 
-class PodfileDetector
-
-  attr_accessor :module_list, :main_path
+class PodfileParser
+  include Singleton
+  attr_accessor :module_list, :main_path, :pod_list
   $unlock_pod_list = []
   $modify_pod_list = {}
 
-  def initialize(main_path, module_list)
-    @module_list = module_list
-    @main_path = main_path
+  def initialize
+    @module_list = BigkeeperParser.module_names
+    @pod_list = []
   end
 
-  def get_unlock_pod_list
+  def parse(path)
+    @main_path = path
     podfile_lines = File.readlines("#{@main_path}/Podfile")
     Logger.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
-      podfile_lines.collect do |sentence|
-      deal_podfile_line(sentence) unless sentence =~(/(\d+.){1,2}\d+/)
+    podfile_lines.collect do |sentence|
+      if /pod / =~ sentence
+        pod_name = get_pod_name(sentence)
+        @pod_list << pod_name
       end
-      $unlock_pod_list
+    end
+  end
+
+  def get_unlock_pod_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(sentence) unless sentence =~(/'(\d+.){1,2}\d+'/)
+    end
+    $unlock_pod_list
   end
 
   def deal_podfile_line(sentence)
@@ -32,37 +44,24 @@ class PodfileDetector
          pod_model.configurations != '[\'Debug\']' &&
          pod_model.path == nil &&
          pod_model.tag == nil
-            $unlock_pod_list << pod_model.name unless @module_list.include?(pod_model.name)
+            pod_names = pod_model.name.split('/')
+            if pod_names.size > 1
+              pod_name = pod_names[0]
+            else
+              pod_name = pod_model.name
+            end
+            $unlock_pod_list << pod_name unless @module_list.include?(pod_name)
       end
       pod_model
     end
   end
 
+  def get_pod_name(sentence)
 
-  def deal_lock_file(main_path, deal_list)
-      $result = {}
-      podfile_lock_lines = File.readlines("#{main_path}/Podfile.lock")
-      Logger.highlight("Analyzing Podfile.lock...") unless podfile_lock_lines.size.zero?
-      podfile_lock_lines.select do |sentence|
-      if sentence.include?('DEPENDENCIES')  #指定范围解析 Dependencies 之前
-        break
-      end
-
-      temp_sentence = sentence.strip
-      pod_name = get_lock_podname(temp_sentence)
-      if deal_list.include?(pod_name)
-        current_version = $result[pod_name]
-        temp_version = get_lock_version(temp_sentence)
-        if temp_version != nil
-          if current_version != nil
-            $result[pod_name] = chose_version(current_version, temp_version)
-          else
-            $result[pod_name] = temp_version
-          end
-        end
-      end
+    pod_model = deal_podfile_line(sentence)
+    if pod_model != nil
+      return pod_model.name
     end
-    return $result
   end
 
   def self.get_pod_model(sentence)
@@ -72,14 +71,6 @@ class PodfileDetector
     end
   end
 
-  def get_pod_name(sentence)
-    pod_model = deal_podfile_line(sentence)
-    pod_name = pod_model.name if pod_model != nil && pod_model.configurations.nil
-    @unlock_pod_list << pod_name unless @module_list.include pod_name
-  end
-
-
-
   def get_lock_podname(sentence) #获得pod名称
     match_result = /(\d+.){1,2}\d+/.match(sentence.delete('- :~>='))
     pod_name = match_result.pre_match unless match_result == nil

data/lib/big_keeper/util/podfile_operator.rb

@@ -40,15 +40,22 @@ module BigKeeper
       begin
         File.open(podfile, 'r') do |file|
           file.each_line do |line|
-            pod_model = PodfileDetector.get_pod_model(line)
+            pod_model = PodfileParser.get_pod_model(line)
             if pod_model != nil && pod_model.name != nil && dictionary[pod_model.name] != nil
-                # p "#{pod_name},#{dictionary[pod_name]}"
                 temp_file.puts generate_pod_config(pod_model.name, dictionary[pod_model.name], pod_model.comment)
+                dictionary.delete(pod_model.name)
             else
                 temp_file.puts line
             end
           end
         end
+        if !dictionary.empty?
+          temp_file.puts 'def sub_dependency'
+          dictionary.keys.each do |sub_pod|
+            temp_file.puts generate_pod_config(sub_pod, dictionary[sub_pod], 'bigkeeper')
+          end
+          temp_file.puts 'end'
+        end
         temp_file.close
         FileUtils.mv(temp_file.path, podfile)
       ensure
@@ -62,8 +69,9 @@ module BigKeeper
       begin
         File.open(podfile, 'r') do |file|
           file.each_line do |line|
-            pod_model = PodfileDetector.get_pod_model(line)
+            pod_model = PodfileParser.get_pod_model(line)
             if pod_model != nil && pod_model.name != nil && dictionary[pod_model.name] != nil
+                #替换
                 temp_file.puts generate_pod_config(pod_model.name, dictionary[pod_model.name], pod_model.comment)
             else
                 temp_file.puts line

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.8.9"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -301,6 +301,7 @@ files:
 - lib/big_keeper/util/info_plist_operator.rb
 - lib/big_keeper/util/leancloud_logger.rb
 - lib/big_keeper/util/list_generator.rb
+- lib/big_keeper/util/lockfile_parser.rb
 - lib/big_keeper/util/logger.rb
 - lib/big_keeper/util/pod_operator.rb
 - lib/big_keeper/util/podfile_detector.rb
@@ -337,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Efficiency improvement for iOS&Android modular development.