big_keeper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18a0e9bf18ad96844aa32421e09b56aa48681fd9
-  data.tar.gz: 63ea947213a94d6b8707acf5232d2dc7e475f9ed
+  metadata.gz: 4a3c399d6961d86ef419b46541eed58b809c484d
+  data.tar.gz: 699643b23a3b95ef5d843918d0c4f1f8999be335
 SHA512:
-  metadata.gz: af8e302003e39f9b0b5c020eb45429166843420fa0ec01fcff02e8eff2be215b33d6f5195e645e0e44f292e7994abb36db532af24aa8175251d4ea6864a3e3c8
-  data.tar.gz: 30fcdf96aeecee91a1518944c029b92d2e6f6b04aa0d43d967e060dc6bf5fd2a02dfbe4e75664345a3afde80bf7f18e8d566e5835ea85197921e5b126747c4ba
+  metadata.gz: 878010d015f1fab7c07d1392152badae3ef259e5c63b0b916ba0169be9fc616e25a7a6d59f2d35d76619a4567b06a20297e298b091bb599824ce39ce1c41d2fc
+  data.tar.gz: 0b5cbce481f7330aaef652251c01e3ceab73b93bb4f6261ff414426cdce77bed903213e51d69e75e09606b2d023756efb84ad35e34ecf4ec0f4fcc3422cd2e1f

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    big_keeper (0.3.0)
+    big_keeper (0.4.0)
       big_stash (~> 0.1)
       cocoapods
+      colorize
       gli (~> 2.16)
       plist
 
