bigkeeper 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cae335c4028f88931e908c5e06e46be79e64ff6c18940ddec9be8da644a696c
-  data.tar.gz: 7afc0960f5701b2119235863982fc9bbc86468c621062df8c2b6af3c1ebe3810
+  metadata.gz: 07a6a50bde773caacd8472d77d8eace46a204ed3a221a11b608c76f4a7be8950
+  data.tar.gz: 44f47beb30ed88659c9488fd83062936008703beebd36a439931558af4daf1ff
 SHA512:
-  metadata.gz: 93726a66acd35be37a9552c3c5b47edb41a67cc354289addd3bd5dc28e3b17c9a8d876e49a01c439b9c0adf44c13d0323294a467e85da55b1470aa3ac9b6b69f
-  data.tar.gz: f9c36337abf07d8c51289d174010e0faee47e67219d7ee0b1374a2b7da9a48c274011ca11ff1866734c991ca749bab2d308d234aa1e821911115c4264d34e06e
+  metadata.gz: fb051c59f2c1a559fc3ed31c17779a4c07e9da11224831e299bc4514be4d1d22ad5eb5e72f3e07543f719a0e85253c4e0a3d9ee0c93cd7dbc2a4f26d5c834c4a
+  data.tar.gz: d3cab185ee28e86108fca8ebf0d1a25ef718d157f93295cb64f66a84d1bf982ad7c4d76cde7a2dc4ff4fe2ab3ce4bbc3c74ab4f12c2c4459c893d3fce5ecceea

data/Gemfile.lock

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

data/lib/big_keeper/command/release.rb

@@ -1,64 +1,86 @@
 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/util/command_line_util'
 
 module BigKeeper
   def self.release_command
-
-    desc 'Release home project & module.'
+    desc 'Prerelease home project command'
     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")
+      c.desc 'Prerelease home project start. (for Andriod)'
+      c.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("prerelease/start")
+
+          help_now!('user name is required') if user and user.empty?
+          raise Logger.error("release version is required") if version == nil
           modules = args[(0...args.length)] if args.length > 0
-          prerelease(path, version, user, modules)
+          prerelease_start(path, version, user, modules)
         end
       end
 
-      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")
+      c.desc 'Prerelease home project finish.'
+      c.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
-          help_now!('module name is required') if args.length == 0
+          LeanCloudLogger.instance.set_command("prerelease/start")
+
+          help_now!('user name is required') if user and user.empty?
           raise Logger.error("release version is required") if version == nil
           modules = args[(0...args.length)] if args.length > 0
-          prerelease_module(path, version, user, modules, false)
+          prerelease_finish(path, version, user, modules)
         end
       end
     end
 
-    desc 'Gitflow release operations'
+    desc 'Release home project & module.'
     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)
+      c.desc 'Release home project & module.'
+      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
+            modules = args[(0...args.length)] if args.length > 0
+            release_home_start(path, version, user, modules)
+          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]
+            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+            LeanCloudLogger.instance.set_command("release/home/finish")
+
+            help_now!('user name is required') if user and user.empty?
+            raise Logger.error("release version is required") if version == nil
+            release_home_finish(path, version, user, modules)
+          end
+        end
       end
 
       c.desc 'if ignore warning'
       c.switch [:i,:ignore]
-      c.desc 'Release single module operations'
+      c.desc 'Release single module operations (for iOS)'
       c.command :module do |m|
         m.action do |global_options, options, args|
+          LeanCloudLogger.instance.set_command("release/module")
           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 == 0
           raise Logger.error("release version is required") if version == nil
           modules = args[(0...args.length)] if args.length > 0

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

@@ -8,22 +8,38 @@ require 'big_keeper/util/xcode_operator'
 require 'big_keeper/model/operate_type'
 
 module BigKeeper
-  def self.prerelease(path, version, user, modules)
-    DepService.dep_operator(path, user).release_start(path, version, user, modules)
+  def self.prerelease_start(path, version, user, modules)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+    modules = BigkeeperParser.module_names
+    DepService.dep_operator(path, user).prerelease_start(path, version, user, modules)
   end
 
-  def self.release(path, version, user, modules)
+  def self.prerelease_finish(path, version, user, modules)
     BigkeeperParser.parse("#{path}/Bigkeeper")
-
     version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
     modules = BigkeeperParser.module_names
+    DepService.dep_operator(path, user).prerelease_finish(path, version, user, modules)
+  end
 
