bigkeeper 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4edeeb8d082f8fb0f11ead86d138df2495d7d95f
-  data.tar.gz: 453186ec769bb6796be140554f744b1058f4769a
+  metadata.gz: 8b02490a4482b21afea4b0b7c529e37d7d5cc14a
+  data.tar.gz: 3b1581b1835064d928109eae24fe791e60d729ab
 SHA512:
-  metadata.gz: 5d0a063e3a386f4bda808202e6caf49054fb62f0c0cf2eafe98e172762f2ecd71f622c147d5d38f75422e2e4f1689db111776a0460a48064c2717b52eaa5676a
-  data.tar.gz: d08a0e038c04cbf4203215c458f96abf3c7e02751b6c9d5baefaab2aa793bdfef82fb60037b0e26bdaa984f3e392377e222e73ffd8e2e14459dbb8185f22ccb6
+  metadata.gz: 35c3e7ef3c40003c7818f748c41ad8bf6c56132ce823fce9057514a0870e0d7d3bb81f99241f4d56550d96e4fa65eaaf922376f5e09ea6832a3342d6d5800889
+  data.tar.gz: 30da0f0494391712d2e2736de23ec93e45f06e223848966b1dd67b08157b6b98f94eb45216b229fd102b448ab14a29aaf6f40dc8bb6bb5d0ce278451972fa554

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.7.5)
+    bigkeeper (0.7.6)
       big_stash (~> 0.1)
       cocoapods
       colorize

data/big_keeper.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ["mmoaay"]
   spec.email         = ["mmoaay@sina.com"]
 
-  spec.summary       = %q{Efficiency improvement for iOS modular development.}
-  spec.description   = %q{Efficiency improvement for iOS modular development, iOSer using this tool can make modular development easier.}
-  spec.homepage      = "https://github.com/BigKeeper/big-keeper"
+  spec.summary       = %q{Efficiency improvement for iOS&Android modular development.}
+  spec.description   = %q{Efficiency improvement for iOS&Android modular development, iOSer&Androider using this tool can make modular development easier.}
+  spec.homepage      = "https://github.com/BigKeeper/bigkeeper"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

data/docs/en-US/README.md

