big_keeper 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d867efbd9a7de9b08c51986d5ca038d4f06eb4
-  data.tar.gz: 4819f7ac162d5ac8113daf85408c070569cc2a46
+  metadata.gz: 6967a93e88df9fe276ccf6226dc5b12a921ef49e
+  data.tar.gz: 20939ca9f234ae42500e583ce44b9d09c17a75ad
 SHA512:
-  metadata.gz: a146247543a84a9f8fcd77b2af6ce402499d8c4db96e091e8ddade6cb940ce244e84548528fb9c8a87c7142570ff7a04199d5e3dd3c6775ed9359caca9303b42
-  data.tar.gz: 2a30911fb546424945102ac1969ded37385d456d5434843de2177d3663b837bd05b18cd7f90f4e5608b9891915d271e351f796e2728aca5707b1045ad687f3e9
+  metadata.gz: 87d3900605fe6f45777a4fdfc00b5b9006505ec6b14a24c5001c298e02c3bafb4c0206fd29eb11a940882c4912a2ef5895c684ed31adfd09776abac8d2c7fc46
+  data.tar.gz: 36c0f7aa3abc80fc0d7ba86e87b1d30b0089294ed41b90243c8cad70cb251c3c549bdeb21bf19d73c5d7269bcc36e35ed4da7082f7cfda389b16c7d7076859d4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    big_keeper (0.5.0)
+    big_keeper (0.6.0)
       big_stash (~> 0.1)
       cocoapods
       colorize
@@ -19,7 +19,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ast (2.3.0)
-    big_stash (0.5.0)
+    big_stash (0.6.0)
       gli (~> 2.16)
     claide (1.0.1)
     cocoapods (1.2.1)

data/lib/big_keeper.rb

@@ -7,15 +7,15 @@ require 'big_keeper/util/git_operator'
 
 require 'big_keeper/model/gitflow_type'
 
-require 'big_keeper/command/feature_start'
-require 'big_keeper/command/feature_finish'
-require 'big_keeper/command/feature_switch'
-require 'big_keeper/command/feature_update'
-require 'big_keeper/command/feature_pull'
-require 'big_keeper/command/feature_push'
-require 'big_keeper/command/release_home'
-require 'big_keeper/command/release_module'
-require 'big_keeper/command/podfile_lock'
+require 'big_keeper/command/feature&hotfix/feature_start'
+require 'big_keeper/command/feature&hotfix/feature_finish'
+require 'big_keeper/command/feature&hotfix/feature_switch'
+require 'big_keeper/command/feature&hotfix/feature_update'
+require 'big_keeper/command/feature&hotfix/feature_pull'
+require 'big_keeper/command/feature&hotfix/feature_push'
+require 'big_keeper/command/release/release_home'
+require 'big_keeper/command/release/release_module'
+require 'big_keeper/command/pod/podfile_lock'
 
 require 'big_keeper/service/git_service'
 
@@ -92,6 +92,7 @@ module BigKeeper
       push.action do |global_options, options, args|
         help_now!('user name is required') if user and user.empty?
         help_now!('comment message is required') if args.length < 1
+        help_now!(%Q(comment message should be wrappered with '' or "")) if args.length > 1
         comment = args[0]
         feature_push(path, user, comment)
       end
@@ -125,7 +126,7 @@ module BigKeeper
       home.command :start do |start|
         start.action do |global_options, options, args|
           help_now!('user name is required') if user and user.empty?
-          raise BigKeeperLog.error("release version is required") if version == nil
+          raise Logger.error("release version is required") if version == nil
           release_home_start(path, version, user)
         end
       end
@@ -133,7 +134,7 @@ module BigKeeper
       home.desc 'Finish release home project'
       home.command :finish do |finish|
         finish.action do |global_options, options, args|
-          raise BigKeeperLog.error("release version is required") if version == nil
+          raise Logger.error("release version is required") if version == nil
           release_home_finish(path, version)
         end
       end
@@ -143,7 +144,7 @@ module BigKeeper
     c.command :module do |finish|
       finish.action do |global_options, options, args|
         help_now!('module name is required') if args.length != 1
-        raise BigKeeperLog.error("release version is required") if version == nil
+        raise Logger.error("release version is required") if version == nil
         module_name = args[0]
         start_module_release(path, version, user, module_name)
       end

data/lib/big_keeper/command/{feature_finish.rb → feature&hotfix/feature_finish.rb}

@@ -1,10 +1,13 @@
 #!/usr/bin/ruby
 
 require 'big_keeper/util/podfile_operator'
+require 'big_keeper/util/logger'
+require 'big_keeper/util/pod_operator'
 require 'big_keeper/util/bigkeeper_parser'
 
 require 'big_keeper/model/podfile_type'
 
+
 module BigKeeper
 
   def self.feature_finish(path, user)
@@ -16,7 +19,7 @@ module BigKeeper
                                 BigkeeperParser.module_names, ModuleType::PATH)
 
       branch_name = GitOperator.new.current_branch(path)