@@ -54,6 +55,7 @@ GEM
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
+    colorize (0.8.1)
     escape (0.0.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
@@ -101,6 +103,7 @@ DEPENDENCIES
   big_stash (~> 0.1)
   bundler (~> 1.15)
   cocoapods
+  colorize
   gli (~> 2.16)
   plist
   rake (~> 10.0)

data/big_keeper.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "big_stash", "~> 0.1"
   spec.add_runtime_dependency "cocoapods"
   spec.add_runtime_dependency "plist"
+  spec.add_runtime_dependency "colorize"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -41,5 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "big_stash", "~> 0.1"
   spec.add_development_dependency "cocoapods"
   spec.add_development_dependency "plist"
+  spec.add_development_dependency "colorize"
   spec.add_development_dependency "rubocop", "~> 0.50.0"
 end

data/docs/zh-CN/RELEASE.md

@@ -0,0 +1,20 @@
+# release - 功能开发流程
+
+直接在命令行执行 `big-keeper release --help` 可以查看其提供的所有功能：
+```
+// todo
+```
+全局参数如下：
+
+- -u, --user：用户名，默认是 git global config 的 user.name，会显示在命令提示信息中，比如上述提示信息中的默认用户名是 mmoaay
+
+- -p, --path：项目路径名，默认是当前所在的路径
+
+-  -v, --version：项目版本号，默认是当前所在的路径
+
+功能列表如下：
+
+- home: 发布主工程命令
+    - start: 开始发布主工程的某个版本
+    - finish:
+- module: 发布模块命令

data/lib/big_keeper.rb

@@ -15,6 +15,7 @@ require 'big_keeper/command/feature_pull'
 require 'big_keeper/command/feature_push'
 require 'big_keeper/command/release_home'
 require 'big_keeper/command/release_module'
+require 'big_keeper/command/podfile_lock'
 
 require 'big_keeper/service/git_service'
 
@@ -28,7 +29,7 @@ module BigKeeper
 
   flag %i[p path], default_value: './'
   flag %i[v ver], default_value: 'Version in Bigkeeper file'
-  flag %i[u user], default_value: GitOperator.new.user
+  flag %i[u user], default_value: GitOperator.new.user.gsub(/[^0-9A-Za-z]/, '').downcase
 
   path = ''
   version = ''
@@ -37,7 +38,12 @@ module BigKeeper
   pre do |global_options, _command, options, args|
     path = File.expand_path(global_options[:path])
     version = global_options[:ver]
-    user = global_options[:user]
+    user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+  end
+
+  if !GitflowOperator.new.verify_git_flow_command
+    p %Q('git-flow' not found, use 'brew install git-flow' to install it)
+    exit
   end
 
   desc 'Feature operations'
@@ -46,7 +52,6 @@ module BigKeeper
     c.desc 'Start a new feature with name for given modules and main project'
     c.command :start do |start|
       start.action do |global_options, options, args|
-        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
         help_now!('user name is required') if user and user.empty?
         help_now!('feature name is required') if args.length < 1
         name = args[0]
@@ -58,7 +63,6 @@ module BigKeeper
     c.desc 'Update moduels for the feature with name'
     c.command :update do |update|
       update.action do |global_options, options, args|
-        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
         help_now!('user name is required') if user and user.empty?
         modules = args[(0...args.length)] if args.length > 0
         feature_update(path, user, modules)
@@ -68,7 +72,6 @@ module BigKeeper
     c.desc 'Switch to the feature with name'
     c.command :switch do |switch|
       switch.action do |global_options, options, args|
-        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
         help_now!('user name is required') if user and user.empty?
         help_now!('feature name is required') if args.length < 1
         name = args[0]
@@ -79,7 +82,6 @@ module BigKeeper
     c.desc 'Pull remote changes for current feature'
     c.command :pull do |pull|
       pull.action do |global_options, options, args|
-        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
         help_now!('user name is required') if user and user.empty?
         feature_pull(path, user)
       end
@@ -88,7 +90,6 @@ module BigKeeper
     c.desc 'Push local changes to remote for current feature'
     c.command :push do |push|
       push.action do |global_options, options, args|
-        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
         help_now!('user name is required') if user and user.empty?
         help_now!('comment message is required') if args.length < 1
         comment = args[0]
@@ -99,7 +100,6 @@ module BigKeeper
     c.desc 'Finish current feature'
     c.command :finish do |finish|
       finish.action do |global_options, options, args|
-        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
         help_now!('user name is required') if user and user.empty?
         feature_finish(path, user)
       end
@@ -124,11 +124,6 @@ module BigKeeper
       home.desc 'Start release home project'
       home.command :start do |start|
         start.action do |global_options, options, args|
-          # path(optional): path of the Bigkeeper file in project
-          # version(optional): if null, will read verson in Bigkeeper file
-          # e.g: ruby big_keeper.rb -p /Users/SFM/Downloads/BigKeeperMain-master
-          # /Bigkeeper  -v 3.0.0 release home start
-          user = user.gsub(/[^0-9A-Za-z]/, '').downcase
           help_now!('user name is required') if user and user.empty?
           release_home_start(path, version, user)
         end
@@ -140,17 +135,44 @@ module BigKeeper
           release_home_finish(path, version)
         end
       end
+    end
 
-      home.desc 'Start release module'
-      home.command :module do |finish|
-        finish.action do |global_options, options, args|
-          help_now!('module name is required') if args.length != 1
-          module_name = args[0]
-          start_module_release(path, module_name)
-        end
+    c.desc 'Start release module'
+    c.command :module do |finish|
+      finish.action do |global_options, options, args|
+        help_now!('module name is required') if args.length != 1
+        module_name = args[0]
+        start_module_release(path, version, user, module_name)
+      end
+    end
+  end
+
+  desc 'Podfile operation'
+  command :podfile do |podfile|
+    podfile.flag %i[pod podfile]
+    podfile.desc 'Podfile'
+    path = ''
+
+    podfile.desc 'Detect podname should be locked.'
+    podfile.command :detect do |detect|
+      detect.action do |global_options,options,args|
+        podfile_detect(path)
+      end
+    end
+
+    podfile.desc 'Lock podname should be locked.'
+    podfile.command :lock do |lock|
+      lock.action do |global_options, options, args|
+        podfile_lock(path)
       end
     end
   end
 
+  desc 'Version'
+  command :version do |version|
+    version.action do |global_options, options, args|
+      p "big-keeper (#{VERSION})"
+    end
+end
   exit run(ARGV)
 end

data/lib/big_keeper/command/feature_pull.rb

@@ -15,7 +15,7 @@ module BigKeeper
       end
 
       p "Pull branch #{branch_name} for home..."
-      GitOperator.new.pull(path, branch_name)
+      GitOperator.new.pull(path)
     ensure
     end
   end

data/lib/big_keeper/command/feature_switch.rb

@@ -20,7 +20,7 @@ module BigKeeper
 
       # Switch to new feature
       GitOperator.new.git_checkout(path, branch_name)
-      GitOperator.new.pull(path, branch_name)
+      GitOperator.new.pull(path)
 
       modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
                                 BigkeeperParser.module_names, ModuleType::PATH)