@@ -5,13 +5,13 @@
 # bigkeeper - All in home project
 
 [![Build Status](https://travis-ci.org/BigKeeper/bigkeeper.svg?branch=master)](https://travis-ci.org/BigKeeper/bigkeeper)
-[![Maintainability](https://api.codeclimate.com/v1/badges/c6dc4161e84fcec9a890/maintainability)](https://codeclimate.com/github/BigKeeper/big-keeper/maintainability)
+[![Maintainability](https://api.codeclimate.com/v1/badges/c6dc4161e84fcec9a890/maintainability)](https://codeclimate.com/github/BigKeeper/bigkeeper/maintainability)
 [![Gem Version](https://badge.fury.io/rb/bigkeeper.svg)](https://rubygems.org/gems/bigkeeper)
 [![Language: Ruby](https://img.shields.io/badge/language-Ruby-da212f.svg)](https://www.ruby-lang.org/)
 [![License](https://img.shields.io/badge/license-MIT-000000.svg)](https://github.com/BigKeeper/big-keeper/blob/master/LICENSE)
 [![Gitter](https://img.shields.io/gitter/room/BigKeeper/BigKeeper.svg)](https://gitter.im/Big-Keeper/Lobby)
 
-bigkeeper is an efficiency improvement for iOS&Android modular development, iOSer&Android using this tool can make modular development easier.
+bigkeeper is an efficiency improvement for iOS&Android modular development, iOSer&Androider using this tool can make modular development easier.
 
 ## Installation
 

data/docs/zh-CN/BIGKEEPER_FILE.md

@@ -29,7 +29,7 @@ home 'BigKeeperMain', :git => 'git@github.com:BigKeeper/BigKeeperMain.git', :pul
 
 ```
 modules do
-  pod 'BigKeeperModular', :git => 'git@github.com:BigKeeper/BigKeeperModular.git', :pulls => 'https://github.com/BigKeeper/BigKeeperModular/pulls'
+  mod 'BigKeeperModular', :git => 'git@github.com:BigKeeper/BigKeeperModular.git', :pulls => 'https://github.com/BigKeeper/BigKeeperModular/pulls'
 end
 ```
 
@@ -43,7 +43,7 @@ end
 
 ```
 user 'perry' do
-  pod 'BigKeeperModular', :path => '../BigKeeperModular'
+  mod 'BigKeeperModular', :path => '../BigKeeperModular'
 end
 ```
 

data/docs/zh-CN/FEATURE&HOTFIX.md

@@ -6,28 +6,31 @@
 
 ```
 NAME
-    feature - Feature operations
-
+    feature - Gitflow feature operations
 
 SYNOPSIS
     big [global options] feature delete
     big [global options] feature finish
     big [global options] feature list
+    big [global options] feature publish
     big [global options] feature pull
     big [global options] feature push
+    big [global options] feature rebase
     big [global options] feature start
     big [global options] feature switch
     big [global options] feature update
 
 COMMANDS
-    delete - Delete feature with name
-    finish - Finish current feature
-    list   - List all the features
-    pull   - Pull remote changes for current feature
-    push   - Push local changes to remote for current feature
-    start  - Start a new feature with name for given modules and main project
-    switch - Switch to the feature with name
-    update - Update modules for the feature with name
+    delete  - Delete feature with name
+    finish  - Finish current feature
+    list    - List all the features
+    publish - Publish current feature
+    pull    - Pull remote changes for current feature
+    push    - Push local changes to remote for current feature
+    rebase  - Rebase 'develop' to current feature
+    start   - Start a new feature with name for given modules and main project
+    switch  - Switch to the feature with name
+    update  - Update modules for the feature with name
 ```
 
 功能列表如下：
@@ -37,6 +40,7 @@ COMMANDS
   - feature 的名字;
   - 开发该 feature 需要改动的业务模块名。可以多个，用空格隔开；如果不指定，取 **Bigkeeper 文件中所有的业务模块名**。
 - finish：结束当前 feature；
+- publish：发布当前 feature；
 - switch：切换到一个已经存在的 feature，输入参数为 feature 名；
 - update：
   更新一个 feature 需要改动的业务模块，输入参数依次为：
@@ -44,6 +48,7 @@ COMMANDS
   - 开发该 feature 需要改动的业务模块名。可以多个，用空格隔开；如果不指定，取 **Bigkeeper 文件中所有的业务模块名**。
 - pull：拉取当前 feature 主项目和业务模块的远程 git 仓库更新；
 - push：提交并推送当前 feature 主项目和业务模块的本地变更到远程 git 仓库，输入参数为提交信息；
+- rebase：rebase 主项目和业务模块 `develop` 分支到当前 feature；
 - delete：根据 featue 名删除主项目和业务模块所有相关分支；（PS：慎用，因为会删除本地和远程所有相关分支）
 - list：显示当前的 feature 列表。
 
@@ -53,8 +58,10 @@ COMMANDS
 - 开发功能过程中如果发现某个模块其实不用改动，使用 bigkeeper feature update 来把这个模块从这个 feature 移除；
 - 使用 bigkeeper feature pull 来同步主项目和相关业务模块远端变更；
 - 使用 bigkeeper feature push 来推送主项目和相关业务模块变更到远端；
+- 使用 bigkeeper feature rebase 来 rebase 主项目和业务模块 `develop` 分支到当前 feature；
 - 使用 bigkeeper feature switch 来切换 feature，比如：两个功能并行开发的时候，就可以用这个命令互相切换了；
-- 功能开发完成，需要提交 PR 时，使用 bigkeeper feature finish 结束开发；
+- 功能开发完成，需要单独打包提交测试时，使用 bigkeeper feature finish 结束开发；
+- 开始进行集成测试，需要将代码 PR 到 develop 分支时，使用 bigkeeper feature publish；
 - 如果开发过程中突然有新的功能需要紧急开发，直接使用 bigkeeper feature start 进行新功能开发，旧功能未提交的内容我们会保存在 stash 中。
 
 ## feature 的工作区

data/lib/big_keeper.rb

@@ -7,18 +7,9 @@ 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/feature&hotfix/rebase'
-require 'big_keeper/command/feature&hotfix/publish'
-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/command/feature&hotfix'
+require 'big_keeper/command/release'
+require 'big_keeper/command/pod'
 
 require 'big_keeper/service/git_service'
 
@@ -34,296 +25,25 @@ module BigKeeper
   flag %i[v ver], default_value: 'Version in Bigkeeper file'
   flag %i[u user], default_value: GitOperator.new.user.gsub(/[^0-9A-Za-z]/, '').downcase
 
-  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 "Rebase 'develop' to current feature"
-    c.command :rebase do |rebase|
-      rebase.action do |global_options, options, args|
-        help_now!('user name is required') if user and user.empty?
-        rebase(path, user, 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 'Publish current feature'
-    c.command :publish do |publish|
-      publish.action do |global_options, options, args|
-        help_now!('user name is required') if user and user.empty?
-        publish(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
+  feature_and_hotfix_command(GitflowType::FEATURE)
 
-    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
+  feature_and_hotfix_command(GitflowType::HOTFIX)
 
-    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
+  release_command
 
-    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 "Rebase 'master' to current feature"
-    c.command :rebase do |rebase|
-      rebase.action do |global_options, options, args|
-        help_now!('user name is required') if user and user.empty?
-        rebase(path, user, 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 'Publish current feature'
-    c.command :publish do |publish|
-      publish.action do |global_options, options, args|
-        help_now!('user name is required') if user and user.empty?
-        publish(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
+  pod_command
 
   desc 'Show version of bigkeeper'
   command :version do |version|
     version.action do |global_options, options, args|
       p "bigkeeper (#{VERSION})"
     end
-end
+  end
+
   exit run(ARGV)
 end