-      raise "Not a feature branch, exit." unless branch_name.include? 'feature'
+      Logger.error("Not a feature branch, exit.") unless branch_name.include? 'feature'
 
       # Rebase modules and modify podfile as git
       modules.each do |module_name|
@@ -32,12 +35,13 @@ module BigKeeper
       end
 
       # pod install
-      p `pod install --project-directory=#{path}`
+      PodOperator.pod_install(path)
 
+      Logger.highlight("Finish branch '#{branch_name}' for 'Home'")
       # Push home changes to remote
-      GitOperator.new.commit(path, "finish #{GitflowType.name(GitflowType::FEATURE)} #{branch_name}")
-      GitOperator.new.push(path, branch_name)
+      GitService.new.verify_push(path, "finish #{GitflowType.name(GitflowType::FEATURE)} #{branch_name}", branch_name, 'Home')
 
+      # Rebase Home
       GitService.new.verify_rebase(path, 'develop', 'Home')
 
       `open #{BigkeeperParser.home_pulls()}`

data/lib/big_keeper/command/{feature_pull.rb → feature&hotfix/feature_pull.rb}

@@ -1,3 +1,5 @@
+require 'big_keeper/util/logger'
+
 module BigKeeper
   def self.feature_pull(path, user)
     begin
@@ -5,7 +7,7 @@ module BigKeeper
       BigkeeperParser.parse("#{path}/Bigkeeper")
 
       branch_name = GitOperator.new.current_branch(path)
-      raise 'Not a feature branch, exit.' unless branch_name.include? 'feature'
+      Logger.error('Not a feature branch, exit.') unless branch_name.include? 'feature'
 
       modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
                                                       BigkeeperParser.module_names, ModuleType::PATH)
@@ -14,7 +16,7 @@ module BigKeeper
         ModuleService.new.pull(path, user, module_name, branch_name)
       end
 
-      p "Pull branch #{branch_name} for home..."
+      Logger.highlight("Pull branch '#{branch_name}' for 'Home'...")
       GitOperator.new.pull(path)
     ensure
     end

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

@@ -0,0 +1,29 @@
+require 'big_keeper/util/logger'
+
+module BigKeeper
+
+  def self.feature_push(path, user, comment)
+    begin
+      # Parse Bigkeeper file
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+
+      branch_name = GitOperator.new.current_branch(path)
+      Logger.error("Not a feature branch, exit.") unless branch_name.include? 'feature'
+
+      modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+                                BigkeeperParser.module_names, ModuleType::PATH)
+
+      modules.each do |module_name|
+        module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+        module_branch_name = GitOperator.new.current_branch(module_full_path)
+
+        Logger.highlight("Push branch '#{branch_name}' for module '#{module_name}'...")
+        GitService.new.verify_push(path, comment, module_branch_name, module_name)
+      end
+
+      Logger.highlight("Push branch '#{branch_name}' for 'Home'...")
+      GitService.new.verify_push(path, comment, branch_name, 'Home')
+    ensure
+    end
+  end
+end

data/lib/big_keeper/command/{feature_start.rb → feature&hotfix/feature_start.rb}

@@ -3,6 +3,8 @@
 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/model/podfile_type'
 
@@ -26,7 +28,7 @@ module BigKeeper
                                 BigkeeperParser.module_names, ModuleType::PATH)
 
       # Stash current branch
-      StashService.new.stash(path, branch_name, user, stash_modules)
+      StashService.new.stash_all(path, branch_name, user, stash_modules)
 
       # Handle modules
       if modules
@@ -37,6 +39,7 @@ module BigKeeper
         modules = BigkeeperParser.module_names
       end
 
+      Logger.highlight("Add branch '#{branch_name}' for 'Home'...")
       # Start home feature
       GitService.new.start(path, feature_name, GitflowType::FEATURE)
 
@@ -46,11 +49,10 @@ module BigKeeper
       end
 
       # pod install
-      p `pod install --project-directory=#{path}`
+      PodOperator.pod_install(path)
 
       # Push home changes to remote
-      GitOperator.new.commit(path, "init #{GitflowType.name(GitflowType::FEATURE)} #{feature_name}")
-      GitOperator.new.push(path, branch_name)
+      GitService.new.verify_push(path, "init #{GitflowType.name(GitflowType::FEATURE)} #{feature_name}", branch_name, 'Home')
 
       # Open home workspace
       `open #{path}/*.xcworkspace`

data/lib/big_keeper/command/{feature_switch.rb → feature&hotfix/feature_switch.rb}

@@ -1,5 +1,7 @@
 #!/usr/bin/ruby
 require 'big_stash/stash_operator'
+require 'big_keeper/util/logger'
+require 'big_keeper/util/pod_operator'
 
 module BigKeeper
   def self.feature_switch(path, version, user, name)
@@ -13,18 +15,18 @@ module BigKeeper
 
       GitService.new.verify_branch(path, branch_name, OperateType::SWITCH)
 
-      stath_modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+      stash_modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
                                 BigkeeperParser.module_names, ModuleType::PATH)
 
       # Stash current branch