data/lib/big_keeper/command/podfile_lock.rb

@@ -1,16 +1,51 @@
 
-require './big_keeper/util/podfile_detector'
-require './big_keeper/util/gitflow_operator'
-require './big_keeper/util/bigkeeper_parser'
-require './big_keeper/model/podfile_type'
+require 'big_keeper/util/podfile_detector'
+require 'big_keeper/util/podfile_operator'
+require 'big_keeper/util/gitflow_operator'
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/model/podfile_type'
+require 'big_keeper/util/log_util'
 
 module BigKeeper
+
+  def self.podfile_detect(path)
+      # Parse Bigkeeper file
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      # Get modulars' name
+      modular_list = BigkeeperParser.module_names
+      # initialize PodfileDetector
+      detector = PodfileDetector.new(path,modular_list)
+      # Get unlocked third party pods list
+      unlock_pod_list = detector.get_unlock_pod_list
+      # Print out unlock pod list
+      unlock_pod_list.each do |pod_name|
+        BigKeeperLog.default("#{pod_name} should be locked.")
+      end
+      BigKeeperLog.separator
+
+  end
+
   def self.podfile_lock(path)
-    begin
       # Parse Bigkeeper file
       BigkeeperParser.parse("#{path}/Bigkeeper")
-      unlock_pod_list = PodfileDetector.new.get_unlock_pod_list
-      p unlock_pod_list
-    end
+      # Get modulars' name
+      modular_list = BigkeeperParser.module_names
+      # initialize PodfileDetector
+      detector = PodfileDetector.new(path,modular_list)
+      # 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?
+        BigKeeperLog.warning("There is nothing to be locked.")
+      else
+        PodfileOperator.new.find_and_lock("#{path}/Podfile",dictionary)
+        BigKeeperLog.highlight("The Podfile has been changed.")
+        BigKeeperLog.separator
+      end
+
+
+
   end
+
 end

data/lib/big_keeper/command/release_home.rb

@@ -4,10 +4,6 @@ require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/model/podfile_type'
 require 'big_keeper/util/info_plist_operator'
 
-# 1.切换主工程的分支到 release分支
-# 2.替换当前 podfile 中每个 module 为 pod #{module_name}, :git => '#{source.base}', :tag => '#{source.addition}'
-# 3.替换 info.plist 中的 build version
-
 module BigKeeper
   def self.release_home_start(path, version, user)
     BigkeeperParser.parse("#{path}/Bigkeeper")
@@ -15,37 +11,54 @@ module BigKeeper
   end
 
   def self.release_home_finish(path, version)
-    GitOperator.new.commit(path, "release: V #{version}")
-    GitOperator.new.push(path, "release/#{version}")
-    GitflowOperator.new.finish_release(path, version)
-    GitOperator.new.tag(path, version)
+    Dir.chdir(path) do
+      if GitOperator.new.has_branch(project_path, "release/#{version}")
+        if GitOperator.new.current_branch(project_path) != "release/#{version}"
+          GitOperator.new.commit(path, "release: V #{version}")
+          GitOperator.new.push(path, "release/#{version}")
+          GitflowOperator.new.finish_release(path, version)
+          if GitOperator.new.current_branch(project_path) == "master"
+            GitOperator.new.tag(path, version)
+          else
+            GitOperator.new.git_checkout(project_path, "master")
+            GitOperator.new.tag(path, version)
+          end
+        else
+          raise "Not in release branch, please check your branches."
+        end
+      else
+        raise "Not has release branch, use release start first."
+      end
+    end
   end
 
   private
   def self.start_release(project_path, version, modules, source, user)
-    # step 0 Stash current branch
-    StashService.new.stash(project_path, GitOperator.new.current_branch(project_path), user, modules)
+    Dir.chdir(project_path) do
+      # step 0 Stash current branch
+      StashService.new.stash(project_path, GitOperator.new.current_branch(project_path), user, modules)
 
