bigkeeper 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 028f56615f3e793abad38eed28a1f898564632a3
-  data.tar.gz: 2143d81a7144a0611bd4bb5ec5ba3fe8d34a032d
+  metadata.gz: 67a9534eec7e2adda494fbf338a2d425d8a50880
+  data.tar.gz: cfdf86a415c35767c26378f750293f9ca352f73e
 SHA512:
-  metadata.gz: 767a5d482e00d1eefb7a95863d8c1990405656187ee168edb9726ab78e5f8d07398349fac58a52404c3edb9dc6f1296fbd6bbaac22a7da174ae12ae5a90e819e
-  data.tar.gz: 2dcd82312c0cb2dc2c387cff5ac9e588f216c70e4ea8311d1b1626c6fb67c84c0fe3f231f4ce4aad260ba29c011a9f71a9e017a4c7e07e5cf0d0ee2757895fd2
+  metadata.gz: 3bcd74eca37de2258644c22e37290918cc3e5709a1bab3be4c9d1de36705f17edaf9d82fea873c5c734c8a894ad5c9b647e3d0b5c10ab4bc245600eb8ba347b8
+  data.tar.gz: 07ab4bc44a44426a1706a6a87b62c0148a7cd6dd0f14056bf44773a36f7fc55488d03f83f025e6da980c1f3b883b5ca9c349f7b19b8b13255cb992a4a50ed9e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.7.8)
+    bigkeeper (0.8.0)
       big_stash (~> 0.1)
       cocoapods
       colorize
@@ -111,4 +111,4 @@ DEPENDENCIES
   rubocop (~> 0.50.0)
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/lib/big_keeper.rb

@@ -4,6 +4,7 @@ require 'big_keeper/version'
 
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/util/git_operator'
+require 'big_keeper/util/verify_operator'
 
 require 'big_keeper/model/gitflow_type'
 
@@ -25,6 +26,11 @@ module BigKeeper
   flag %i[v ver], default_value: 'Version in Bigkeeper file'
   flag %i[u user], default_value: GitOperator.new.user.gsub(/[^0-9A-Za-z]/, '').downcase
 
+  if VerifyOperator.already_in_process?
+    p %Q(There is another 'big' command in process, please wait)
+    exit
+  end
+
   if !GitflowOperator.new.verify_git_flow_command
     p %Q('git-flow' not found, use 'brew install git-flow' to install it)
     exit

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

@@ -127,11 +127,25 @@ module BigKeeper
 
       c.desc "List all the #{GitflowType.name(type)}s"
       c.command :list do |list|
-        list.action do |global_options, options, args|
-          Logger.highlight("Generating feature tree of all version...") if args.length < 1
-          path = File.expand_path(global_options[:path])
-          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
-          list(path,user,type)
+        list.flag %i[v version] , default_value: 'all versions'
+        list.desc "Print list of TREE format."
+        list.command :tree do |tree|
+          tree.action do |global_options, options, args|
+            Logger.highlight("Generating #{GitflowType.name(type)} tree of all version...") if args.length < 1
+            path = File.expand_path(global_options[:path])
+            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+            list(path, user, type, options)
+          end
+        end
+
+        list.desc "Print list of JSON format."
+        list.command :json do |json|
+          json.action do |global_options, options, args|
+            options[:json] = true
+            path = File.expand_path(global_options[:path])
+            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+            list(path, user, type, options)
+          end
         end
       end
     end

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

@@ -5,38 +5,59 @@ require 'big_keeper/service/module_service'
 
 
 module BigKeeper
-  def self.list(path,user,type)
+  def self.list(path, user, type, options)
     BigkeeperParser.parse("#{path}/Bigkeeper")
+    home_path = File.expand_path(path)
     #get home project branches
-    branches = GitService.new.branchs_with_type(File.expand_path(path), type)
+    branches = GitService.new.branchs_with_type(home_path, type)
     #get modules list
+    is_print_log = false if options[:json]
+    #get search version
+    version = options[:version]
+    cache_path = File.expand_path("#{path}/.bigkeeper")
+    json_path = "#{cache_path}/branches.json"
     begin
-      modules = BigkeeperParser.module_names
-      file = File.new("#{path}/.bigkeeper/feature_list", 'w')
+      #get cache file path
+      FileUtils.mkdir_p(cache_path) unless File.exist?(cache_path)
+      file = File.new(json_path, 'w')
       begin
-        #read git info
-        git_operator = GitOperator.new
-        modules.each do |module_name|
-          module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
-          #local project verify
-          if !File.exist? module_full_path
-            Logger.default("No local repository for module '#{module_name}', clone it...")
-            module_git = BigkeeperParser.module_git(module_name)
-            git_operator.clone(File.expand_path("#{module_full_path}/../"), module_git)
-          end
-          feature_modules_list = ModuleService.new.list(module_full_path, user, module_name)
-          dic = {}
-          dic[module_name] = feature_modules_list
-          file << dic
-          file << "\n\n"
-        end
-         file.close
+        #get all modules info
+        module_list_dic = get_module_info(path, user, type, version, branches)
+        file << module_list_dic.to_json
+        file.close
       end
-
       #print list
-      ListGenerator.generate(file,branches)
+      generate_list_with_option(options, json_path, version, branches)
     ensure
       file.close
     end
   end