-    if GitOperator.new.has_branch(path, "release/#{version}")
-        DepService.dep_operator(path, user).release_finish(path, version, user, modules)
-    else
-        DepService.dep_operator(path, user).release_start(path, version, user, modules)
-        DepService.dep_operator(path, user).release_finish(path, version, user, modules)
+  def self.release_home_start(path, version, user, modules)
+    DepService.dep_operator(path, user).release_home_start(path, version, user, modules)
+  end
+
+  def self.release_home_finish(path, version, user, modules)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+
+    version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+    modules = []
+    BigkeeperParser.module_names.each do |module_name|
+      module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+      if GitOperator.new.has_branch(module_full_path, "release/#{version}")
+        Logger.highlight("#{module_name} has release/#{version}")
+        modules << module_name
+      end
     end
+54322
+    DepService.dep_operator(path, user).release_home_finish(path, version, user, modules)
   end
 
 end

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

@@ -8,35 +8,6 @@ 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)
-
-    # stash
-    StashService.new.stash(module_path, GitOperator.new.current_branch(module_path), 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
-
-    # 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(#{module_name} prerelease finish))
-  end
-
   def self.release_module(path, version, user, modules, spec)
     BigkeeperParser.parse("#{path}/Bigkeeper")
 
@@ -44,29 +15,47 @@ module BigKeeper
       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'
 
-      version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+    for module_name in modules
       module_path = BigkeeperParser.module_full_path(path, user, module_name)
 
+      StashService.new.stash(module_path, GitOperator.new.current_branch(module_path), module_name)
+      GitService.new.verify_checkout_pull(module_path, "release/#{version}")
+      GitService.new.verify_checkout_pull(module_path, "develop")
+
+      has_diff = release_module_pre_check(module_path, module_name, version)
+
+      if has_diff
+        # merge release to develop
+        branch_name = GitOperator.new.current_branch(module_path)
+        if branch_name == "develop"
+          GitOperator.new.merge_no_ff(module_path, "release/#{version}")
+          GitOperator.new.push_to_remote(module_path, "develop")
+        else
+          Logger.error("current branch is not develop branch")
+        end
+      end
+
       # 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
-
       # 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")
+      # merge release to master
+      GitOperator.new.merge_no_ff(module_path, "release/#{version}")
+
+      Logger.highlight(%Q(Merge "release/#{version}" to master))
+
       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
@@ -75,4 +64,11 @@ module BigKeeper
     end
   end
 
+  def self.release_module_pre_check(module_path, module_name, version)
+    #check
+    #GitOperator.new.check_merge(module_path, "feature/#{version}")
+    Logger.highlight(%Q(#{module_name} release pre-check finish))
+    return GitOperator.new.check_diff(module_path, "develop", "release/#{version}")
+  end
+
 end

data/lib/big_keeper/dependency/dep_gradle_operator.rb

@@ -57,22 +57,149 @@ module BigKeeper
         VersionConfigOperator.change_version(version_config_file, modules, version)
     end
 
-    def release_home_start(modules, version)
-      version_config_file = "#{@path}/doc/config/version-config.gradle"
-      version = "#{version}-SNAPSHOT" unless version.include?'SNAPSHOT'
-      VersionConfigOperator.change_version(version_config_file, modules, version)
+    def open
     end
 
-    def release_home_finish(modules, version)
-      version_config_file = "#{@path}/doc/config/version-config.gradle"
-      VersionConfigOperator.change_version(version_config_file, modules, version)
+    def release_check_changed_modules(path, user)
+      changed_modules = []
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      allModules = BigkeeperParser.module_names
+      allModules.each do |module_name|
+        if ModuleService.new.release_check_changed(path, user, module_name)
+          changed_modules << module_name
+        end
+      end
+      changed_modules
     end
 
-    def open
+## release cmd
+    def release_home_start(path, version, user, modules)
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+      modules = BigkeeperParser.module_names
+      
+      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()
+      # check
+      GitOperator.new.check_diff(path, "develop", "master")
+
+      #checkout release branch
+      Logger.highlight(%Q(Start to checkout Home 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))
+
+      if !modules.nil? && !modules.empty?
+        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)
+
+          if GitOperator.new.has_branch(module_full_path, "release/#{version}")
+            Logger.highlight("#{module_name} has release/#{version}")
+            GitService.new.verify_checkout_pull(module_full_path, "release/#{version}")
+          else
+            Logger.highlight("#{module_name} dont have release/#{version}")
+            GitService.new.verify_checkout(module_full_path, "release/#{version}")
+            Logger.highlight("Push branch release/'#{version}' for #{module_name}...")
+            GitOperator.new.push_to_remote(module_full_path, "release/#{version}")
+          end
+        end
+      end
+
+      Logger.highlight("Home project release home start finished")
     end
 
-    def release_start(path, version, user, modules)
+    def release_home_finish(path, version, user, modules)
       BigkeeperParser.parse("#{path}/Bigkeeper")
+      version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
+
+      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()
+      # check
+      GitOperator.new.check_diff(path, "develop", "master")
+
+      for module_name in modules
+        module_path = BigkeeperParser.module_full_path(path, user, module_name)
+
+        StashService.new.stash(module_path, GitOperator.new.current_branch(module_path), module_name)
+        GitService.new.verify_checkout_pull(module_path, "release/#{version}")
+        GitService.new.verify_checkout_pull(module_path, "develop")
+
+        has_diff = GitOperator.new.check_diff(module_path, "develop", "release/#{version}")
+        if has_diff
+          branch_name = GitOperator.new.current_branch(module_path)
+          if branch_name == "develop"
+            GitOperator.new.merge_no_ff(module_path, "release/#{version}")
+            GitOperator.new.push_to_remote(module_path, "develop")
+          else
+            Logger.error("current branch is not develop branch")
+          end
+        end
+
+        # check out master
+        Logger.highlight("'#{module_name}' checkout branch to master...")
+        GitService.new.verify_checkout_pull(module_path, "master")
+
+        # merge release to master
+        GitOperator.new.merge_no_ff(module_path, "release/#{version}")
+        Logger.highlight(%Q(Merge "release/#{version}" to master))
+        GitOperator.new.push_to_remote(module_path, "master")
+      end
+
+      if GitOperator.new.has_branch(path, "release/#{version}")
+
+        GitService.new.verify_checkout_pull(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
+        GitService.new.verify_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
+
+## prerelease cmd
+    def prerelease_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?)
 
@@ -93,20 +220,13 @@ module BigKeeper
 
       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}")
+        ModuleService.new.release_start(path, user, modules, module_name, version)
+        GitService.new.verify_push(module_full_path, "Change version to #{version}-SNAPSHOT", "develop", module_name)
       end
 
       #release home
-      DepService.dep_operator(path, user).release_home_start(modules, version)
+      DepService.dep_operator(path, user).prerelease_home_start(path, version, user, modules)
 
       # Push home changes to remote
       Logger.highlight("Push branch 'develop' for 'Home'...")
@@ -117,17 +237,10 @@ module BigKeeper
         'Home')
     end
 
