bigkeeper 0.7.3

data/docs/zh-CN/RECOMMEND.md

@@ -0,0 +1,22 @@
+# 代码管理规范
+
+## 基本原则
+
+- master 分支保证是线上最新包的代码。
+- develop 分支保证是下一个发布包的代码，随时支持发布。
+
+### 开发和测试流程
+
+feature 分支为 feature 开发和提测分支，提测前需要 rebase/merge develop 的代码，测试完成后，pr 到 develop 分支，确定下个版本发布才 accept pr。
+
+### develop 分支 bug 修复流程
+
+单独开分支，fix 完成后，pr 到 develop 分支。
+
+### 发布流程
+
+develop->release->master 瞬间操作，release 不能长期存在。
+
+### hotfix 流程
+
+master 拉出 hotfix，fix 完成后分别 pr 到 master、develop 两个分支，完成后新建发布版本。

data/docs/zh-CN/RELEASE.md

@@ -0,0 +1,43 @@
+# release - 功能开发流程
+
+直接在命令行执行 `big release --help` 可以查看其提供的所有功能：
+```
+NAME
+    release - Release operations
+
+SYNOPSIS
+    big [global options] release home
+    big [global options] release module
+
+COMMANDS
+    home   - Release home project operations
+    module - Start release module
+```
+全局参数如下：
+
+- -u, --user：用户名，默认是 git global config 的 user.name，会显示在命令提示信息中，比如上述提示信息中的默认用户名是 mmoaay
+
+- -p, --path：项目路径名，默认是当前所在的路径
+
+- -v, --version：项目版本号，默认是当前所在的路径
+
+功能列表如下：
+
+- home: 发布主工程命令
+    - start: 开始发布主工程的某个版本
+    - finish: 完成发布版本
+- module: 发布模块命令
+    - start: 开始发布模块的某个版本
+    - finish: 完成发布版本
+
+## release 的工作区
+  同 feature 工作区
+
+## release home start 流程
+![](../../resources/readme/big-keeper-readme.008.png)
+## release home finish 流程
+![](../../resources/readme/big-keeper-readme.009.png)
+## release module  start 流程
+![](../../resources/readme/big-keeper-readme.010.png)
+## release module  finish 流程
+![](../../resources/readme/big-keeper-readme.012.png)

data/lib/big_keeper.rb