-      StashService.new.stash(path, branch_name, user, stath_modules)
+      StashService.new.stash_all(path, branch_name, user, stash_modules)
 
       # Switch to new feature
       GitOperator.new.git_checkout(path, branch_name)
       GitOperator.new.pull(path)
 
       # Apply home stash
-      BigStash::StashOperator.new(path).pop_stash(branch_name)
+      StashService.new.pop_stash(path, branch_name, 'Home')
 
       modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
                                 BigkeeperParser.module_names, ModuleType::PATH)
@@ -34,7 +36,7 @@ module BigKeeper
       end
 
       # pod install
-      p `pod install --project-directory=#{path}`
+      PodOperator.pod_install(path)
 
       # Open home workspace
       `open #{path}/*.xcworkspace`

data/lib/big_keeper/command/{feature_update.rb → feature&hotfix/feature_update.rb}

@@ -3,6 +3,8 @@
 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/model/podfile_type'
 
@@ -17,7 +19,7 @@ module BigKeeper
       BigkeeperParser.parse("#{path}/Bigkeeper")
 
       branch_name = GitOperator.new.current_branch(path)
-      raise "Not a feature branch, exit." unless branch_name.include? 'feature'
+      Logger.error("Not a feature branch, exit.") unless branch_name.include? 'feature'
 
       feature_name = branch_name.gsub(/feature\//, '')
 
@@ -33,11 +35,13 @@ module BigKeeper
         modules = BigkeeperParser.module_names
       end
 
+      Logger.highlight("Start to update modules for branch '#{branch_name}'...")
+
       add_modules = modules - current_modules
       del_modules = current_modules - modules
 
       if add_modules.empty? and del_modules.empty?
-        p "There is nothing changed with modules #{modules}."
+        Logger.info("There is nothing changed with modules #{modules}.")
       else
         # Modify podfile as path and Start modules feature
         add_modules.each do |module_name|
@@ -49,7 +53,7 @@ module BigKeeper
         end
 
         # pod install
-        p `pod install --project-directory=#{path}`
+        PodOperator.pod_install(path)
 
         # Open home workspace
         `open #{path}/*.xcworkspace`

data/lib/big_keeper/command/{podfile_lock.rb → pod/podfile_lock.rb}

@@ -4,7 +4,7 @@ require 'big_keeper/util/podfile_operator'
 require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/model/podfile_type'
-require 'big_keeper/util/log_util'
+require 'big_keeper/util/logger'
 
 module BigKeeper
 
@@ -19,9 +19,9 @@ module BigKeeper
       unlock_pod_list = detector.get_unlock_pod_list
       # Print out unlock pod list
       unlock_pod_list.each do |pod_name|
-        BigKeeperLog.default("#{pod_name} should be locked.")
+        Logger.default("#{pod_name} should be locked.")
       end
-      BigKeeperLog.separator
+      Logger.separator
 
   end
 
@@ -37,11 +37,11 @@ module BigKeeper
       # Get Version
       dictionary = detector.deal_lock_file(path,unlock_pod_list)
       if dictionary.empty?
-        BigKeeperLog.warning("There is nothing to be locked.")
+        Logger.warning("There is nothing to be locked.")
       else
         PodfileOperator.new.find_and_lock("#{path}/Podfile",dictionary)
-        BigKeeperLog.highlight("The Podfile has been changed.")
-        BigKeeperLog.separator
+        Logger.highlight("The Podfile has been changed.")
+        Logger.separator
       end
 
 

data/lib/big_keeper/command/{release_home.rb → release/release_home.rb}

@@ -3,7 +3,7 @@ require 'big_keeper/util/podfile_operator'
 require 'big_keeper/util/gitflow_operator'
 require 'big_keeper/model/podfile_type'
 require 'big_keeper/util/info_plist_operator'
-require 'big_keeper/util/log_util'
+require 'big_keeper/util/logger'
 
 module BigKeeper
   def self.release_home_start(path, version, user)
@@ -16,7 +16,7 @@ module BigKeeper
       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(path, "release/#{version}")
+          GitOperator.new.first_push(path, "release/#{version}")
           GitflowOperator.new.finish_release(path, version)
           if GitOperator.new.current_branch(path) == "master"
             GitOperator.new.tag(path, version)
@@ -25,10 +25,10 @@ module BigKeeper
             GitOperator.new.tag(path, version)
           end
         else
-          raise BigKeeperLog.error("Not in release branch, please check your branches.")
+          raise Logger.error("Not in release branch, please check your branches.")
         end
       else
-        raise BigKeeperLog.error("Not has release branch, please use release start first.")
+        raise Logger.error("Not has release branch, please use release start first.")
       end
     end
   end
@@ -37,18 +37,20 @@ module BigKeeper
   def self.start_release(project_path, version, modules, user)
     Dir.chdir(project_path) do
       # step 0 Stash current branch
-      StashService.new.stash(project_path, GitOperator.new.current_branch(project_path), user, modules)
+      StashService.new.stash_all(project_path, GitOperator.new.current_branch(project_path), user, modules)
 
+      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.git_checkout(project_path, "release/#{version}")
         else
           GitflowOperator.new.start(project_path, version, GitflowType::RELEASE)
-          GitOperator.new.push(project_path, "release/#{version}")
+          GitOperator.new.first_push(project_path, "release/#{version}")
         end
       end
 
+      Logger.highlight(%Q(Start to release/#{version}))
       # step 2 replace_modules
       PodfileOperator.new.replace_all_module_release(%Q(#{project_path}/Podfile),
                                                       modules,
@@ -57,8 +59,8 @@ module BigKeeper
       # step 3 change Info.plist value
       InfoPlistOperator.new.change_version_build(project_path, version)
 
-      p `pod install --project-directory=#{project_path}`
-      p `open #{project_path}/*.xcworkspace`
+      PodOperator.pod_install(project_path)
+      `open #{project_path}/*.xcworkspace`
     end
   end
 end

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

@@ -0,0 +1,86 @@
+#!/usr/bin/ruby
+require 'big_keeper/util/podfile_operator'
+require 'big_keeper/util/gitflow_operator'
+require 'big_keeper/model/podfile_type'
+require 'big_keeper/util/info_plist_operator'
+require 'big_keeper/util/git_operator'
+require 'big_keeper/util/logger'
+
+module BigKeeper
+  def self.start_module_release(path, version, user, module_name)
+    BigkeeperParser.parse("#{path}/Bigkeeper")
+    Dir.chdir(path) do
+      module_release(BigkeeperParser::module_path(user, module_name),
+                  version,
+                  module_name,
+        GitInfo.new(BigkeeperParser::home_git, GitType::TAG, version),
+                    user)
+    end
+  end
+
+  private
+  def self.module_release(module_path, version, module_name, source, user)
+    Dir.chdir(module_path) do
+      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 release
+      Logger.highlight(%Q(Start checkout #{module_name} to Branch release/#{version}))
+      if GitOperator.new.current_branch(module_path) != "release/#{version}"
+        if GitOperator.new.has_branch(module_path, "release/#{version}")
+          GitOperator.new.git_checkout(module_path, "release/#{version}")
+        else
+          GitflowOperator.new.start(module_path, version, GitflowType::RELEASE)
+          GitOperator.new.first_push(module_path, "release/#{version}")
+        end
+      end
+
+      #修改 podspec 文件
+      # TO DO: - advanced to use Regular Expression
+      PodfileOperator.new.podspec_change(%Q(#{module_path}/#{module_name}.podspec), version, module_name)
+      GitOperator.new.commit(module_path, "update podspec")
+      GitOperator.new.first_push(module_path, GitOperator.new.current_branch(module_path))
+
+      # Pod lib lint in release/#{tag} branch
+      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 out master
+      if GitOperator.new.current_branch(module_path) != "master"
+        current_name = GitOperator.new.current_branch(module_path)
+        GitOperator.new.git_checkout(module_path, "master")
+        Logger.highlight("Push branch '#{branch_name}' for '#{module_name}'...")
+        GitService.new.verify_push(module_path, "finish #{GitflowType.name(GitflowType::RELEASE)} #{branch_name}", "master", "#{module_name}")
+      end
+
+      # to do rebase release to master
+      Logger.highlight(%Q(Rebase develop to master))
+      GitService.new.verify_rebase(module_path, 'develop', "#{module_name}")
+
+      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
+
+      GitOperator.new.tag(module_path, version)
+
+      Logger.highlight(%Q(Success release #{module_name}))
+    end
+  end
+end

data/lib/big_keeper/service/git_service.rb

@@ -1,6 +1,7 @@
 require 'big_keeper/util/git_operator'
 require 'big_keeper/model/gitflow_type'
 require 'big_keeper/model/operate_type'
+require 'big_keeper/util/logger'
 
 module BigKeeper
   # Operator for got
@@ -9,7 +10,7 @@ module BigKeeper
       if GitOperator.new.has_remote_branch(path, 'master')
         if GitOperator.new.has_local_branch(path, 'master')
           if GitOperator.new.has_commits(path, 'master')
-            raise %Q('master' has unpushed commits, you should fix it)
+            Logger.error(%Q('master' has unpushed commits, you should fix it))
           else
             GitOperator.new.git_checkout(path, 'master')
             GitOperator.new.pull(path)
@@ -22,7 +23,7 @@ module BigKeeper
       if GitOperator.new.has_remote_branch(path, 'develop')
         if GitOperator.new.has_local_branch(path, 'develop')
           if GitOperator.new.has_commits(path, 'develop')
-            raise %Q('develop' has unpushed commits, you should fix it)
+            Logger.error(%Q('develop' has unpushed commits, you should fix it))
           else
             GitOperator.new.git_checkout(path, 'develop')
             GitOperator.new.pull(path)
@@ -33,8 +34,8 @@ module BigKeeper
       end
 
       if !GitflowOperator.new.verify_git_flow(path)
-        GitOperator.new.push(path, 'develop') if !GitOperator.new.has_remote_branch(path, 'develop')
-        GitOperator.new.push(path, 'master') if !GitOperator.new.has_remote_branch(path, 'master')
+        GitOperator.new.first_push(path, 'develop') if !GitOperator.new.has_remote_branch(path, 'develop')
+        GitOperator.new.first_push(path, 'master') if !GitOperator.new.has_remote_branch(path, 'master')
       end
 
       branch_name = "#{GitflowType.name(type)}/#{name}"
@@ -43,36 +44,37 @@ module BigKeeper
         GitOperator.new.pull(path)
       else
         GitflowOperator.new.start(path, name, type)
-        GitOperator.new.push(path, branch_name)
+        GitOperator.new.first_push(path, branch_name)
       end
     end
 
     def verify_branch(path, branch_name, type)
+      Logger.highlight('Sync local branchs from remote, waiting...')
       GitOperator.new.git_fetch(path)
 
       if OperateType::START == type
         if GitOperator.new.current_branch(path) == branch_name
-          raise %(Current branch is '#{branch_name}' already. Use 'update' please)
+          Logger.error(%(Current branch is '#{branch_name}' already. Use 'update' please))
         end
         if GitOperator.new.has_branch(path, branch_name)
-          raise %(Branch '#{branch_name}' already exists. Use 'switch' please)
+          Logger.error(%(Branch '#{branch_name}' already exists. Use 'switch' please))
         end
       elsif OperateType::SWITCH == type
         if !GitOperator.new.has_branch(path, branch_name)
-          raise %(Can't find a branch named '#{branch_name}'. Use 'start' please)
+          Logger.error(%(Can't find a branch named '#{branch_name}'. Use 'start' please))
         end
         if GitOperator.new.current_branch(path) == branch_name
-          raise %(Current branch is '#{branch_name}' already. Use 'update' please)
+          Logger.error(%(Current branch is '#{branch_name}' already. Use 'update' please))
         end
       elsif OperateType::UPDATE == type
         if !GitOperator.new.has_branch(path, branch_name)
-          raise %(Can't find a branch named '#{branch_name}'. Use 'start' please)
+          Logger.error(%(Can't find a branch named '#{branch_name}'. Use 'start' please))
         end
         if GitOperator.new.current_branch(path) != branch_name
-          raise %(Current branch is not '#{branch_name}'. Use 'switch' please)
+          Logger.error(%(Current branch is not '#{branch_name}'. Use 'switch' please))
         end
       else
-        raise %(Not a valid command for '#{branch_name}'.)
+        Logger.error(%(Not a valid command for '#{branch_name}'.))
       end
     end
 
@@ -88,25 +90,39 @@ module BigKeeper
       branchs
     end
 
+    def verify_push(path, comment, branch_name, name)
+      git = GitOperator.new
+      if git.has_changes(path)
+        git.commit(path, comment)
+        if git.has_remote_branch(path, branch_name)
+          git.push(path)
+        else
+          git.first_push(path, branch_name)
+        end
+      else
+        Logger.default("Nothing to push for '#{name}'.")
+      end
+    end
+
     def verify_rebase(path, branch_name, name)
       Dir.chdir(path) do
         IO.popen("git rebase #{branch_name} --ignore-whitespace") do |io|
           unless io.gets
-            raise "#{name} is already in a rebase-apply, Please:\n\
+            Logger.error("#{name} is already in a rebase-apply, Please:\n\
                   1.Resolve it;\n\
                   2.Commit the changes;\n\
                   3.Push to remote;\n\
                   4.Create a MR;\n\
-                  5.Run 'finish' again."
+                  5.Run 'finish' again.")
           end
           io.each do |line|
             next unless line.include? 'Merge conflict'
-            raise "Merge conflict in #{name}, Please:\n\
+            Logger.error("Merge conflict in #{name}, Please:\n\
                   1.Resolve it;\n\
                   2.Commit the changes;\n\
                   3.Push to remote;\n\
                   4.Create a MR;\n\
-                  5.Run 'finish' again."
+                  5.Run 'finish' again.")
           end
         end
         `git push -f origin #{branch_name}`

data/lib/big_keeper/service/module_service.rb

@@ -1,4 +1,5 @@
 require 'big_keeper/service/git_service'
+require 'big_keeper/util/logger'
 
 module BigKeeper
   # Operator for got
@@ -6,19 +7,23 @@ module BigKeeper
     def pull(path, user, module_name, branch_name)
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
+      Logger.highlight("Pull branch '#{branch_name}' for module '#{module_name}'...")
+
       if !File.exist? module_full_path
+        Logger.default("No local repository for module '#{module_name}', clone it...")
         module_git = BigkeeperParser.module_git(module_name)
         GitOperator.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
         GitOperator.new.git_checkout(module_full_path, branch_name)
       else
         current_branch_name = GitOperator.new.current_branch(module_full_path)
         if current_branch_name != branch_name
-          p "Current branch of #{module_name} is #{current_branch_name},\
-            stash it and checkout #{branch_name}..."
-          BigStash::StashOperator.new(module_full_path).stash(current_branch_name)
+          Logger.default("Current branch of '#{module_name}' is '#{current_branch_name}',\
+            stash it and checkout '#{branch_name}'...")
+
+          StashService.new.stash(module_full_path, current_branch_name, module_name)
+
           GitOperator.new.git_checkout(module_full_path, branch_name)
         end
-        p "Pull branch #{branch_name} for module #{module_name}..."
         GitOperator.new.pull(module_full_path)
       end
     end
@@ -26,9 +31,10 @@ module BigKeeper
     def switch(path, user, module_name, branch_name)
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
-      p "Switch to branch #{branch_name} for module #{module_name}..."
+      Logger.highlight("Switch to branch '#{branch_name}' for module '#{module_name}'...")
 
       if !File.exist? module_full_path
+        Logger.default("No local repository for module '#{module_name}', clone it...")
         module_git = BigkeeperParser.module_git(module_name)
         GitOperator.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
         GitOperator.new.git_checkout(module_full_path, branch_name)
@@ -37,7 +43,7 @@ module BigKeeper
         GitOperator.new.pull(module_full_path)
       end
 
-      BigStash::StashOperator.new(module_full_path).pop_stash(branch_name)
+      StashService.new.pop_stash(module_full_path, branch_name, module_name)
     end
 
     def finish(path, user, module_name)
@@ -45,7 +51,7 @@ module BigKeeper
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
       branch_name = GitOperator.new.current_branch(module_full_path)
 
-      p "Finish branch #{branch_name} for module #{module_name}..."
+      Logger.highlight("Finish branch '#{branch_name}' for module '#{module_name}'...")
 
       PodfileOperator.new.find_and_replace("#{path}/Podfile",
                                            module_name,
@@ -60,27 +66,29 @@ module BigKeeper
     def add(path, user, module_name, name, type)
       branch_name = "#{GitflowType.name(type)}/#{name}"
 
-      p "Add branch #{branch_name} for module #{module_name}..."
+      Logger.highlight("Add branch '#{branch_name}' for module '#{module_name}'...")
 
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
       # clone module if not exist
       if !File.exist? module_full_path
+        Logger.default("No local repository for module #{module_name}, clone it...")
         module_git = BigkeeperParser.module_git(module_name)
         GitOperator.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
       end
 
       # stash current branch
       current_branch_name = GitOperator.new.current_branch(module_full_path)
-      BigStash::StashOperator.new(module_full_path).stash(current_branch_name)
+
+      StashService.new.stash(module_full_path, current_branch_name, module_name)
 
       # start new feature/hotfix
       GitService.new.start(module_full_path, name, type)
 
-      # apply stash
-      BigStash::StashOperator.new(module_full_path).pop_stash(branch_name)
+      StashService.new.pop_stash(module_full_path, branch_name, module_name)
 
       module_path = BigkeeperParser.module_path(user, module_name)
+
       PodfileOperator.new.find_and_replace("#{path}/Podfile",
                                            module_name,
                                            ModuleType::PATH,
@@ -90,11 +98,11 @@ module BigKeeper
     def del(path, user, module_name, name, type)
       branch_name = "#{GitflowType.name(type)}/#{name}"
 
-      p "del branch #{branch_name} for module #{module_name}..."
+      Logger.highlight("Delete branch '#{branch_name}' for module '#{module_name}'...")
 
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
-      BigStash::StashOperator.new(module_full_path).stash(branch_name)
+      StashService.new.stash(module_full_path, branch_name, module_name)
 
       GitOperator.new.git_checkout(module_full_path, 'develop')
       GitOperator.new.del(module_full_path, branch_name)

data/lib/big_keeper/service/stash_service.rb

@@ -1,42 +1,45 @@
 require 'big_stash/stash_operator'
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/util/git_operator'
+require 'big_keeper/util/logger'
 
 module BigKeeper
   # Operator for got
   class StashService
-    def stash(path, new_branch_name, user, modules)
+    def pop_stash(path, branch_name, name)
+      # pop stash
+      if BigStash::StashOperator.new(path).stash_for_name(branch_name)
+        Logger.highlight(%Q(Branch '#{branch_name}' of '#{name}' has stash , start to pop...))
+        BigStash::StashOperator.new(path).pop_stash(branch_name)
+      end
+    end
+
+    def stash(path, branch_name, name)
+      # stash
+      if GitOperator.new.has_changes(path)
+        Logger.highlight(%Q(Branch '#{branch_name}' of '#{name}' needs stash , start to stash...))
+        BigStash::StashOperator.new(path).stash(branch_name)
+      end
+    end
+
+    def stash_all(path, new_branch_name, user, modules)
       # Stash modules
+      Logger.highlight('Stash for current workspace...')
+
       modules.each do |module_name|
         module_path = BigkeeperParser.module_full_path(path, user, module_name)
         branch_name = GitOperator.new.current_branch(module_path)
 
         if branch_name != new_branch_name
-          p %Q(Current branch of '#{module_name}' is '#{branch_name}', start to stash...)
-          BigStash::StashOperator.new(module_path).stash(branch_name)
-        else
-          p %Q(Current branch name of '#{module_name}' is the same with new branch, continue...)
+          stash(module_path, branch_name, module_name)
         end
       end
 
       # Stash home
       branch_name = GitOperator.new.current_branch(path)
       if branch_name != new_branch_name
-        p %Q(Current branch of home is '#{branch_name}', start to stash...)
-        BigStash::StashOperator.new(path).stash(branch_name)
-      else
-        p "Current branch name of home is the same with new branch, continue..."
-      end
-    end
-
-    def pop_stash(path, user, branch_name, modules)
-      # Stash modules
-      modules.each do |module_name|
-        module_path = BigkeeperParser.module_full_path(path, user, module_name)
-        BigStash::StashOperator.new(module_path).pop_stash(branch_name)
+        stash(path, branch_name, 'Home')
       end
-      # Stash home
-      BigStash::StashOperator.new(path).pop_stash(branch_name)
     end
   end
 end

data/lib/big_keeper/util/git_operator.rb

@@ -72,9 +72,15 @@ module BigKeeper
       end
     end
 
-    def push(path, branch_name)
+    def first_push(path, branch_name)
       Dir.chdir(path) do
-        p `git push -u origin #{branch_name}`
+        `git push -u origin #{branch_name}`
+      end
+    end
+
+    def push(path)
+      Dir.chdir(path) do
+        p `git push`
       end
     end
 

data/lib/big_keeper/util/gitflow_operator.rb

@@ -6,7 +6,7 @@ module BigKeeper
     def start(path, name, type)
       Dir.chdir(path) do
         gitflow_type_name = GitflowType.name(type)
-        p `git flow #{gitflow_type_name} start #{name}`
+        `git flow #{gitflow_type_name} start #{name}`
       end
     end
 

data/lib/big_keeper/util/info_plist_operator.rb

@@ -12,8 +12,8 @@ module BigKeeper
       end
       info_plist_path = find_infoPlist_filePath(path)
       result = Plist.parse_xml(info_plist_path)
+      result['CFBundleVersion'] = getBuildVersion(version, result['CFBundleShortVersionString'], result['CFBundleVersion']).to_s
       result['CFBundleShortVersionString'] = version.to_s
-      result['CFBundleVersion'] = getBuildVersion(version, result['CFBundleShortVersionString'], result['CFBundleVersion'])
       Plist::Emit.save_plist(result, info_plist_path)
       puts %Q('Version has changed to #{version}')
     end

data/lib/big_keeper/util/{log_util.rb → logger.rb}

@@ -6,7 +6,7 @@ module BigKeeper
   ERROR_LOG = 3
   WARNING_LOG = 4
 
-  class BigKeeperLog
+  class Logger
 
     def self.log_with_type(sentence,type)
       case type

data/lib/big_keeper/util/pod_operator.rb

@@ -0,0 +1,14 @@
+require 'big_keeper/util/logger'
+
+module BigKeeper
+  class PodOperator
+    def self.pod_install(path)
+      Logger.highlight('Start pod install, waiting...')
+
+      # pod install
+      `pod install --project-directory=#{path}`
+
+      Logger.highlight('Finish pod install.')
+    end
+  end
+end

data/lib/big_keeper/util/podfile_detector.rb

@@ -1,6 +1,6 @@
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/model/podfile_model'
-require 'big_keeper/util/log_util'
+require 'big_keeper/util/logger'
 
 module BigKeeper
 
@@ -17,7 +17,7 @@ class PodfileDetector
 
   def get_unlock_pod_list
     podfile_lines = File.readlines("#{@main_path}/Podfile")
-    BigKeeperLog.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
+    Logger.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
       podfile_lines.collect do |sentence|
       deal_podfile_line(sentence) unless sentence =~(/(\d+.){1,2}\d+/)
       end
@@ -39,7 +39,7 @@ class PodfileDetector
   def deal_lock_file(main_path,deal_list)
       $result = {}
       podfile_lock_lines = File.readlines("#{main_path}/Podfile.lock")
-      BigKeeperLog.highlight("Analyzing Podfile.lock...") unless podfile_lock_lines.size.zero?
+      Logger.highlight("Analyzing Podfile.lock...") unless podfile_lock_lines.size.zero?
       podfile_lock_lines.select do |sentence|
       if sentence.include?('DEPENDENCIES')  #指定范围解析 Dependencies 之前
         break

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: big_keeper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -221,17 +221,16 @@ files:
 - docs/zh-CN/README.md
 - docs/zh-CN/RELEASE.md
 - lib/big_keeper.rb
-- lib/big_keeper/command/feature_finish.rb
-- lib/big_keeper/command/feature_pull.rb
-- lib/big_keeper/command/feature_push.rb
-- lib/big_keeper/command/feature_start.rb
-- lib/big_keeper/command/feature_switch.rb
-- lib/big_keeper/command/feature_update.rb
-- lib/big_keeper/command/hotfix_start.rb
-- lib/big_keeper/command/podfile_lock.rb
-- lib/big_keeper/command/release_home.rb
-- lib/big_keeper/command/release_module.rb
-- lib/big_keeper/command/start_module_release.sh
+- lib/big_keeper/command/feature&hotfix/feature_finish.rb
+- lib/big_keeper/command/feature&hotfix/feature_pull.rb
+- lib/big_keeper/command/feature&hotfix/feature_push.rb
+- lib/big_keeper/command/feature&hotfix/feature_start.rb
+- lib/big_keeper/command/feature&hotfix/feature_switch.rb
+- lib/big_keeper/command/feature&hotfix/feature_update.rb
+- lib/big_keeper/command/pod/podfile_lock.rb
+- lib/big_keeper/command/release/release_home.rb
+- lib/big_keeper/command/release/release_module.rb
+- lib/big_keeper/command/release/release_module.sh
 - lib/big_keeper/model/gitflow_type.rb
 - lib/big_keeper/model/operate_type.rb
 - lib/big_keeper/model/podfile_model.rb
@@ -243,7 +242,8 @@ files:
 - lib/big_keeper/util/git_operator.rb
 - lib/big_keeper/util/gitflow_operator.rb
 - lib/big_keeper/util/info_plist_operator.rb
-- lib/big_keeper/util/log_util.rb
+- lib/big_keeper/util/logger.rb
+- lib/big_keeper/util/pod_operator.rb
 - lib/big_keeper/util/podfile_detector.rb
 - lib/big_keeper/util/podfile_operator.rb
 - lib/big_keeper/version.rb

data/lib/big_keeper/command/feature_push.rb

@@ -1,37 +0,0 @@
-module BigKeeper
-
-  def self.feature_push(path, user, comment)
-    begin
-      # Parse Bigkeeper file
-      BigkeeperParser.parse("#{path}/Bigkeeper")
-
-      branch_name = GitOperator.new.current_branch(path)
-      raise "Not a feature branch, exit." unless branch_name.include? 'feature'
-
-      modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
-                                BigkeeperParser.module_names, ModuleType::PATH)
-
-      modules.each do |module_name|
-        module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
-        module_branch_name = GitOperator.new.current_branch(module_full_path)
-
-        if GitOperator.new.has_changes(module_full_path)
-          p "Push branch #{branch_name} for module #{module_name}..."
-          GitOperator.new.commit(module_full_path, comment)
-          GitOperator.new.push(module_full_path, module_branch_name)
-        else
-          p "Nothing to push for #{module_name}."
-        end
-      end
-
-      if GitOperator.new.has_changes(path)
-        p "Push branch #{branch_name} for home..."
-        GitOperator.new.commit(path, comment)
-        GitOperator.new.push(path, branch_name)
-      else
-        p "Nothing to push for home."
-      end
-    ensure
-    end
-  end
-end

data/lib/big_keeper/command/release_module.rb

@@ -1,70 +0,0 @@
-#!/usr/bin/ruby
-require 'big_keeper/util/podfile_operator'
-require 'big_keeper/util/gitflow_operator'
-require 'big_keeper/model/podfile_type'
-require 'big_keeper/util/info_plist_operator'
-require 'big_keeper/util/git_operator'
-require 'big_keeper/util/log_util'
-
-module BigKeeper
-  def self.start_module_release(path, version, user, module_name)
-    BigkeeperParser.parse("#{path}/Bigkeeper")
-    Dir.chdir(path) do
-      module_release(BigkeeperParser::module_path(user, module_name),
-                  version,
-                  module_name,
-        GitInfo.new(BigkeeperParser::home_git, GitType::TAG, version),
-                    user)
-    end
-  end
-
-  private
-  def self.module_release(module_path, version, module_name, source, user)
-    Dir.chdir(module_path) do
-      if GitOperator.new.has_changes(module_path)
-        StashService.new.stash(module_path, GitOperator.new.current_branch(module_path), user, module_name.split())
-      end
-
-      # step 1 checkout release
-      if GitOperator.new.current_branch(module_path) != "release/#{version}"
-        if GitOperator.new.has_branch(module_path, "release/#{version}")
-          GitOperator.new.git_checkout(module_path, "release/#{version}")
-        else
-          GitflowOperator.new.start(module_path, version, GitflowType::RELEASE)
-          GitOperator.new.push(module_path, "release/#{version}")
-        end
-      end
-      p "path----"
-      puts GitOperator.new.current_branch(module_path)
-      #修改 podspec 文件
-      # TO DO: - advanced to use Regular Expression
-      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
-        puts "error"
-        return
-      end
-
-      puts "error------"
-      # PodfileOperator.new.podspec_change(%Q(#{module_path}/#{module_name}.podspec), version, module_name)
-      # p `pod lib lint --allow-warnings --verbose --use-libraries --sources=#{BigkeeperParser::sourcemodule_path}`
-
-      # GitOperator.new.commit(module_path, "update podspec")
-      # GitOperator.new.push(module_path, GitOperator.new.current_branch(module_path))
-      # if GitOperator.new.current_branch(module_path) != "master"
-      #   current_name = GitOperator.new.current_branch(module_path)
-      #   p `git checkout master`
-      #   p `git merge #{current_name}`
-      #   p `git push`
-      # end
-      # GitOperator.new.tag(module_path, version)
-
-      # p `pod repo push #{module_name} #{module_name}.podspec --allow-warnings --sources=#{BigkeeperParser::sourcemodule_path}`
-
-    end
-  end
-end