bigkeeper 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e19c3d486a57e017de6cb6f711051f540dc2d44ffded09215d22c5275230d0
-  data.tar.gz: c059a11b0e5b6373d1b8aeeb9cb64d80df9d5f6f9c4fd0677d348aafc47744c7
+  metadata.gz: 7e751a206b1442e0848d2b6dfacc760f5d656bfc17b1274841a2091a62e6514b
+  data.tar.gz: 22fc192c12e254bf5d449f7681d49bf0b10cf68774b209f2be04c3af95cd55ce
 SHA512:
-  metadata.gz: f8b8be1f557c434fc0d85a1ef47a05cf411b826006a314b62d59e7f9e1bf396d740a79157af80bc15ecf7cc677fb081939b6ff6167eae33c62ecc8bebb135274
-  data.tar.gz: 27cdd35ad095a1d4fb5a767c0c0830fec50f22328016f52168d77f1a59b67f96212a2e8ddad18655fe0e093d57fdbc9a0be424d81c81b0f4500dc398637b1f0a
+  metadata.gz: da2b7fdf30d1c5e1f196b9c63b73c393c2816ac9a53c60479333d9168d8adce26406083f10a12788365ff7b6dcec89e23d06bbc9bac9a23662f05917af7801f5
+  data.tar.gz: 3f8171e5002173aac2cc02b53eff96d388019f958b8b55d11bd596b490e455df4143eb281c4e65319f0622bfb120987915d5365084631bb0826078414c3b1579

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.9.11)
+    bigkeeper (0.9.12)
       big_resources
       big_stash (~> 0.1)
       cocoapods

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

@@ -8,6 +8,7 @@ require 'big_keeper/command/feature&hotfix/rebase'
 require 'big_keeper/command/feature&hotfix/publish'
 require 'big_keeper/command/feature&hotfix/delete'
 require 'big_keeper/command/feature&hotfix/list'
+require 'big_keeper/command/feature&hotfix/module'
 require 'big_keeper/util/leancloud_logger'
 
 module BigKeeper
@@ -43,6 +44,33 @@ module BigKeeper
         end
       end
 
+      c.desc "Modules operate for the #{GitflowType.name(type)}"
+      c.command :module do |m|
+        m.desc "Add modules for the #{GitflowType.name(type)}"
+        m.command :add do |add|
+          add.action do |global_options, options, args|
+            path = File.expand_path(global_options[:path])
+            version = global_options[:ver]
+            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+            LeanCloudLogger.instance.set_command("feature/module/add")
+            modules = args[(0...args.length)] if args.length > 0
+            module_add(path, user, modules, type)
+          end
+        end
+
+        m.desc "delete modules for the #{GitflowType.name(type)}"
+        m.command :delete do |delete|
+          delete.action do |global_options, options, args|
+            path = File.expand_path(global_options[:path])
+            version = global_options[:ver]
+            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+            LeanCloudLogger.instance.set_command("feature/module/delete")
+            modules = args[(0...args.length)] if args.length > 0
+            module_del(path, user, modules, type)
+          end
+        end
+      end
+
       c.desc "Switch to the #{GitflowType.name(type)} with name"
       c.command :switch do |switch|
         switch.action do |global_options, options, args|

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