-    def self.release_finish(path, version, user, modules)
+    def prerelease_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
@@ -136,20 +249,31 @@ module BigKeeper
       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)
+       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)
+      # release home
+      DepService.dep_operator(path, user).prerelease_home_finish(path, version, user, modules)
 
       # Push home changes to remote
       Logger.highlight("Push branch 'develop' for 'Home'...")
       GitService.new.verify_push(
-        path,
-        "release finish for #{version}",
-        'develop',
-        'Home')
+       path,
+       "release finish for #{version}",
+       'develop',
+       'Home')
+    end
+
+    def prerelease_home_start(path, version, user, modules)
+      version_config_file = "#{path}/doc/config/version-config.gradle"
+      version = "#{version}-SNAPSHOT" unless version.include?'SNAPSHOT'
+      VersionConfigOperator.change_version(version_config_file, modules, version)
+    end
+
+    def prerelease_home_finish(path, version, user, modules)
+      version_config_file = "#{@path}/doc/config/version-config.gradle"
+      VersionConfigOperator.change_version(version_config_file, modules, version)
     end
 
   end

data/lib/big_keeper/dependency/dep_operator.rb

@@ -21,6 +21,22 @@ module BigKeeper
       raise "You should override this method in subclass."
     end
 
+    def prerelease_start(path, version, user, modules)
+      raise "You should override this method in subclass."
+    end
+
+    def prerelease_finish(path, version, user, modules)
+      raise "You should override this method in subclass."
+    end
+
+    def prerelease_home_start(path, version, user, modules)
+      raise "You should override this method in subclass."
+    end
+
+    def prerelease_home_finish(path, version, user, modules)
+      raise "You should override this method in subclass."
+    end
+
     def release_module_start(modules, module_name, version)
       raise "You should override this method in subclass."
     end
@@ -29,11 +45,11 @@ module BigKeeper
       raise "You should override this method in subclass."
     end
 
-    def release_home_start(modules, version)
+    def release_home_start(path, version, user, modules)
       raise "You should override this method in subclass."
     end
 
-    def release_home_finish(modules, version)
+    def release_home_finish(path, version, user, modules)
       raise "You should override this method in subclass."
     end
 

data/lib/big_keeper/dependency/dep_pod_operator.rb

@@ -75,10 +75,6 @@ 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
@@ -129,10 +125,9 @@ module BigKeeper
       end
     end
 