@@ -0,0 +1,295 @@
+#!/usr/bin/env ruby
+
+require 'big_keeper/version'
+
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/util/git_operator'
+
+require 'big_keeper/model/gitflow_type'
+
+require 'big_keeper/command/feature&hotfix/start'
+require 'big_keeper/command/feature&hotfix/finish'
+require 'big_keeper/command/feature&hotfix/switch'
+require 'big_keeper/command/feature&hotfix/update'
+require 'big_keeper/command/feature&hotfix/pull'
+require 'big_keeper/command/feature&hotfix/push'
+require 'big_keeper/command/pod/podfile'
+require 'big_keeper/command/feature&hotfix/delete'
+require 'big_keeper/command/release/home'
+require 'big_keeper/command/release/module'
+
+require 'big_keeper/service/git_service'
+
+require 'gli'
+
+include GLI::App
+
+module BigKeeper
+  # Your code goes here...
+  program_desc 'Efficiency improvement for iOS&Android module development, iOSer&Android using this tool can make module development easier.'
+
+  flag %i[p path], default_value: './'
+  flag %i[v ver], default_value: 'Version in Bigkeeper file'
+  flag %i[u user], default_value: GitOperator.new.user.gsub(/[^0-9A-Za-z]/, '').downcase
+
+  path = ''
+  version = ''
+  user = GitOperator.new.user
+
+  pre do |global_options, _command, options, args|
+    path = File.expand_path(global_options[:path])
+    version = global_options[:ver]
+    user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
+  end
+
+  if !GitflowOperator.new.verify_git_flow_command
+    p %Q('git-flow' not found, use 'brew install git-flow' to install it)
+    exit
+  end
+
+  desc 'Gitflow feature operations'
+  command :feature do |c|
+
+    c.desc 'Start a new feature with name for given modules and main project'
+    c.command :start do |start|
+      start.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        help_now!('feature name is required') if args.length < 1
+        name = args[0]
+        modules = args[(1...args.length)] if args.length > 1
+        start(path, version, user, name, modules, GitflowType::FEATURE)
+      end
+    end
+
+    c.desc 'Update modules for the feature with name'
+    c.command :update do |update|
+      update.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        modules = args[(0...args.length)] if args.length > 0
+        update(path, user, modules, GitflowType::FEATURE)
+      end
+    end
+
+    c.desc 'Switch to the feature with name'
+    c.command :switch do |switch|
+      switch.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        help_now!('feature name is required') if args.length < 1
+        name = args[0]
+        switch_to(path, version, user, name, GitflowType::FEATURE)
+      end
+    end
+
+    c.desc 'Pull remote changes for current feature'
+    c.command :pull do |pull|
+      pull.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        pull(path, user, GitflowType::FEATURE)
+      end
+    end
+
+    c.desc 'Push local changes to remote for current feature'
+    c.command :push do |push|
+      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]
+        push(path, user, comment, GitflowType::FEATURE)
+      end
+    end
+
+    c.desc 'Finish current feature'
+    c.command :finish do |finish|
+      finish.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        finish(path, user, GitflowType::FEATURE)
+      end
+    end
+
+    c.desc 'Delete feature with name'
+    c.command :delete do |delete|
+      delete.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        help_now!('feature name is required') if args.length < 1
+        name = args[0]
+        delete(path, user, name, GitflowType::FEATURE)
+      end
+    end
+
+    c.desc 'List all the features'
+    c.command :list do |list|
+      list.action do
+        branchs = GitService.new.branchs_with_type(File.expand_path(path), GitflowType::FEATURE)
+        branchs.each do |branch|
+          p branch
+        end
+      end
+    end
+  end
+
+  desc 'Gitflow hotfix operations'
+  command :hotfix do |c|
+
+    c.desc 'Start a new hotfix with name for given modules and main project'
+    c.command :start do |start|
+      start.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        help_now!('hotfix name is required') if args.length < 1
+        name = args[0]
+        modules = args[(1...args.length)] if args.length > 1
+        start(path, version, user, name, modules, GitflowType::HOTFIX)
+      end
+    end
+
+    c.desc 'Update modules for the hotfix with name'
+    c.command :update do |update|
+      update.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        modules = args[(0...args.length)] if args.length > 0
+        update(path, user, modules, GitflowType::HOTFIX)
+      end
+    end
+
+    c.desc 'Switch to the hotfix with name'
+    c.command :switch do |switch|
+      switch.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        help_now!('hotfix name is required') if args.length < 1
+        name = args[0]
+        switch_to(path, version, user, name, GitflowType::HOTFIX)
+      end
+    end
+
+    c.desc 'Pull remote changes for current hotfix'
+    c.command :pull do |pull|
+      pull.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        pull(path, user, GitflowType::HOTFIX)
+      end
+    end
+
+    c.desc 'Push local changes to remote for current hotfix'
+    c.command :push do |push|
+      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]
+        push(path, user, comment, GitflowType::HOTFIX)
+      end
+    end
+
+    c.desc 'Finish current hotfix'
+    c.command :finish do |finish|
+      finish.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        finish(path, user, GitflowType::HOTFIX)
+      end
+    end
+
+    c.desc 'Delete hotfix with name'
+    c.command :delete do |delete|
+      delete.action do |global_options, options, args|
+        help_now!('user name is required') if user and user.empty?
+        help_now!('feature name is required') if args.length < 1
+        name = args[0]
+        delete(path, user, name, GitflowType::HOTFIX)
+      end
+    end
+
+    c.desc 'List all the hotfixes'
+    c.command :list do |list|
+      list.action do
+        branchs = GitService.new.branchs_with_type(File.expand_path(path), GitflowType::HOTFIX)
+        branchs.each do |branch|
+          p branch
+        end
+      end
+    end
+  end
+
+  desc 'Gitflow release operations'
+  command :release do |c|
+
+    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|
+          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|
+          raise Logger.error("release version is required") if version == nil
+          release_home_finish(path, version)
+        end
+      end
+    end
+
+    c.desc 'release module'
+    c.command :module do |m|
+      m.desc 'Start release module project'
+      m.command :start do |start|
+        start.action do |global_options, options, args|
+          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)
+        end
+      end
+
+      m.desc 'finish release module project'
+      m.command :finish do |finish|
+        finish.action do |global_options, options, args|
+          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)
+        end
+      end
+    end
+
+  end
+
+  desc 'Podfile operation'
+  command :podfile do |podfile|
+    podfile.flag %i[pod podfile]
+    podfile.desc 'Podfile'
+    path = ''
+
+    podfile.desc 'Detect podname should be locked.'
+    podfile.command :detect do |detect|
+      detect.action do |global_options,options,args|
+        podfile_detect(path)
+      end
+    end
+
+    podfile.desc 'Lock podname should be locked.'
+    podfile.command :lock do |lock|
+      lock.action do |global_options, options, args|
+        podfile_lock(path)
+      end
+    end
+
+    podfile.desc 'Update modules should be upgrade.'
+    podfile.command :update do |lock|
+      lock.action do |global_options, options, args|
+        podfile_modules_update(path)
+      end
+    end
+  end
+
+  desc 'Show version of bigkeeper'
+  command :version do |version|
+    version.action do |global_options, options, args|
+      p "bigkeeper (#{VERSION})"
+    end
+end
+  exit run(ARGV)
+end

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