@@ -0,0 +1,85 @@
+#!/usr/bin/ruby
+
+require 'big_keeper/util/podfile_operator'
+require 'big_keeper/util/gitflow_operator'
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/util/logger'
+require 'big_keeper/util/pod_operator'
+require 'big_keeper/util/xcode_operator'
+require 'big_keeper/util/cache_operator'
+require 'big_keeper/model/operate_type'
+require 'big_keeper/dependency/dep_service'
+
+require 'big_keeper/dependency/dep_type'
+
+require 'big_keeper/service/stash_service'
+require 'big_keeper/service/module_service'
+
+
+module BigKeeper
+  def self.module_add(path, user, modules, type)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    branch_name = GitOperator.new.current_branch(path)
+
+    Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
+
+    full_name = branch_name.gsub(/#{GitflowType.name(type)}\//, '')
+
+    current_modules = ModuleCacheOperator.new(path).current_path_modules
+
+    # Verify input modules
+    modules = BigkeeperParser.verify_modules(modules)
+
+    Logger.highlight("Start to update modules for branch '#{branch_name}'...")
+
+    add_modules = modules - current_modules
+    
+    if add_modules.empty?
+      Logger.default("There is nothing changed with modules #{modules}.")
+    else
+      # Modify podfile as path and Start modules feature
+      add_modules.each do |module_name|
+        ModuleCacheOperator.new(path).add_path_module(module_name)
+        ModuleService.new.add(path, user, module_name, full_name, type)
+      end
+    end
+
+    # Install
+    DepService.dep_operator(path, user).install(modules, OperateType::UPDATE, false)
+
+    # Open home workspace
+    DepService.dep_operator(path, user).open
+  end
+
+  def self.module_del(path, user, modules, type)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    branch_name = GitOperator.new.current_branch(path)
+
+    Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
+
+    full_name = branch_name.gsub(/#{GitflowType.name(type)}\//, '')
+
+    current_modules = ModuleCacheOperator.new(path).current_path_modules
+
+    # Verify input modules
+    modules = BigkeeperParser.verify_modules(modules)
+
+    Logger.highlight("Start to update modules for branch '#{branch_name}'...")
+
+    if modules.empty?
+      Logger.default("There is nothing changed with modules #{modules}.")
+    else
+      # Modify podfile as path and Start modules feature
+      modules.each do |module_name|
+        ModuleCacheOperator.new(path).del_path_module(module_name)
+        ModuleService.new.del(path, user, module_name, full_name, type)
+      end
+    end
+
+    # Install
+    DepService.dep_operator(path, user).install(modules, OperateType::UPDATE, false)
+
+    # Open home workspace
+    DepService.dep_operator(path, user).open
+  end
+end

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

@@ -41,8 +41,9 @@ module BigKeeper
 
       Logger.highlight("Publish branch '#{branch_name}' for 'Home'")
 
+      # [CHG] try to fix publish bug
       # Recover home
-      DepService.dep_operator(path, user).recover
+      # DepService.dep_operator(path, user).recover
 
       # Push home changes to remote
       GitService.new.verify_push(path, "publish branch #{branch_name}", branch_name, 'Home')

data/lib/big_keeper/command/release.rb

@@ -2,97 +2,67 @@ require 'big_keeper/command/release/home'
 require 'big_keeper/command/release/module'
 require 'big_keeper/util/leancloud_logger'
 require 'big_keeper/command/release/start'
-require 'big_keeper/command/release/finish'
 require 'big_keeper/util/command_line_util'
 
 module BigKeeper
   def self.release_command
-    desc 'Gitflow release operations'
-    command :release do |c|
 
-      c.desc 'release project start'
-      c.command :start do |start|
-        start.action do |global_options, options, args|
+    desc 'Release home project & module.'
+    command :prerelease do |c|
+      c.desc 'Prerelease home project.'
+      c.command :home do |home|
+        home.action do |global_options, options, args|
+          LeanCloudLogger.instance.set_command("prerelease/home")
           path = File.expand_path(global_options[:path])
           version = global_options[:ver]
           user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
           modules = args[(0...args.length)] if args.length > 0
-          release_start(path, version, user, modules)
+          prerelease(path, version, user, modules)
         end
       end
 
-      c.desc 'release project finish'
-      c.command :finish do |finish|
-        finish.action do |global_options, options, args|
+      c.desc 'if ignore warning'
+      c.switch [:i,:ignore]
+      c.desc 'Release single module operations'
+      c.command :module do |m|
+        m.action do |global_options, options, args|
+          LeanCloudLogger.instance.set_command("prerelease/module")
           path = File.expand_path(global_options[:path])
           version = global_options[:ver]
           user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+          help_now!('module name is required') if args.length == 0
+          raise Logger.error("release version is required") if version == nil
           modules = args[(0...args.length)] if args.length > 0
-          release_finish(path, version, user, modules)
+          prerelease_module(path, version, user, modules, false)
         end
       end
+    end
 
-      c.desc 'Release home project operations'
-      c.command :home do |home|
-        home.desc 'Start release home project'
-        home.command :start do |start|
-          start.action do |global_options, options, args|
-            path = File.expand_path(global_options[:path])
-            version = global_options[:ver]
-            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
-            LeanCloudLogger.instance.set_command("release/home/start")
-
-            help_now!('user name is required') if user and user.empty?
-            raise Logger.error("release version is required") if version == nil
-            release_home_start(path, version, user)
-          end
-        end
-
-        home.desc 'Finish release home project'
-        home.command :finish do |finish|
-          finish.action do |global_options, options, args|
-            path = File.expand_path(global_options[:path])
-            version = global_options[:ver]
-            LeanCloudLogger.instance.set_command("release/home/finish")
-
-            raise Logger.error("release version is required") if version == nil
-            release_home_finish(path, version)
-          end
-        end
+    desc 'Gitflow release operations'
+    command :release do |c|
+      c.action do |global_options, options, args|
+        LeanCloudLogger.instance.set_command("release")
+        path = File.expand_path(global_options[:path])
+        version = global_options[:ver]
+        user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+        modules = args[(0...args.length)] if args.length > 0
+        release(path, version, user, modules)
       end
 
-      c.desc 'release module'
+      c.desc 'if ignore warning'
       c.switch [:i,:ignore]
+      c.desc 'Release single module operations'
       c.command :module do |m|
-        m.desc 'Start release module project'
-        m.command :start do |start|
-          start.action do |global_options, options, args|
-            path = File.expand_path(global_options[:path])
-            version = global_options[:ver]
-            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
-            LeanCloudLogger.instance.set_command("release/module/start")
-
-            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, 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])
-            version = global_options[:ver]
-            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
-            LeanCloudLogger.instance.set_command("release/module/finish")
+        m.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          version = global_options[:ver]
+          user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+          LeanCloudLogger.instance.set_command("release/module")
 