+
+  def self.get_module_info(path, user, type, version, home_branches)
+    #get module list
+    modules = BigkeeperParser.module_names
+    git_operator = GitOperator.new
+    module_info_list = []
+    modules.each do |module_name|
+      module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+      #local project verify
+      if !File.exist? module_full_path
+        Logger.default("No local repository for module '#{module_name}', clone it...") if is_print_log
+        module_git = BigkeeperParser.module_git(module_name)
+        git_operator.clone(File.expand_path("#{module_full_path}/../"), module_git)
+      end
+      #每个模块详细信息
+      module_branch_info = ModuleService.new.module_info(module_full_path, home_branches, user, type, module_name, version)
+      module_info_list << module_branch_info
+    end
+    module_info_list
+  end
+
+  def self.generate_list_with_option(options, file_path, version, home_branches)
+    if options[:json]
+        ListGenerator.generate_json(file_path, home_branches, version)
+    else
+        ListGenerator.generate_tree(file_path, home_branches, version)
+    end
+  end
 end

data/lib/big_keeper/command/pod.rb

@@ -5,12 +5,11 @@ module BigKeeper
   def self.pod_command
     desc 'Podfile operation'
     command :podfile do |podfile|
-      podfile.flag %i[pod podfile]
       podfile.desc 'Podfile'
 
       podfile.desc 'Detect podname should be locked.'
       podfile.command :detect do |detect|
-        detect.action do |global_options,options,args|
+        detect.action do |global_options, options, args|
           path = File.expand_path(global_options[:path])
           podfile_detect(path)
         end

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

@@ -14,7 +14,7 @@ module BigKeeper
       # Get modules' name
       module_list = BigkeeperParser.module_names
       # initialize PodfileDetector
-      detector = PodfileDetector.new(path,module_list)
+      detector = PodfileDetector.new(path, module_list)
       # Get unlocked third party pods list
       unlock_pod_list = detector.get_unlock_pod_list
       # Print out unlock pod list
@@ -31,15 +31,15 @@ module BigKeeper
       # Get modules' name
       module_list = BigkeeperParser.module_names
       # initialize PodfileDetector
-      detector = PodfileDetector.new(path,module_list)
+      detector = PodfileDetector.new(path, module_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)
+      dictionary = detector.deal_lock_file(path, unlock_pod_list)
       if dictionary.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", dictionary)
         Logger.highlight("The Podfile has been changed.")
         Logger.separator
       end
@@ -61,7 +61,7 @@ module BigKeeper
       if module_dictionary.empty?
         Logger.warning("There is nothing to be upgrade.")
       else
-        PodfileOperator.new.find_and_upgrade("#{path}/Podfile",module_dictionary)
+        PodfileOperator.new.find_and_upgrade("#{path}/Podfile", module_dictionary)
         Logger.highlight("The Podfile has been changed.")
       end
   end

data/lib/big_keeper/command/release.rb

@@ -34,6 +34,7 @@ module BigKeeper
       end
 
       c.desc 'release module'
+      c.switch [:i,:ignore]
       c.command :module do |m|
         m.desc 'Start release module project'
         m.command :start do |start|
@@ -45,11 +46,12 @@ module BigKeeper
             help_now!('module name is required') if args.length != 1
             raise Logger.error("release version is required") if version == nil
             module_name = args[0]
-            release_module_start(path, version, user, module_name)
+            release_module_start(path, version, user, module_name, options[:ignore])
           end
         end
 
         m.desc 'finish release module project'
+        m.switch [:s,:spec]
         m.command :finish do |finish|
           finish.action do |global_options, options, args|
             path = File.expand_path(global_options[:path])
@@ -59,7 +61,7 @@ module BigKeeper
             help_now!('module name is required') if args.length != 1
             raise Logger.error("release version is required") if version == nil
             module_name = args[0]
-            release_module_finish(path, version, user, module_name)
+            release_module_finish(path, version, user, module_name, options[:spec])
           end
         end
       end

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

@@ -4,64 +4,64 @@ require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/info_plist_operator'
 require 'big_keeper/util/logger'
+require 'big_keeper/util/xcode_operator'
 
 module BigKeeper
   def self.release_home_start(path, version, user)
     BigkeeperParser.parse("#{path}/Bigkeeper")
-    start_release(path, version, BigkeeperParser::module_names, user)
-  end
 