@@ -0,0 +1,33 @@
+#!/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/model/podfile_type'
+
+require 'big_keeper/service/stash_service'
+require 'big_keeper/service/module_service'
+
+
+module BigKeeper
+  def self.delete(path, user, name, type)
+    begin
+      # Parse Bigkeeper file
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+      branch_name = "#{GitflowType.name(type)}/#{name}"
+
+      modules = BigkeeperParser.module_names
+
+      modules.each do |module_name|
+        module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
+        GitService.new.verify_del(module_full_path, branch_name, module_name, type)
+      end
+
+      GitService.new.verify_del(path, branch_name, 'Home', type)
+    ensure
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+#!/usr/bin/ruby
+
+require 'big_keeper/util/podfile_operator'
+require 'big_keeper/util/logger'
+require 'big_keeper/util/pod_operator'
+require 'big_keeper/util/xcode_operator'
+require 'big_keeper/util/bigkeeper_parser'
+
+require 'big_keeper/model/podfile_type'
+
+
+module BigKeeper
+
+  def self.finish(path, user, type)
+    begin
+      # Parse Bigkeeper file
+      BigkeeperParser.parse("#{path}/Bigkeeper")
+
+      modules = PodfileOperator.new.modules_with_type("#{path}/Podfile",
+                                BigkeeperParser.module_names, ModuleType::PATH)
+      branch_name = GitOperator.new.current_branch(path)
+
+      Logger.error("Not a #{GitflowType.name(type)} branch, exit.") unless branch_name.include? GitflowType.name(type)
+
+      # Rebase modules and modify podfile as git
+      modules.each do |module_name|
+        ModuleService.new.finish(path, user, module_name, branch_name, type)
+      end
+
+      Logger.highlight("Finish branch '#{branch_name}' for 'Home'")
+
+      # pod install
+      PodOperator.pod_install(path, false)
+
+      modules.each do |module_name|
+        module_git = BigkeeperParser.module_git(module_name)
+        PodfileOperator.new.find_and_replace("#{path}/Podfile",
+                                             module_name,
+                                             ModuleType::GIT,
+                                             GitInfo.new(module_git, GitType::BRANCH, GitflowType.base_branch(type)))
+      end
+
+      # Open home workspace
+      XcodeOperator.open_workspace(path)
+
+      # Push home changes to remote
+      GitService.new.verify_push(path, "finish branch #{branch_name}", branch_name, 'Home')
+
+      # Rebase Home
+      GitService.new.verify_rebase(path, GitflowType.base_branch(type), 'Home')
+
+      `open #{BigkeeperParser.home_pulls()}`
+    ensure
+    end
+  end
+end