-            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, options[:spec])
-          end
+          help_now!('module name is required') if args.length == 0
+          raise Logger.error("release version is required") if version == nil
+          modules = args[(0...args.length)] if args.length > 0
+          release_module(path, version, user, modules, options[:spec])
         end
       end
     end

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

@@ -8,84 +8,21 @@ require 'big_keeper/util/xcode_operator'
 require 'big_keeper/model/operate_type'
 
 module BigKeeper
-  def self.release_home_start(path, version, user)
-    BigkeeperParser.parse("#{path}/Bigkeeper")
-
-    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
-    modules = BigkeeperParser.module_names
-
-    #stash
-    StashService.new.stash_all(path, GitOperator.new.current_branch(path), user, modules)
-
-    # delete cache
-    CacheOperator.new(path).clean()
-    # cache Podfile
-    CacheOperator.new(path).save('Podfile')
-
-    # check
-    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}")
-        GitOperator.new.checkout(path, "release/#{version}")
-      else
-        GitflowOperator.new.start(path, version, GitflowType::RELEASE)
-        GitOperator.new.push_to_remote(path, "release/#{version}")
-      end
-    end
-
-    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)
-
-    GitService.new.verify_push(path, "Change version to #{version}", "release/#{version}", 'Home')
-    DepService.dep_operator(path, user).install(modules, OperateType::RELEASE, true)
-    XcodeOperator.open_workspace(path)
+  def self.prerelease(path, version, user, modules)
+    DepService.dep_operator(path, user).release_start(path, version, user, modules)
   end
 
-  def self.release_home_finish(path, version)
+  def self.release(path, version, user, modules)
     BigkeeperParser.parse("#{path}/Bigkeeper")
+
     version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
-    Logger.highlight("Start finish release home for #{version}")
+    modules = BigkeeperParser.module_names
 
     if GitOperator.new.has_branch(path, "release/#{version}")
-      if GitOperator.new.current_branch(path) != "release/#{version}"
-        GitOperator.new.checkout(path, "release/#{version}")
-      end
-
-      GitService.new.verify_push(path, "finish release branch", "release/#{version}", 'Home')
-
-      # master
-      GitOperator.new.checkout(path, "master")
-      GitOperator.new.merge(path, "release/#{version}")
-      GitService.new.verify_push(path, "release V#{version}", "master", 'Home')
-
-      GitOperator.new.tag(path, version)
-
-      # release branch
-      GitOperator.new.checkout(path, "release/#{version}")
-      CacheOperator.new(path).load('Podfile')
-      CacheOperator.new(path).clean()
-      GitOperator.new.commit(path, "reset #{version} Podfile")
-      GitService.new.verify_push(path, "reset #{version} Podfile", "release/#{version}", 'Home')
-
-      # develop
-      GitOperator.new.checkout(path, "develop")
-      GitOperator.new.merge(path, "release/#{version}")
-      GitService.new.verify_push(path, "merge release/#{version} to develop", "develop", 'Home')
-      GitOperator.new.check_diff(path, "develop", "master")
-
-      Logger.highlight("Finish release home for #{version}")
+        DepService.dep_operator(path, user).release_finish(path, version, user, modules)
     else