-  def self.release_home_finish(path, version)
-    Dir.chdir(path) do
+    modules = BigkeeperParser.module_names
+
+    #stash
+    StashService.new.stash_all(path, GitOperator.new.current_branch(path), user, modules)
+
+    # check
+    GitOperator.new.check_merge(path, "feature/#{version}")
+    GitOperator.new.check_diff(path, "develop", "master")
+
+    #checkout release branch
+    Logger.highlight(%Q(Start to checkout Branch release/#{version}))
+    if GitOperator.new.current_branch(path) != "release/#{version}"
       if GitOperator.new.has_branch(path, "release/#{version}")
-        if GitOperator.new.current_branch(path) == "release/#{version}"
-          GitOperator.new.commit(path, "release: V #{version}")
-          GitOperator.new.push_to_remote(path, "release/#{version}")
-          GitflowOperator.new.finish_release(path, version)
-          if GitOperator.new.current_branch(path) == "master"
-            GitOperator.new.tag(path, version)
-          else
-            GitOperator.new.checkout(path, "master")
-            GitOperator.new.tag(path, version)
-          end
-        else
-          raise Logger.error("Not in release branch, please check your branches.")
-        end
+        GitOperator.new.checkout(path, "release/#{version}")
       else
-        raise Logger.error("Not has release branch, please use release start first.")
+        GitflowOperator.new.start(path, version, GitflowType::RELEASE)
+        GitOperator.new.push_to_remote(path, "release/#{version}")
       end
     end
-  end
 
-  private
-  def self.start_release(project_path, version, modules, user)
-    Dir.chdir(project_path) do
-      # step 0 Stash current branch
-      StashService.new.stash_all(project_path, GitOperator.new.current_branch(project_path), user, modules)
+    Logger.highlight(%Q(Start to release/#{version}))
+    # step 2 replace_modules
+    PodfileOperator.new.replace_all_module_release(path,
+                                                   user,
+                                                   modules,
+                                                   ModuleOperateType::RELEASE)
+
+    # step 3 change Info.plist value
+    InfoPlistOperator.new.change_version_build(path, version)
 
-      Logger.highlight(%Q(Start to checkout Branch 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.checkout(project_path, "release/#{version}")
+    DepService.dep_operator(path, user).install(true)
+    XcodeOperator.open_workspace(path)
+  end
+
+  def self.release_home_finish(path, version)
+    if GitOperator.new.has_branch(path, "release/#{version}")
+      if GitOperator.new.current_branch(path) == "release/#{version}"
+        GitOperator.new.commit(path, "release: V #{version}")
+        GitOperator.new.push_to_remote(path, "release/#{version}")
+        GitflowOperator.new.finish_release(path, version)
+        if GitOperator.new.current_branch(path) == "master"
+          GitOperator.new.tag(path, version)
         else
-          GitflowOperator.new.start(project_path, version, GitflowType::RELEASE)
-          GitOperator.new.push_to_remote(project_path, "release/#{version}")
+          GitOperator.new.checkout(path, "master")
+          GitOperator.new.tag(path, version)
         end
+      else
+        raise Logger.error("Not in release branch, please check your branches.")
       end
-
-      Logger.highlight(%Q(Start to release/#{version}))
-      # step 2 replace_modules
-      PodfileOperator.new.replace_all_module_release(project_path,
-                                                     user,
-                                                     modules,
-                                                     version)
-
-      # step 3 change Info.plist value
-      InfoPlistOperator.new.change_version_build(project_path, version)
-
-      DepService.dep_operator(project_path, user).install(true)
-      `open #{project_path}/*.xcworkspace`
+    else
+      raise Logger.error("Not has release branch, please use release start first.")
     end
   end
+
 end

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

@@ -5,102 +5,55 @@ require 'big_keeper/dependency/dep_type'
 require 'big_keeper/util/info_plist_operator'
 require 'big_keeper/util/git_operator'
 require 'big_keeper/util/logger'
+require 'big_keeper/util/pod_operator'
 
 module BigKeeper
-  def self.release_module_start(path, version, user, module_name)
+  def self.release_module_start(path, version, user, module_name, ignore)
     BigkeeperParser.parse("#{path}/Bigkeeper")
+    module_path = BigkeeperParser.module_full_path(path, user, module_name)
 
-    Dir.chdir(path) do
-      git_info = GitInfo.new(BigkeeperParser::home_git, GitType::TAG, version)
-      module_path = self.get_module_path_default(path, user, module_name)
-      start_module_release(module_path, version, module_name, git_info, user)
-    end
-  end
+    # stash
+    StashService.new.stash(module_path, GitOperator.new.current_branch(module_path), module_name)
 
-  def self.release_module_finish(path, version, user, module_name)
-    BigkeeperParser.parse("#{path}/Bigkeeper")
-    module_path = self.get_module_path_default(path, user, module_name)
-
-    Logger.error("current branch has changed") unless GitOperator.new.has_changes(module_path)
-    # check out master
-    if GitOperator.new.current_branch(module_path) != "master"
-      current_name = GitOperator.new.current_branch(module_path)
-      GitOperator.new.checkout(module_path, "master")
-      Logger.highlight("Push branch '#{current_name}' for '#{module_name}'...")
-      GitService.new.verify_push(module_path, "finish #{GitflowType.name(GitflowType::RELEASE)} #{current_name}", "master", "#{module_name}")
+    #check
+    if ignore != true
+      GitOperator.new.check_merge(module_path, "feature/#{version}")
+      GitOperator.new.check_diff(module_path, "develop", "master")
+      Logger.highlight(%Q(#{module_name} release check finish))
     end
-    return
 
-    Dir.chdir(module_path) do
-      # rebase develop to master
-      Logger.highlight(%Q(Rebase develop to master))
-
-      #修改 podspec 文件
-      # TO DO: - advanced to use Regular Expression
-      PodfileOperator.new.podspec_change(%Q(#{module_path}/#{module_name}.podspec), version, module_name)
-
-      GitService.new.verify_rebase(module_path, 'develop', "#{module_name}")
-      GitOperator.new.verify_push(module_path, "finish rebase develop to master", "master", "#{module_name}")
-      GitOperator.new.tag(module_path, version)
-
-      Logger.highlight(%Q(Start Pod repo push #{module_name}))
-      IO.popen("pod repo push #{module_name} #{module_name}.podspec --allow-warnings --sources=#{BigkeeperParser::sourcemodule_path}") do |io|
-        io.each do |line|
-          has_error = true if line.include? "ERROR"
-        end
-      end
-      if has_error
-        Logger.error("Pod repo push in '#{module_name}'")
-        return
-      end
+    # checkout to develop branch
+    Logger.highlight(%Q(Start checkout #{module_name} to Branch develop))
+    GitService.new.verify_checkout_pull(module_path, "develop")
 
-      Logger.highlight(%Q(Success release #{module_name} V#{version}))
-    end
+    Logger.highlight(%Q(#{module_name} release start finish))
   end
 
-  private
-  def self.start_module_release(module_path, version, module_name, source, user)
-    if GitOperator.new.has_changes(module_path)
-      StashService.new.stash_all(module_path, GitOperator.new.current_branch(module_path), user, module_name.split())
-    end
-
-    # step 1 checkout to develop branch
-    Logger.highlight(%Q(Start checkout #{module_name} to Branch develop))
-    if GitOperator.new.current_branch(module_path) != "develop"
-      if GitOperator.new.has_branch(module_path, "develop")
-        GitOperator.new.checkout(module_path, "develop")
-      else
-        Logger.error("Cann't find develop branch, please check.")
-      end
-    end
+## release finish
+  def self.release_module_finish(path, version, user, module_name, spec)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    module_path = BigkeeperParser.module_full_path(path, user, module_name)
 
-    Dir.chdir(module_path) do
-      # Pod lib lint
-      Logger.highlight(%Q(Start Pod lib lint #{module_name}))
-      has_error = false
-      IO.popen("pod lib lint --allow-warnings --verbose --use-libraries --sources=#{BigkeeperParser::sourcemodule_path}") do |io|
-        io.each do |line|
-          has_error = true if line.include? "ERROR"
-        end
-      end
-      if has_error
-        Logger.error("Pod lib error in '#{module_name}'")
-        return
-      end
+    # check commit
+    Logger.error("current branch has unpush files") if GitOperator.new.has_changes(module_path)
+    # check out master
+    Logger.highlight("'#{module_name}' checkout branch to master...")
+    GitService.new.verify_checkout_pull(module_path, "master")
+
+    Logger.highlight(%Q(Merge develop to master))
+    # merge develop to master
+    GitOperator.new.merge(module_path, "develop")
+    GitOperator.new.push_to_remote(module_path, "master")
+
+    #修改 podspec 文件
+    # TO DO: - advanced to use Regular Expression
+    has_change = PodfileOperator.new.podspec_change(%Q(#{module_path}/#{module_name}.podspec), version, module_name)
+    GitService.new.verify_push(module_path, "Change version number", "master", "#{module_name}") if has_change == true
+    GitOperator.new.tag(module_path, version)
+    # pod repo push
+    if spec == true
+      PodOperator.pod_repo_push(module_path, module_name, BigkeeperParser.source_spec_path(module_name), version)
     end
-
-    GitOperator.new.commit(module_path, "update podspec")
-    GitOperator.new.first_push(module_path, GitOperator.new.current_branch(module_path))
-    Logger.highlight(%Q(Pod lib lint success))
   end
 
-  def self.get_module_path_default(path, user, module_name)
-    module_path = BigkeeperParser::module_path(user, module_name)
-    if module_path == "../#{module_name}"
-      path_array = path.split('/')
-      path_array.pop()
-      module_path = path_array.join('/') + "/#{module_name}"
-    end
-    module_path
-  end
 end

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -3,6 +3,7 @@ require 'big_keeper/dependency/dep_operator'
 require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/xcode_operator'
 require 'big_keeper/util/cache_operator'
+require 'big_keeper/util/file_operator'
 
 module BigKeeper
   # Operator for podfile
@@ -64,6 +65,16 @@ module BigKeeper
           branch_name = GitOperator.new.current_branch(@path)
           base_branch_name = GitflowType.base_branch(GitService.new.current_branch_type(@path))
           "#{$1}pod '#{module_name}', :git => '#{module_git}', :branch => '#{base_branch_name}'"
+        elsif ModuleOperateType::RELEASE == module_operate_type
+          module_git = BigkeeperParser.module_git(module_name)
+          lastest_tag, is_spec = find_lastest_tag(module_name)
+          if is_spec == true
+            Logger.default("#{module_name} lastest tag is #{lastest_tag}, this tag has published.")
+            "#{$1}pod '#{module_name}', '#{lastest_tag}'"
+          else
+            Logger.default("#{module_name} lastest tag is #{lastest_tag}, this tag not publish.")
+            "#{$1}pod '#{module_name}', :git => '#{module_git}', :tag => '#{lastest_tag}'"
+          end
         else
           line
         end
@@ -85,6 +96,35 @@ module BigKeeper
       origin_config.chop
     end
 
-    private :generate_module_config, :origin_config_of_module
+    def find_lastest_tag(module_name)
+      username = FileOperator.new.current_username
+      tags_repos_pwd = Array.new
+      tags_spec_list = Array.new
+      tags_module_list = Array.new
+
+      IO.popen("find /Users/#{username}/.cocoapods/repos -type d -name #{module_name}") do |io|
+        io.each do |line|
+          tags_repos_pwd.push(line) if line.include? "#{module_name}"
+        end
+      end
+      for pwd in tags_repos_pwd do
+        path = pwd.chomp
+        IO.popen("cd #{path}; ls") do |io|
+          io.each do |line|
+            tags_spec_list.push(line)
+          end
+        end
+      end
+
+      tags_module_list = GitOperator.new.tag_list(BigkeeperParser.module_full_path(@path, @user, module_name))
+      last_tag = tags_module_list[tags_module_list.length - 1]
+      if tags_module_list.include?(last_tag) && tags_spec_list.include?(last_tag)
+        return [last_tag.chomp, true]
+      else
+        return [last_tag.chomp, false]
+      end
+    end
+
+    private :generate_module_config, :origin_config_of_module, :find_lastest_tag
   end
 end

data/lib/big_keeper/model/podfile_model.rb

@@ -1,8 +1,8 @@
 
 module BigKeeper
 
-class Podfile_Modle
-  attr_accessor :name,:git,:path,:configurations,:branch,:tag,:comment
+class PodfileModel
+  attr_accessor :name, :git, :path, :configurations, :branch,:tag, :comment
   def initialize(sentence)
     if sentence.include?('#')
       list = sentence.split('#')

data/lib/big_keeper/service/git_service.rb

@@ -43,6 +43,11 @@ module BigKeeper
       end
     end
 
+    def verify_checkout_pull(path, branch_name)
+      GitService.new.verify_checkout(path, branch_name)
+      GitService.new.pull(path, branch_name)
+    end
+
     def verify_special_branch(path, name)
       git = GitOperator.new
 
@@ -113,9 +118,9 @@ module BigKeeper
     def branchs_with_type(path, type)
       branchs = []
       Dir.chdir(path) do
-        IO.popen('git branch -a') do |io|
-          io.each do |line|
-            branchs << line.rstrip if line =~ /(\* |  )#{GitflowType.name(type)}*/
+        IO.popen('git branch -a') do | io |
+          io.each do | line |
+            branchs << line.gsub(/\s/, '') if line =~ /[\s\S]*#{GitflowType.name(type)}*/
           end
         end
       end

data/lib/big_keeper/service/module_service.rb

@@ -137,14 +137,21 @@ module BigKeeper
       ModuleCacheOperator.new(path).del_path_module(module_name)
     end
 
-    def list(path, user, module_path)
-      branches_name = []
-      IO.popen("cd #{path}; git branch -a") do |io|
-        io.each do |line|
-          branches_name << line.strip if line.include? 'feature'
+    def module_info(module_path, home_branch_name, user, type, module_name, version)
+      result_dic = {}
+      matched_branches = []
+      branches = GitService.new.branchs_with_type(module_path, type)
+      if version == 'all versions'
+        matched_branches = branches
+      else
+        branches.each do | branch |
+          matched_branches << branch if branch.include?(version)
         end
       end
-      branches_name
+      result_dic[:module_name] = module_name
+      result_dic[:current_branch] = GitOperator.new.current_branch(module_path)
+      result_dic[:branches] = matched_branches
+      result_dic
     end
 
     private :verify_module

data/lib/big_keeper/util/bigkeeper_parser.rb

@@ -27,6 +27,7 @@ module BigKeeper
 
   def self.source(name)
     BigkeeperParser.parse_source(name)
+    yield if block_given?
   end
 
   # Bigkeeper file parser
@@ -43,23 +44,25 @@ module BigKeeper
         content.gsub!(/version\s/, 'BigKeeper::version ')
         content.gsub!(/user\s/, 'BigKeeper::user ')
         content.gsub!(/home\s/, 'BigKeeper::home ')
+        content.gsub!(/source\s/, 'BigKeeper::source ')
         content.gsub!(/mod\s/, 'BigKeeper::mod ')
         content.gsub!(/modules\s/, 'BigKeeper::modules ')
-        content.gsub!(/source\s/, 'BigKeeper::source ')
         eval content
-        # p @@config
       end
     end
 
-    def self.parse_version(name)
-      @@config[:version] = name
+    def self.parse_source(name)
+      @@config.delete("tmpSpec")
+      source_split = name.split(",") unless name.split(",").length != 2
+      if source_split != nil
+        sources = Hash["#{source_split[1].lstrip}" => "#{source_split[0]}"]
+        @@config[:source] = sources
+        @@config[:tmpSpec] = source_split[1].lstrip
+      end
     end
 
-    def self.parse_source(name)
-      sources = []
-      sources << @@config[:source]
-      sources << name
-      @@config[:source] = sources
+    def self.parse_version(name)
+      @@config[:version] = name
     end
 
     def self.parse_user(name)
@@ -96,6 +99,9 @@ module BigKeeper
     end
 
     def self.parse_modules_mod(name, params)
+      if @@config[:source] != nil
+          params[:spec] = "#{@@config[:tmpSpec]}"
+      end
       modules = @@config[:modules]
       modules[name] = params
       @@config[:modules] = modules
@@ -123,12 +129,17 @@ module BigKeeper
       @@config[:home][:pulls]
     end
 
-    def self.sourcemodule_path
-      if @@config[:source] == nil
-        return ""
-      else
-        @@config[:source].join(",").reverse.chop.reverse
-      end
+    def self.source_spec_path(module_name)
+      spec = @@config[:modules][module_name][:spec]
+      @@config[:source][spec]
+    end
+
+    def self.source_spec_name(module_name)
+      spec = @@config[:modules][module_name][:spec]
+    end
+
+    def self.sources
+      @@config[:source].keys
     end
 
     def self.module_full_path(home_path, user_name, module_name)

data/lib/big_keeper/util/file_operator.rb

@@ -11,5 +11,11 @@ module BigKeeper
     def find_all(path, name)
       Dir.glob("#{path}/*/#{name}")
     end
+
+    def current_username
+      current_name = `whoami`
+      current_name.chomp
+    end
+    
   end
 end

data/lib/big_keeper/util/git_operator.rb

@@ -13,7 +13,7 @@ module BigKeeper
       has_branch = false
       IO.popen("cd #{path}; git branch -r") do |io|
         io.each do |line|
-          has_branch = true if line =~ /([\s\S]*)#{branch_name}$/
+          has_branch = true if line.include? branch_name
         end
       end
       has_branch
@@ -23,7 +23,7 @@ module BigKeeper
       has_branch = false
       IO.popen("cd #{path}; git branch") do |io|
         io.each do |line|
-          has_branch = true if line =~ /([\s\S]*)#{branch_name}$/
+          has_branch = true if line.include? branch_name
         end
       end
       has_branch
@@ -33,7 +33,7 @@ module BigKeeper
       has_branch = false
       IO.popen("cd #{path}; git branch -a") do |io|
         io.each do |line|
-          has_branch = true if line =~ /([\s\S]*)#{branch_name}$/
+          has_branch = true if line.include? branch_name
         end
       end
       has_branch
@@ -88,7 +88,7 @@ module BigKeeper
 
     def has_commits(path, branch_name)
       has_commits = false
-      IO.popen("cd #{path}; git log #{branch_name} --not --remotes") do |io|
+      IO.popen("cd #{path}; git log --branches --not --remotes") do |io|
         io.each do |line|
           has_commits = true if line.include? branch_name
         end
@@ -130,11 +130,71 @@ module BigKeeper
     end
 
     def tag(path, version)
-      Dir.chdir(path) do
-        `git tag -a #{version} -m "release: V #{version}" master`
-        `git push --tags`
+      tags = Array.new
+      IO.popen("cd #{path}; git tag") do |io|
+        io.each do |line|
+          tags << line
+        end
+      end
+      unless tags.include? "#{version}\n"
+        Dir.chdir(path) do
+          `git tag -a #{version} -m "release: V #{version}" master;`
+          `git push --tags`
+        end
+        return
+      end
+      Logger.highlight("tag already exists in the remote, skip this step")
+    end
+
+    def tag_list(path)
+      tag_list = Array.new
+      IO.popen("cd #{path}; git tag -l") do |io|
+        io.each do |line|
+          unless line=~(/[a-zA-Z]/)
+            tag_list << line
+          end
+        end
       end
+      tag_list
     end
+
+    def check_merge(path, condition)
+      unmerged_branch = Array.new
+      IO.popen("cd #{path}; git branch --no-merged") do |io|
+        io.each do |line|
+          unmerged_branch.push(line) if line.include? "#{condition}"
+        end
+      end
+      if (unmerged_branch.size > 0)
+        unmerged_branch.map { |item|
+            Logger.default(item)
+        }
+        Logger.error("Still has unmerged feature branch, please check")
+      end
+    end
+
+    def check_diff(path, branch, compare_branch)
+      compare_branch_commits = Array.new
+      IO.popen("cd #{path}; git log --left-right #{branch}...#{compare_branch} --pretty=oneline") do |io|
+        io.each do |line|
+          compare_branch_commits.push(line) if (line.include? '>') && (line.include? "Merge branch #{branch} into #{compare_branch}")
+        end
+      end
+      if compare_branch_commits.size > 0
+        compare_branch_commits.map { |item|
+            Logger.default(item)
+        }
+        Logger.error("#{compare_branch} branch has commit dont committed in #{branch}, please check")
+        return
+      end
+    end
+
+    def merge(path, branch_name)
+      IO.popen("cd #{path}; git merge #{branch_name}") do |line|
+        Logger.error("Merge conflict in #{branch_name}") if line.include? 'Merge conflict'
+      end
+    end
+
   end
 
   # p GitOperator.new.user

data/lib/big_keeper/util/list_generator.rb

@@ -1,24 +1,67 @@
 require 'big_keeper/util/logger'
+require 'json'
 
 module BigKeeper
   class ListGenerator
-    def self.generate(file_path,branches_name)
+    #generate tree print throught console
+    def self.generate_tree(file_path, home_branches, version)
       module_branches_dic = {}
-      home_name = BigkeeperParser.home_name
-      File.open(file_path, 'r') do |file|
-        file.each_line do |line|
-          if /=>/ =~ line.delete('{}"')
-            module_branches_dic[$~.pre_match] = $~.post_match.delete('[]"').split(',')
+      json_data = File.read(file_path)
+      module_branches_dic = JSON.parse(json_data)
+      to_tree(module_branches_dic, home_branches, version)
+    end
+
+      #generate json print throught console
+    def self.generate_json(file_path, home_branches, version)
+      module_branches_dic = {}
+      json_data = File.read(file_path)
+      module_branches_dic = JSON.parse(json_data)
+      json = to_json(home_branches, module_branches_dic, version)
+      puts JSON.pretty_generate(json)
+    end
+
+    def self.to_json(home_branches, module_info_list, version)
+      json_array = []
+      print_all = version == "all versions"
+      home_branches.each do | home_branch_name |
+          next unless home_branch_name.include?(version) || print_all
+          branch_dic = {}
+          involve_modules = []
+          module_info_list.collect do | module_info_dic |
+            next unless module_info_dic["branches"] != nil
+            module_name = module_info_dic["module_name"]
+            module_info_dic["branches"].each do | module_branch |
+              if module_branch.strip.delete("*") == home_branch_name
+                module_current_info = {}
+                module_current_info["module_name"] = module_name
+                module_current_info["current_branch"] = module_info_dic["current_branch"]
+                involve_modules << module_current_info
+              end
+            end
           end
-        end
+          branch_dic["home_branche_name"] = home_branch_name
+          branch_dic["involve_modules"] = involve_modules
+          json_array << branch_dic
       end
+      json_array
+    end
 
-      branches_name.each do |branch_name|
-        Logger.highlight(" #{home_name} - #{branch_name} ")
-        module_branches_dic.keys.each do |module_name|
-          module_branches_dic[module_name].each do |module_branch|
-            if module_branch.include?(branch_name.strip.delete('*'))
-              Logger.default("   |_ _ _ #{module_name} - #{branch_name}")
+    def self.to_tree(module_branches_dic, branches_name, version)
+      home_name = BigkeeperParser.home_name
+      print_all = version == "all versions"
+      branches_name.each do | home_branch_name |
+        next unless home_branch_name.include?(version) || print_all
+        Logger.highlight(home_branch_name.strip)
+        module_branches_dic.each do | module_info_dic |
+          module_name = module_info_dic["module_name"]
+          next if module_info_dic["branches"] == nil
+          module_info_dic["branches"].each do | module_branch |
+            if module_branch.include?(home_branch_name.strip.delete('*'))
+              if !module_branch.include?("*") && home_branch_name.include?("*")
+                Logger.warning("   ├── #{module_name} (current branch :#{module_info_dic["current_branch"]})")
+              else
+                Logger.default("   ├── #{module_name}")
+              end
                 break
             end
           end

data/lib/big_keeper/util/pod_operator.rb

@@ -6,22 +6,65 @@ module BigKeeper
     def self.pod_install(path, repo_update)
       # pod install
       if repo_update
-        Logger.highlight('Start pod repo update, waiting...')
-        cmd = 'pod repo update'
-        Open3.popen3(cmd) do |stdin , stdout , stderr, wait_thr|
-          while line = stdout.gets
-            puts line
-          end
-        end
+        PodOperator.pod_update_private_repos(true)
       end
       Logger.highlight('Start pod install, waiting...')
       cmd = "pod install --project-directory=#{path}"
-      Open3.popen3(cmd) do |stdin , stdout , stderr, wait_thr|
+      Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
         while line = stdout.gets
           puts line
         end
       end
       Logger.highlight('Finish pod install.')
     end
+
+    def self.pod_repo_push(path, module_name, source, version)
+      Logger.highlight(%Q(Start Pod repo push #{module_name}))
+      Dir.chdir(path) do
+        command = ""
+        p BigkeeperParser.source_spec_name(module_name)
+        if source.length > 0
+          command = "pod repo push #{BigkeeperParser.source_spec_name(module_name)} #{module_name}.podspec --allow-warnings --sources=#{source} --verbose --use-libraries"
+        else
+          command = "pod repo push #{BigkeeperParser.source_spec_name(module_name)} #{module_name}.podspec --allow-warnings --verbose --use-libraries"
+        end
+
+        IO.popen(command) do |io|
+          is_success = false
+          error_info = Array.new
+          io.each do |line|
+            error_info.push(line)
+            is_success = true if line.include? "Updating spec repo"
+          end
+          unless is_success
+            puts error_info
+            Logger.error("Fail: '#{module_name}' Pod repo fail")
+          end
+          Logger.highlight(%Q(Success release #{module_name} V#{version}))
+        end
+      end
+    end
+
+    def self.pod_update_private_repos(update_private)
+      if update_private
+        BigkeeperParser.sources.map { |spec|
+          Logger.highlight('Start pod repo update, waiting...')
+          cmd = "pod repo update #{spec}"
+          cmd(cmd)
+        }
+      else
+        cmd = "pod repo update"
+        cmd(cmd)
+      end
+    end
+
+    def self.cmd(cmd)
+      Open3.popen3(cmd) do |stdin , stdout , stderr, wait_thr|
+        while line = stdout.gets
+          puts line
+        end
+      end
+    end
+    
   end
 end

data/lib/big_keeper/util/podfile_detector.rb

@@ -10,7 +10,7 @@ class PodfileDetector
   $unlock_pod_list = []
   $modify_pod_list = {}
 
-  def initialize(main_path,module_list)
+  def initialize(main_path, module_list)
     @module_list = module_list
     @main_path = main_path
   end
@@ -22,13 +22,16 @@ class PodfileDetector
       deal_podfile_line(sentence) unless sentence =~(/(\d+.){1,2}\d+/)
       end
       $unlock_pod_list
-      # p $unlock_pod_list
   end
 
   def deal_podfile_line(sentence)
-    if sentence.include?('pod ')
-      pod_model = Podfile_Modle.new(sentence)
-      if !pod_model.name.empty? && pod_model.configurations != '[\'Debug\']' && pod_model.path == nil && pod_model.tag == nil
+    return unless !sentence.strip.start_with?("#")
+    if sentence.strip.include?('pod ')
+      pod_model = PodfileModel.new(sentence)
+      if !pod_model.name.empty? &&
+         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)
       end
       pod_model
@@ -36,7 +39,7 @@ class PodfileDetector
   end
 
 
-  def deal_lock_file(main_path,deal_list)
+  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?
@@ -52,7 +55,7 @@ class PodfileDetector
         temp_version = get_lock_version(temp_sentence)
         if temp_version != nil
           if current_version != nil
-            $result[pod_name] = chose_version(current_version,temp_version)
+            $result[pod_name] = chose_version(current_version, temp_version)
           else
             $result[pod_name] = temp_version
           end
@@ -64,7 +67,7 @@ class PodfileDetector
 
   def self.get_pod_model(sentence)
     if sentence.include?('pod ')
-      pod_model = Podfile_Modle.new(sentence)
+      pod_model = PodfileModel.new(sentence)
       return pod_model
     end
   end

data/lib/big_keeper/util/podfile_module.rb

@@ -31,7 +31,6 @@ class PodfileModuleDetector
     end
   end
 
-
   def get_pod_search_result(pod_name)
     #输入pod Search 结果
     `pod search #{pod_name} --ios --simple >> #{@main_path}/bigKeeperPodInfo.tmp`
@@ -42,7 +41,7 @@ class PodfileModuleDetector
     Logger.highlight("Analyzing modules info...") unless podfile_lines.size.zero?
       podfile_lines.collect do |sentence|
         if sentence =~(/pod/)
-          sentence = sentence.sub('pod','')
+          sentence = sentence.sub('pod', '')
           sentence = sentence.delete('\n\'')
           match_result = sentence.split(',')
           pod_name = match_result[0].strip

data/lib/big_keeper/util/podfile_operator.rb

@@ -17,7 +17,7 @@ module BigKeeper
       false
     end
 
-    def generate_pod_config(pod_name, version,comment)
+    def generate_pod_config(pod_name, version, comment)
       module_config = ''
       if comment != nil
         module_config = "  pod '#{pod_name}' , '#{version}' # #{comment}"
@@ -30,9 +30,9 @@ module BigKeeper
       module_names.each do |module_name|
         DepService.dep_operator(path, user).update_module_config(
                                              module_name,
-                                             ModuleType::GIT,
-                                             GitInfo.new(BigkeeperParser.module_git(module_name), GitType::TAG, version))
+                                             ModuleOperateType::RELEASE)
       end
+
     end
 
     def find_and_lock(podfile, dictionary)
@@ -43,7 +43,7 @@ module BigKeeper
             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)
+                temp_file.puts generate_pod_config(pod_model.name, dictionary[pod_model.name], pod_model.comment)
             else
                 temp_file.puts line
             end
@@ -64,7 +64,7 @@ module BigKeeper
           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
-                temp_file.puts generate_pod_config(pod_model.name,dictionary[pod_model.name],pod_model.comment)
+                temp_file.puts generate_pod_config(pod_model.name, dictionary[pod_model.name], pod_model.comment)
             else
                 temp_file.puts line
             end
@@ -80,13 +80,21 @@ module BigKeeper
 
     def podspec_change(podspec_file, version, module_name)
       temp_file = Tempfile.new(".#{module_name}.podspec")
+      has_change = false
       begin
         File.open(podspec_file, 'r') do |file|
           file.each_line do |line|
             if line.include?("s.version")
               temp_line = line
-              if temp_line.split("=")[0].delete(" ") == "s.version"
-                temp_file.puts "s.version = '#{version}'"
+              temp_line_arr = temp_line.split("=")
+              if temp_line_arr[0].delete(" ") == "s.version"
+                unless temp_line_arr[temp_line_arr.length - 1].include? "#{version}"
+                    temp_file.puts "s.version = '#{version}'"
+                    has_change = true
+                else
+                    temp_file.puts line
+                    Logger.highlight("The version in PodSpec is equal your input version")
+                end
               else
                 temp_file.puts line
               end
@@ -101,6 +109,7 @@ module BigKeeper
         temp_file.close
         temp_file.unlink
       end
+      has_change
     end
 
     private :generate_pod_config

data/lib/big_keeper/util/verify_operator.rb

@@ -0,0 +1,17 @@
+module BigKeeper
+  # Operator for got
+  class VerifyOperator
+    def self.already_in_process?
+      already_in_process = false
+      Open3.popen3('ps -ef|grep big -c') do |stdin , stdout , stderr, wait_thr|
+        while line = stdout.gets
+          if line.rstrip.to_i > 3
+            already_in_process = true
+            break
+          end
+        end
+      end
+      already_in_process
+    end
+  end
+end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -264,6 +264,7 @@ files:
 - lib/big_keeper/util/podfile_detector.rb
 - lib/big_keeper/util/podfile_module.rb
 - lib/big_keeper/util/podfile_operator.rb
+- lib/big_keeper/util/verify_operator.rb
 - lib/big_keeper/util/xcode_operator.rb
 - lib/big_keeper/version.rb
 - resources/banner.png