-    def release_start(path, version, user, modules)
+    def release_home_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')
@@ -158,30 +153,32 @@ module BigKeeper
 
       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)
+      if !modules.nil? && !modules.empty?
+        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)
 
-        if GitOperator.new.has_branch(module_full_path, "release/#{version}")
-          Logger.highlight("#{module_name} has release/#{version}")
-          GitOperator.new.checkout(module_full_path, "release/#{version}")
-        else
-          Logger.highlight("#{module_name} dont have release/#{version}")
-          ModuleService.new.release_start(path, user, modules, module_name, version)
-          Logger.highlight("Push branch release/'#{version}' for #{module_name}...")
-          GitOperator.new.push_to_remote(module_full_path, "release/#{version}")
-        end
+          if GitOperator.new.has_branch(module_full_path, "release/#{version}")
+            Logger.highlight("#{module_name} has release/#{version}")
+            GitService.new.verify_checkout_pull(module_full_path, "release/#{version}")
+          else
+            Logger.highlight("#{module_name} dont have release/#{version}")
+            ModuleService.new.release_start(path, user, modules, module_name, 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)
+          DepService.dep_operator(path, user).update_module_config(
+                                               module_name,
+                                               ModuleOperateType::RELEASE_START)
+        end
       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)
+      DepService.dep_operator(path, user).install(modules, OperateType::RELEASE, true)
       XcodeOperator.open_workspace(path)
     end
 
@@ -190,20 +187,20 @@ module BigKeeper
       GitService.new.verify_checkout(module_full_path, "release/#{version}")
     end
 
-    def release_finish(path, version, user, modules)
+    def release_home_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}")
+
+        GitService.new.verify_checkout_pull(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")
+        GitService.new.verify_checkout(path, "master")
         GitOperator.new.merge(path, "release/#{version}")
         GitService.new.verify_push(path, "release V#{version}", "master", 'Home')
 

data/lib/big_keeper/util/bigkeeper_parser.rb

@@ -46,8 +46,8 @@ module BigKeeper
     @@current_user = ''
 
     def self.parse(bigkeeper)
+      @@config = {}
       if @@config.empty?
-
         Logger.error("Can't find a Bigkeeper file in current directory.") if !FileOperator.definitely_exists?(bigkeeper)
 
         content = File.read(bigkeeper, :encoding => 'UTF-8')

data/lib/big_keeper/util/git_operator.rb

@@ -83,7 +83,8 @@ module BigKeeper
 
     def pull(path)
       Dir.chdir(path) do
-        `git pull`
+        #  git pull <remote> <branch>
+        `git pull #{GitOperator.remote_local_name(path)} #{GitOperator.new.current_branch(path)}`
       end
     end
 
@@ -219,15 +220,27 @@ module BigKeeper
         compare_branch_commits.map { |item|
             Logger.default(item)
         }
-        Logger.error("#{compare_branch} branch has commit doesn't committed in #{branch}, please check")
+        Logger.highlight("#{compare_branch} branch has commit doesn't committed in #{branch}, please check")
+        return false
       else
         Logger.highlight("#{compare_branch} branch doesn't have commit before #{branch}")
+        return true
       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'
+      IO.popen("cd '#{path}'; git merge #{branch_name}") do |io|
+        io.each do |line|
+          Logger.error("Merge conflict in #{line}") if line.include? 'Merge conflict'
+        end
+      end
+    end
+
+    def merge_no_ff(path, branch_name)
+      IO.popen("cd '#{path}'; git merge #{branch_name} --no-ff") do |io|
+        io.each do |line|
+          Logger.error("Merge conflict in #{line}") if line.include? 'Merge conflict'
+        end
       end
     end
 

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.9.14"
+  VERSION = "0.9.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -276,7 +276,6 @@ files:
 - lib/big_keeper/command/release/home.rb
 - lib/big_keeper/command/release/module.rb
 - lib/big_keeper/command/release/publish.rb
-- lib/big_keeper/command/release/start.rb
 - lib/big_keeper/command/spec.rb
 - lib/big_keeper/command/spec/add.rb
 - lib/big_keeper/command/spec/analyze.rb

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

@@ -1,14 +0,0 @@
-module BigKeeper
-  def self.release_check_changed_modules(path, user)
-    changed_modules = []
-    BigkeeperParser.parse("#{path}/Bigkeeper")
-    allModules = BigkeeperParser.module_names
-    allModules.each do |module_name|
-      if ModuleService.new.release_check_changed(path, user, module_name)
-        changed_modules << module_name
-      end
-    end
-    changed_modules
-  end
-
-end