-      raise Logger.error("There is no release/#{version} branch, please use release home start first.")
+        DepService.dep_operator(path, user).release_start(path, version, user, modules)
+        DepService.dep_operator(path, user).release_finish(path, version, user, modules)
     end
   end
 

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

@@ -8,9 +8,15 @@ require 'big_keeper/util/logger'
 require 'big_keeper/util/pod_operator'
 
 module BigKeeper
+  def self.prerelease_module(path, version, user, modules, ignore)
+    for module_name in modules
+      release_module_start(path, version, user, module_name, ignore)
+    end
+  end
+
   def self.release_module_start(path, version, user, module_name, ignore)
+    p module_name
     BigkeeperParser.parse("#{path}/Bigkeeper")
-
     version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
     module_path = BigkeeperParser.module_full_path(path, user, module_name)
 
@@ -28,37 +34,44 @@ module BigKeeper
     Logger.highlight(%Q(Start checkout #{module_name} to Branch develop))
     GitService.new.verify_checkout_pull(module_path, "develop")
 
-    Logger.highlight(%Q(#{module_name} release start finish))
+    Logger.highlight(%Q(#{module_name} prerelease finish))
   end
 
-## release finish
-  def self.release_module_finish(path, version, user, module_name, spec)
+  def self.release_module(path, version, user, modules, spec)
     BigkeeperParser.parse("#{path}/Bigkeeper")
 
-    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
-    module_path = BigkeeperParser.module_full_path(path, user, module_name)
+    if !CommandLineUtil.double_check("modules #{modules} will publish version #{version}, are you sure?")
+      Logger.error('module prerelease interrupt')
+    end
+
+    for module_name in modules
+      release_module_start(path, version, user, module_name, true)
+
+      version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+      module_path = BigkeeperParser.module_full_path(path, user, module_name)
 
-    # check commit
-    Logger.error("current branch has unpush files") if GitOperator.new.has_changes(module_path)
+      # check commit
+      Logger.error("current branch has unpush files") if GitOperator.new.has_changes(module_path)
 
-    #修改 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", "develop", "#{module_name}") if has_change == true
+      #修改 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", "develop", "#{module_name}") if has_change == true
 
-    # check out master
-    Logger.highlight("'#{module_name}' checkout branch to master...")
-    GitService.new.verify_checkout_pull(module_path, "master")
+      # 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")
+      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")
 
-    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)
+      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
     end
   end
 

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

@@ -1,69 +1,4 @@
 module BigKeeper
-  def self.release_start(path, version, user, modules)
-    BigkeeperParser.parse("#{path}/Bigkeeper")
-    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
-    modules = release_check_changed_modules(path, user) if (modules.nil? || modules.empty?)
-
-    if modules.nil? || modules.empty?
-      Logger.error('no module need to release')
-    end
-
-    if !CommandLineUtil.double_check("module #{modules} will changed version to #{version}-SNAPSHOT, are you sure?")
-      Logger.error('release start interrupt')
-    end
-
-    #stash home
-    StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
-    # delete cache
-    CacheOperator.new(path).clean()
-    # checkout develop
-    GitService.new.verify_checkout_pull(path, 'develop')
-
-    modules.each do |module_name|
-      Logger.highlight("release start module #{module_name}")
-      ModuleService.new.release_start(path, user, modules, module_name, version)
-    end
-
-    #release home
-    DepService.dep_operator(path, user).release_home_start(modules, version)
-
-    # Push home changes to remote
-    Logger.highlight("Push branch 'develop' for 'Home'...")
-    GitService.new.verify_push(
-      path,
-      "release start for #{version}",
-      'develop',
-      'Home')
-  end
-
-  def self.release_finish(path, version, user, modules)
-    BigkeeperParser.parse("#{path}/Bigkeeper")
-    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
-
-    #stash home
-    StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
-    # delete cache
-    CacheOperator.new(path).clean()
-    # checkout develop
-    GitService.new.verify_checkout_pull(path, 'develop')
-
-    modules.each do |module_name|
-      Logger.highlight("release start module #{module_name}")
-      ModuleService.new.release_finish(path, user, modules, module_name, version)
-    end
-
-    #release home
-    DepService.dep_operator(path, user).release_home_finish(modules, version)
-
-    # Push home changes to remote
-    Logger.highlight("Push branch 'develop' for 'Home'...")
-    GitService.new.verify_push(
-      path,
-      "release finish for #{version}",
-      'develop',
-      'Home')
-  end
-
   def self.release_check_changed_modules(path, user)
     changed_modules = []
     BigkeeperParser.parse("#{path}/Bigkeeper")
@@ -75,4 +10,5 @@ module BigKeeper
     end
     changed_modules
   end
+
 end

data/lib/big_keeper/dependency/dep_gradle_operator.rb

@@ -70,5 +70,87 @@ module BigKeeper
 
     def open
     end
+
+    def release_start(path, version, user, modules)
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+      modules = release_check_changed_modules(path, user) if (modules.nil? || modules.empty?)
+
+      if modules.nil? || modules.empty?
+        Logger.error('no module need to release')
+      end
+
+      if !CommandLineUtil.double_check("module #{modules} will changed version to #{version}-SNAPSHOT, are you sure?")
+        Logger.error('release start interrupt')
+      end
+
+      #stash home
+      StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
+      # delete cache
+      CacheOperator.new(path).clean()
+      # checkout develop
+      GitService.new.verify_checkout_pull(path, 'develop')
+
+      modules.each do |module_name|
+        Logger.highlight("release start module #{module_name}")
+        ModuleService.new.release_start(path, user, modules, module_name, version)
+
+        # Push home changes to remote
+        module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+        Logger.highlight("Push branch 'develop' for #{module_name}...")
+        GitService.new.verify_push(
+          module_full_path,
+          "release start for #{version}",
+          'develop',
+          "#{module_name}")
+      end
+
+      #release home
+      DepService.dep_operator(path, user).release_home_start(modules, version)
+
+      # Push home changes to remote
+      Logger.highlight("Push branch 'develop' for 'Home'...")
+      GitService.new.verify_push(
+        path,
+        "release start for #{version}",
+        'develop',
+        'Home')
+    end
+
+    def self.release_finish(path, version, user, modules)
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+      modules = release_check_changed_modules(path, user) if (modules.nil? || modules.empty?)
+
+      if modules.nil? || modules.empty?
+        Logger.error('no module need to release')
+      end
+      if !CommandLineUtil.double_check("module #{modules} will changed version to #{version}, are you sure?")
+        Logger.error('release finish interrupt')
+      end
+      #stash home
+      StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
+      # delete cache
+      CacheOperator.new(path).clean()
+      # checkout develop
+      GitService.new.verify_checkout_pull(path, 'develop')
+
+      modules.each do |module_name|
+        Logger.highlight("release start module #{module_name}")
+        ModuleService.new.release_finish(path, user, modules, module_name, version)
+      end
+
+      #release home
+      DepService.dep_operator(path, user).release_home_finish(modules, version)
+
+      # Push home changes to remote
+      Logger.highlight("Push branch 'develop' for 'Home'...")
+      GitService.new.verify_push(
+        path,
+        "release finish for #{version}",
+        'develop',
+        'Home')
+    end
+
   end
 end

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -75,6 +75,10 @@ module BigKeeper
             Logger.default("#{module_name} lastest tag is #{lastest_tag}, this tag not publish.")
             "#{$1}pod '#{module_name}#{$4}', :git => '#{module_git}', :tag => '#{lastest_tag}'"
           end
+        elsif ModuleOperateType::RELEASE_START == module_operate_type
+          module_git = BigkeeperParser.module_git(module_name)
+          branch_name = GitOperator.new.current_branch(@path)
+          "#{$1}pod '#{module_name}#{$4}', :git => '#{module_git}', :branch => '#{branch_name}'"
         else
           line
         end
@@ -86,7 +90,7 @@ module BigKeeper
 
       File.open("#{@path}/.bigkeeper/Podfile", 'r', :encoding => 'UTF-8') do |file|
         file.each_line do |line|
-          if line =~ /(\s*)pod(\s*)('|")#{module_name}('|")([\s\S]*)/
+          if line =~ /(\s*)pod(\s*)('|")#{module_name}((\/[_a-zA-Z0-9]+)?)('|")([\s\S]*)/
             origin_config = line
             break
           end
@@ -102,7 +106,7 @@ module BigKeeper
       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.popen("find /Users/#{username}/.cocoapods/repos/#{BigkeeperParser.source_spec_name(module_name)} -type d -name #{module_name}") do |io|
         io.each do |line|
           tags_repos_pwd.push(line) if line.include? "#{module_name}"
         end
@@ -125,6 +129,106 @@ module BigKeeper
       end
     end
 
+    def release_start(path, version, user, modules)
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+      modules = release_check_changed_modules(path, user) if (modules.nil? || modules.empty?)
+
+      if modules.nil? || modules.empty?
+        Logger.default('no module need to release')
+      end
+
+      #stash home
+      StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
+      # delete cache
+      CacheOperator.new(path).clean()
+      # cache Podfile
+      CacheOperator.new(path).save('Podfile')
+      # checkout develop
+      GitService.new.verify_checkout_pull(path, 'develop')
+      # check
+      GitOperator.new.check_diff(path, "develop", "master")
+
+      #checkout release branch
+      Logger.highlight(%Q(Start to checkout Branch release/#{version}))
+
+      GitService.new.verify_checkout(path, "release/#{version}")
+
+      raise Logger.error("Chechout release/#{version} failed.") unless GitOperator.new.current_branch(path) == "release/#{version}"
+
+      Logger.highlight(%Q(Finish to release/#{version} for home project))
+
+      modules.each do |module_name|
+        Logger.highlight("release checkout release/#{version} for #{module_name}")
+        module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+        ModuleService.new.release_start(path, user, modules, module_name, version)
+
+        if GitOperator.new.has_branch(module_full_path, "release/#{version}")
+          GitOperator.new.checkout(module_full_path, "release/#{version}")
+        else
+          GitflowOperator.new.start(path, version, GitflowType::RELEASE)
+          GitOperator.new.push_to_remote(path, "release/#{version}")
+
+          Logger.highlight("Push branch release/'#{version}' for #{module_name}...")
+          GitOperator.new.push_to_remote(module_full_path, "release/#{version}")
+        end
+
+        DepService.dep_operator(path, user).update_module_config(
+                                             module_name,
+                                             ModuleOperateType::RELEASE_START)
+      end
+
+      # step 3 change Info.plist value
+      InfoPlistOperator.new.change_version_build(path, version)
+
+      GitService.new.verify_push(path, "Change version to #{version}", "release/#{version}", 'Home')
+      # DepService.dep_operator(path, user).install(modules, OperateType::RELEASE, true)
+      XcodeOperator.open_workspace(path)
+    end
+
+    def release_module_start(modules, module_name, version)
+      module_full_path = BigkeeperParser.module_full_path(@path, @user, module_name)
+      GitService.new.verify_checkout(module_full_path, "release/#{version}")
+    end
+
+    def release_finish(path, version, user, modules)
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+      modules = BigkeeperParser.module_names
+
+      if GitOperator.new.has_branch(path, "release/#{version}")
+        GitService.new.verify_checkout(path, "release/#{version}")
+
+        PodfileOperator.new.replace_all_module_release(path, user, modules, ModuleOperateType::RELEASE)
+
+        GitService.new.verify_push(path, "finish release branch", "release/#{version}", 'Home')
+
+        # master
+        GitOperator.new.checkout(path, "master")
+        GitOperator.new.merge(path, "release/#{version}")
+        GitService.new.verify_push(path, "release V#{version}", "master", 'Home')
+
+        GitOperator.new.tag(path, version)
+
+        # release branch
+        GitOperator.new.checkout(path, "release/#{version}")
+        CacheOperator.new(path).load('Podfile')
+        CacheOperator.new(path).clean()
+        GitOperator.new.commit(path, "reset #{version} Podfile")
+        GitService.new.verify_push(path, "reset #{version} Podfile", "release/#{version}", 'Home')
+
+        # develop
+        GitOperator.new.checkout(path, "develop")
+        GitOperator.new.merge(path, "release/#{version}")
+        GitService.new.verify_push(path, "merge release/#{version} to develop", "develop", 'Home')
+        GitOperator.new.check_diff(path, "develop", "master")
+
+        Logger.highlight("Finish release home for #{version}")
+      else
+        raise Logger.error("There is no release/#{version} branch, please use release home start first.")
+      end
+    end
+
     private :generate_module_config, :origin_config_of_module, :find_lastest_tag
   end
 end

data/lib/big_keeper/model/operate_type.rb

@@ -26,5 +26,6 @@ module BigKeeper
     FINISH = 3
     PUBLISH = 4
     RELEASE = 5
+    RELEASE_START = 6
   end
 end

data/lib/big_keeper/service/module_service.rb

@@ -183,14 +183,6 @@ module BigKeeper
       # checkout develop
       GitService.new.verify_checkout_pull(module_full_path, 'develop')
       DepService.dep_operator(path, user).release_module_start(modules, module_name, version)
-
-      # Push home changes to remote
-      Logger.highlight("Push branch 'develop' for #{module_name}...")
-      GitService.new.verify_push(
-        module_full_path,
-        "release start for #{version}",
-        'develop',
-        "#{module_name}")
     end
 
     def release_finish(path, user, modules, module_name, version)

data/lib/big_keeper/util/bigkeeper_parser.rb

@@ -183,6 +183,8 @@ module BigKeeper
     end
 
     def self.module_full_path(home_path, user_name, module_name)
+      Logger.error("Can't find a Pod named #{module_name} in current directory.") unless @@config[:modules].invert.has_value?(module_name)
+
       if @@config[:users] \
         && @@config[:users][user_name] \
         && @@config[:users][user_name][:mods] \
@@ -206,7 +208,6 @@ module BigKeeper
         && @@config[:users][user_name][:mods][module_name][:path]
         File.expand_path(@@config[:users][user_name][:mods][module_name][:path])
       else
-        p @@config[:modules][module_name]
         if @@config[:modules][module_name][:alias]
           "#{home_modules_workspace}#{@@config[:modules][module_name][:alias]}"
         else

data/lib/big_keeper/util/cache_operator.rb

@@ -15,7 +15,9 @@ module BigKeeper
     end
 
     def load(file)
-      FileUtils.cp("#{@cache_path}/#{file}", "#{@path}/#{file}");
+      if File.exist?(@cache_path)
+        FileUtils.cp("#{@cache_path}/#{file}", "#{@path}/#{file}");
+      end
     end
 
     def clean

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -259,6 +259,7 @@ files:
 - lib/big_keeper/command/feature&hotfix/delete.rb
 - lib/big_keeper/command/feature&hotfix/finish.rb
 - lib/big_keeper/command/feature&hotfix/list.rb
+- lib/big_keeper/command/feature&hotfix/module.rb
 - lib/big_keeper/command/feature&hotfix/publish.rb
 - lib/big_keeper/command/feature&hotfix/pull.rb
 - lib/big_keeper/command/feature&hotfix/push.rb
@@ -272,7 +273,6 @@ files:
 - lib/big_keeper/command/pod.rb
 - lib/big_keeper/command/pod/podfile.rb
 - lib/big_keeper/command/release.rb
-- lib/big_keeper/command/release/finish.rb
 - lib/big_keeper/command/release/home.rb
 - lib/big_keeper/command/release/module.rb
 - lib/big_keeper/command/release/publish.rb
@@ -347,7 +347,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Efficiency improvement for iOS&Android modular development.

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

@@ -1,36 +0,0 @@
-module BigKeeper
-  def self.release_finish(path, version, user, modules)
-    BigkeeperParser.parse("#{path}/Bigkeeper")
-    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
-    modules = release_check_changed_modules(path, user) if (modules.nil? || modules.empty?)
-
-    if modules.nil? || modules.empty?
-      Logger.error('no module need to release')
-    end
-    if !CommandLineUtil.double_check("module #{modules} will changed version to #{version}, are you sure?")
-      Logger.error('release finish interrupt')
-    end
-    #stash home
-    StashService.new.stash(path, GitOperator.new.current_branch(path), 'home')
-    # delete cache
-    CacheOperator.new(path).clean()
-    # checkout develop
-    GitService.new.verify_checkout_pull(path, 'develop')
-
-    modules.each do |module_name|
-      Logger.highlight("release start module #{module_name}")
-      ModuleService.new.release_finish(path, user, modules, module_name, version)
-    end
-
-    #release home
-    DepService.dep_operator(path, user).release_home_finish(modules, version)
-
-    # Push home changes to remote
-    Logger.highlight("Push branch 'develop' for 'Home'...")
-    GitService.new.verify_push(
-      path,
-      "release finish for #{version}",
-      'develop',
-      'Home')
-  end
-end