-    # step 1 checkout release
-    if GitOperator.new.current_branch(project_path) != "release/#{version}"
-      if GitOperator.new.has_branch(project_path, "release/#{version}")
-        GitOperator.new.git_checkout(project_path, "release/#{version}")
-      else
-        GitflowOperator.new.start(project_path, version, GitflowType::RELEASE)
-        GitOperator.new.push(project_path, "release/#{version}")
+      # step 1 checkout release
+      if GitOperator.new.current_branch(project_path) != "release/#{version}"
+        if GitOperator.new.has_branch(project_path, "release/#{version}")
+          GitOperator.new.git_checkout(project_path, "release/#{version}")
+        else
+          GitflowOperator.new.start(project_path, version, GitflowType::RELEASE)
+          GitOperator.new.push(project_path, "release/#{version}")
+        end
       end
-    end
 
-    # step 2 replace_modules
-    PodfileOperator.new.replace_all_module_release(%Q(#{project_path}/Podfile),
-                                                    modules,
-                                                    version,
-                                                    source)
+      # step 2 replace_modules
+      PodfileOperator.new.replace_all_module_release(%Q(#{project_path}/Podfile),
+                                                      modules,
+                                                      version,
+                                                      source)
 
-    # step 3 change Info.plist value
-    InfoPlistOperator.new.change_version_build(project_path, version)
+      # step 3 change Info.plist value
+      InfoPlistOperator.new.change_version_build(project_path, version)
 
-    p `pod install --project-directory=#{project_path}`
-    p `open #{project_path}/*.xcworkspace`
+      p `pod install --project-directory=#{project_path}`
+      p `open #{project_path}/*.xcworkspace`
+    end
   end
 end

data/lib/big_keeper/command/release_module.rb

@@ -4,24 +4,24 @@ require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/model/podfile_type'
 require 'big_keeper/util/info_plist_operator'
 
-# 替换当前 podfile 中某个 module 为 pod #{module_name}, :git => '#{source.base}', :tag => '#{source.addition}'
-
 module BigKeeper
-  def self.start_module_release(path, module_name)
-    BigkeeperParser.parse("#{path}/Bigkeeper")
-
-    module_release(path,
-            module_name,
-            GitInfo.new(BigkeeperParser.home_git, GitType::BRANCH, 'develop'))
+  def self.start_module_release(path, version, user, module_name)
+    main_path = File.expand_path("#{path}/Example")
+    module_release(main_path,
+                version,
+      BigkeeperParser::module_names,
+      GitInfo.new(BigkeeperParser::home_git, GitType::TAG, version), user)
   end
 
   private
-  def self.module_release(project_path, module_name, source)
-    PodfileOperator.new.find_and_replace(%Q(#{project_path}/Podfile),
-                                         module_name,
-                                         ModuleType::GIT,
-                                         source)
-    p `pod install --project-directory=#{project_path}`
-    p `open #{project_path}/*.xcworkspace`
+  def self.module_release(project_path, version, module_name, source)
+    Dir.chdir(project_path) do
+      PodfileOperator.new.find_and_replace(%Q(#{project_path}/Podfile),
+                                                      module_name,
+                                                      ModuleType::GIT,
+                                                        source)
+      p `pod install --project-directory=#{project_path}`
+      p `open #{project_path}/*.xcworkspace`
+    end
   end
 end

data/lib/big_keeper/model/podfile_model.rb

@@ -0,0 +1,33 @@
+
+module BigKeeper
+
+class Podfile_Modle
+  attr_accessor :name,:git,:path,:configurations,:branch,:tag,:comment
+  def initialize(sentence)
+    if sentence.include?('#')
+      list = sentence.split('#')
+      @comment = list[1]
+      sentence = list[0]
+    end
+
+    sentence_slip_list = sentence.split(',')
+    return if sentence_slip_list.size.zero?
+    for piece in sentence_slip_list do
+        if /:git =>/ =~ piece
+          @git = $~.post_match.strip
+        elsif /:path =>/ =~ piece
+          @path = $~.post_match.strip
+        elsif /:configurations =>/ =~ piece
+          @configurations = $~.post_match.strip
+        elsif /:branch =>/ =~ piece
+          @branch = $~.post_match.strip
+        elsif /:tag =>/ =~ piece
+          @tag = $~.post_match.strip
+        elsif /pod /=~ piece
+          @name = $~.post_match.delete("'\n ")
+        end
+      #  p %Q{model name:#{@name},git:#{@git},path:#{@path},config:#{@configurations},branch:#{@branch},tag:#{@tag},comment:#{@comment}}
+    end
+  end
+end
+end

data/lib/big_keeper/service/git_service.rb

@@ -12,7 +12,7 @@ module BigKeeper
             raise %Q('master' has unpushed commits, you should fix it)
           else
             GitOperator.new.git_checkout(path, 'master')
-            GitOperator.new.pull(path, 'master')
+            GitOperator.new.pull(path)
           end
         else
           GitOperator.new.git_checkout(path, 'master')
@@ -25,7 +25,7 @@ module BigKeeper
             raise %Q('develop' has unpushed commits, you should fix it)
           else
             GitOperator.new.git_checkout(path, 'develop')
-            GitOperator.new.pull(path, 'develop')
+            GitOperator.new.pull(path)
           end
         else
           GitOperator.new.git_checkout(path, 'develop')
@@ -40,7 +40,7 @@ module BigKeeper
       branch_name = "#{GitflowType.name(type)}/#{name}"
       if GitOperator.new.has_branch(path, branch_name)
         GitOperator.new.git_checkout(path, branch_name)
-        GitOperator.new.pull(path, branch_name)
+        GitOperator.new.pull(path)
       else
         GitflowOperator.new.start(path, name, type)
         GitOperator.new.push(path, branch_name)

data/lib/big_keeper/service/module_service.rb

@@ -19,7 +19,7 @@ module BigKeeper
           GitOperator.new.git_checkout(module_full_path, branch_name)
         end
         p "Pull branch #{branch_name} for module #{module_name}..."
-        GitOperator.new.pull(module_full_path, branch_name)
+        GitOperator.new.pull(module_full_path)
       end
     end
 
@@ -34,7 +34,7 @@ module BigKeeper
         GitOperator.new.git_checkout(module_full_path, branch_name)
       else
         GitOperator.new.git_checkout(module_full_path, branch_name)
-        GitOperator.new.pull(module_full_path, branch_name)
+        GitOperator.new.pull(module_full_path)
       end
     end
 

data/lib/big_keeper/util/git_operator.rb

@@ -39,7 +39,11 @@ module BigKeeper
 
     def git_checkout(path, branch_name)
       Dir.chdir(path) do
-        `git checkout #{branch_name}`
+        IO.popen("git checkout #{branch_name}") do |io|
+          io.each do |line|
+            raise "Checkout #{branch_name} failed." if line.include? 'error'
+          end
+        end
       end
     end
 
@@ -70,13 +74,13 @@ module BigKeeper
 
     def push(path, branch_name)
       Dir.chdir(path) do
-        p `git push origin #{branch_name}`
+        p `git push -u origin #{branch_name}`
       end
     end
 
-    def pull(path, branch_name)
+    def pull(path)
       Dir.chdir(path) do
-        p `git pull origin #{branch_name}`
+        p `git pull`
       end
     end
 

data/lib/big_keeper/util/gitflow_operator.rb

@@ -10,6 +10,16 @@ module BigKeeper
       end
     end
 
+    def verify_git_flow_command
+      has_git_flow_command = false
+      IO.popen('command -v git-flow') do |io|
+        io.each do |line|
+          has_git_flow_command = true
+        end
+      end
+      has_git_flow_command
+    end
+
     def verify_git_flow(path)
       has_git_flow = false
       Dir.chdir(path) do

data/lib/big_keeper/util/log_util.rb

@@ -0,0 +1,40 @@
+require 'colorize'
+
+module BigKeeper
+  DEFAULT_LOG = 1
+  HIGHLIGHT_LOG = 2
+  ERROR_LOG = 3
+  WARNING_LOG = 4
+
+  class BigKeeperLog
+
+    def self.log_with_type(sentence,type)
+      case type
+      when DEFAULT_LOG then puts sentence.to_s.colorize(:default)
+      when HIGHLIGHT_LOG then puts sentence.to_s.colorize(:green)
+      when ERROR_LOG then raise sentence.to_s.colorize(:red)
+      when WARNING_LOG then puts sentence.to_s.colorize(:yellow)
+      end
+    end
+
+    def self.default(sentence)
+      puts sentence.to_s.colorize(:default)
+    end
+
+    def self.highlight(sentence)
+      puts sentence.to_s.colorize(:green)
+    end
+
+    def self.error(sentence)
+      raise sentence.to_s.colorize(:red)
+    end
+
+    def self.warning(sentence)
+      puts sentence.to_s.colorize(:yellow)
+    end
+
+    def self.separator
+      puts "- - - - - - - - - - - - - - - - - - - - - - - - - - -".colorize(:light_blue)
+    end
+  end
+end

data/lib/big_keeper/util/podfile_detector.rb

@@ -1,68 +1,57 @@
-require '../util/param_parser'
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/model/podfile_model'
+require 'big_keeper/util/log_util'
 
-params = BigKeeper::ParamParser.new.detect_podfile_unlock_items
-main_path = File.expand_path(params[:main_path])
-
-$modular_name_list = ["ELMKnightCollegeModule","LPDFoundationKit",
-  "LPDIntelligentDispatchModular","LPDUserRelevanceModular",
-  "LPDFeedbackModular","LPDQualityControlKit","LPDWalletModular",
-  "LPDRiderClassificationModular","LPDTransferOrderModular",
-  "LPDActivityModular","LPDPOIAddressService"]
+module BigKeeper
 
 class PodfileDetector
 
+  attr_accessor :modular_list, :main_path
   $unlock_pod_list = []
   $modify_pod_list = {}
-  def get_unlock_pod_list(main_path)
-    podfile_lines = File.readlines("#{main_path}/Podfile")
-     p 'Analyzing Podfile...' unless podfile_lines.size.zero?
+
+  def initialize(main_path,modular_list)
+    @modular_list = modular_list
+    @main_path = main_path
+  end
+
+  def get_unlock_pod_list
+    podfile_lines = File.readlines("#{@main_path}/Podfile")
+    BigKeeperLog.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
       podfile_lines.collect do |sentence|
-      deal_podfile_line(sentence) unless sentence =~(/\'\d+.\d+.\d+'/)
+      deal_podfile_line(sentence) unless sentence =~(/(\d+.){1,2}\d+/)
       end
-      p $unlock_pod_list
-      $modify_pod_list = deal_lock_file(main_path,$unlock_pod_list)
-      p $modify_pod_list
+      return $unlock_pod_list
+      # p $unlock_pod_list
   end
 
   def deal_podfile_line(sentence)
     if sentence.include?('pod ')
       pod_model = Podfile_Modle.new(sentence)
-      # p pod_model
       if !pod_model.name.empty? && pod_model.configurations != '[\'Debug\']' && pod_model.path == nil && pod_model.tag == nil
-          $unlock_pod_list << pod_model.name unless $modular_name_list.include?(pod_model.name)
+            $unlock_pod_list << pod_model.name unless @modular_list.include?(pod_model.name)
       end
       return pod_model
     end
   end
 
-  def get_pod_name(sentence)
-    # match_data = /\'\w*\'/.match(sentence)
-    # pod_name = match_data.to_a[0].delete('\'')
-    pod_model = deal_podfile_line(sentence)
-    pod_name = pod_model.name if pod_model != nil && pod_model.configurations.nil
-    # puts pod_name
-    $unlock_pod_list << pod_name unless modular_name_list.include pod_name
-  end
 
   def deal_lock_file(main_path,deal_list)
       $result = {}
       podfile_lock_lines = File.readlines("#{main_path}/Podfile.lock")
-      p 'Analyzing Podfile.lock...' unless podfile_lock_lines.size.zero?
+      BigKeeperLog.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)
-      # p pod_name
       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
-            # p "cur_version #{current_version} temp_version #{temp_version}"
             $result[pod_name] = chose_version(current_version,temp_version)
           else
             $result[pod_name] = temp_version
@@ -70,24 +59,37 @@ class PodfileDetector
         end
       end
     end
-      return $result
+    return $result
+  end
+
+  def self.get_pod_model(sentence)
+    if sentence.include?('pod ')
+      pod_model = Podfile_Modle.new(sentence)
+      return pod_model
+    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 @modular_list.include pod_name
+  end
+
+
+
   def get_lock_podname(sentence) #获得pod名称
-    # p sentence.delete('- :~>=')
-    match_result = /(\d+.\d+.\d+)|(\d+.\d+)/.match(sentence.delete('- :~>='))
+    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
+    return pod_name.delete('()') unless pod_name == nil
   end
 
   def get_lock_version(sentence)#获得pod版本号
-     sentence.scan(/\d+.\d+.\d+/) do |version|
-      return version
-     end
-     return nil
+    match_result = /(\d+.){1,2}\d+/.match(sentence)
+    return match_result[0] 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('.')
     temp_list << 0.to_s if temp_list.size == 2
@@ -102,39 +104,5 @@ class PodfileDetector
     end
     return temp_version
   end
-
 end
-
-class Podfile_Modle
-  attr_accessor :name,:git,:path,:configurations,:branch,:tag,:comment
-  def initialize(sentence)
-    if sentence.include?('#')
-      list = sentence.split('#')
-      @comment = list[1]
-      sentence = list[0]
-    end
-
-    sentence_slip_list = sentence.split(',')
-    return if sentence_slip_list.size.zero?
-    for piece in sentence_slip_list do
-        if /:git =>/ =~ piece
-          @git = $~.post_match.strip
-        elsif /:path =>/ =~ piece
-          @path = $~.post_match.strip
-        elsif /:configurations =>/ =~ piece
-          @configurations = $~.post_match.strip
-        elsif /:branch =>/ =~ piece
-          @branch = $~.post_match.strip
-        elsif /:tag =>/ =~ piece
-          @tag = $~.post_match.strip
-        elsif /pod /=~ piece
-          @name = $~.post_match.delete("'\n ")
-        end
-      #  p %Q{model name:#{@name},git:#{@git},path:#{@path},config:#{@configurations},branch:#{@branch},tag:#{@tag},comment:#{@comment}}
-    end
-  end
 end
-
-# p params
-# p main_path
-PodfileDetector.new.get_unlock_pod_list(main_path)

data/lib/big_keeper/util/podfile_operator.rb

@@ -1,6 +1,7 @@
 require 'tempfile'
 require 'fileutils'
 require 'big_keeper/model/podfile_type'
+require 'big_keeper/util/podfile_detector'
 
 module BigKeeper
   # Operator for podfile
@@ -74,6 +75,15 @@ module BigKeeper
       module_config
     end
 
+    def generate_pod_config(pod_name, version,comment)
+      module_config = ''
+      if comment != nil
+        module_config = "  pod '#{pod_name}' , '#{version}' # #{comment}"
+      else
+        module_config =  "  pod '#{pod_name}' , '#{version}'"
+      end
+    end
+
     def replace_all_module_release(podfile, module_names, version, source)
 
       module_names.each do |module_name|
@@ -106,6 +116,27 @@ module BigKeeper
       # end
     end
 
-    private :generate_module_config
+    def find_and_lock(podfile,dictionary)
+      temp_file = Tempfile.new('.Podfile.tmp')
+      begin
+        File.open(podfile, 'r') do |file|
+          file.each_line do |line|
+            pod_model = PodfileDetector.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)
+            else
+                temp_file.puts line
+            end
+          end
+        end
+        temp_file.close
+        FileUtils.mv(temp_file.path, podfile)
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+    private :generate_module_config,:generate_pod_config
   end
 end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: big_keeper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +215,7 @@ files:
 - docs/zh-CN/BIGKEEPER_FILE.md
 - docs/zh-CN/FEATURE.md
 - docs/zh-CN/README.md
+- docs/zh-CN/RELEASE.md
 - lib/big_keeper.rb
 - lib/big_keeper/command/feature_finish.rb
 - lib/big_keeper/command/feature_pull.rb
@@ -201,6 +230,7 @@ files:
 - lib/big_keeper/command/start_module_release.sh
 - lib/big_keeper/model/gitflow_type.rb
 - lib/big_keeper/model/operate_type.rb
+- lib/big_keeper/model/podfile_model.rb
 - lib/big_keeper/model/podfile_type.rb
 - lib/big_keeper/service/git_service.rb
 - lib/big_keeper/service/module_service.rb
@@ -209,6 +239,7 @@ files:
 - lib/big_keeper/util/git_operator.rb
 - lib/big_keeper/util/gitflow_operator.rb
 - lib/big_keeper/util/info_plist_operator.rb
+- lib/big_keeper/util/log_util.rb
 - lib/big_keeper/util/podfile_detector.rb
 - lib/big_keeper/util/podfile_operator.rb
 - lib/big_keeper/version.rb