ggsm 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95cfd08ec8becac4c4b7c6e38c64b1e92325b236
-  data.tar.gz: 56b13b3e8697646ed444f66262e974c997808f6f
+  metadata.gz: d194bcbcc90cdf2025160a000a16360e3de891a7
+  data.tar.gz: e84546de9fcaacbf29e0c95ee69591e3d2cd98f8
 SHA512:
-  metadata.gz: 15258303bf96ae44e75f9fcc2225f4895b91efa2ce4fd1a726423e4292249990550c6cd0901a9fa2fb709570e60c54b3b0f244660ff35f35a3db8b31812e6351
-  data.tar.gz: 04e6a579692810536bfffbbea0d2ad645152d39e10fc2b4baae9fbf5d8710a47d6cbe3fd7e3366da41fd4dd03cf32bc943003a14faf37ac453f5f06140fc6a48
+  metadata.gz: 15111fb0282681c54cc30635b6b323c15e729349774c49550d1a1791988c3da63a1c77496f45ecd2b40bfa7bf1126d4c4af3a070be3483ba32d0c8ec50ce9eaf
+  data.tar.gz: 2a263cbb1f36d1bd8e748b35a44bd8afa5e361e680ab3d2aa7a7298350c148c676b7892c6a2c785fb5d2e2a66eade4583724df43e63f1dfe42729949612f7df5

data/lib/ggsm/flow/finish.rb

@@ -12,16 +12,12 @@ module GGSM
       subs.each do |sub|
         Dir.chdir sub
         puts "==> 进入#{sub}：".yellow
-        system 'git add .'
-        system 'git commit'
-        system "git push origin #{get_current_branch}"
+        system "git add .;git commit;git push origin #{get_current_branch}"
         Dir.chdir '..'
       end
 
       puts '==> 进入主工程：'.yellow
-      system 'git add .'
-      system 'git commit'
-      system "git push origin #{get_current_branch}"
+      system "git add .;git commit;git push origin #{get_current_branch}"
 
       puts 'Modules执行：git add & commit & push'.blue
     end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

data/lib/ggsm.rb

@@ -20,27 +20,27 @@ module GGSM
     include Merge
     include Finish
 
-    desc 'start <branch> [<commit>] [<origin>]', 'Start to develop new feature'
+    desc 'start <branch> [<commit>] [<origin>]', '检出新分支，新功能、修bug务必使用该命令'
     def start(branch, action='')
       start_flow(branch, action)
     end
 
-    desc 'switch <branch>', 'Switch to branch <branch>'
+    desc 'switch <branch>', '切换分支'
     def switch(branch)
       switch_flow(branch)
     end
 
-    desc 'update', 'Update submodule'
+    desc 'update', '更新当前commit对应的子模块commit'
     def update
       update_flow
     end
 
-    desc 'sync', 'Sync remote app and submodules'
+    desc 'sync', '当前分支同步(拉取)远程代码'
     def sync
       sync_flow
     end
 
-    desc 'delete <branch> [-r|--remote] [-a|--all]', 'Delete <branch>'
+    desc 'delete <branch> [-r|--remote] [-a|--all]', '删除指定分支'
     option :remote, :default => false, :type => :boolean, aliases: '-r'
     option :all, :default => false, :type => :boolean, aliases: '-a'
     def delete(branch)
@@ -49,17 +49,17 @@ module GGSM
       delete_flow(branch, remote, all)
     end
 
-    desc 'foreach [<commands>...]', 'Executes the git command in each module'
+    desc 'foreach [<commands>...]', '全模块执行git命令(foreach后跟git命令)'
     def foreach(*commands)
       foreach_flow(*commands)
     end
 
-    desc 'merge [<branch>]', 'Merge the <branch>, default <branch>: origin/dev'
+    desc 'merge [<branch>]', 'Merge，开发完成后执行'
     def merge(branch='origin/dev')
       merge_flow(branch)
     end
 
-    desc 'finish', 'Finish the feature'
+    desc 'finish', '完成开发，ggsm merge并解决冲突后执行'
     def finish
       finish_flow
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,6 @@ files:
 - Rakefile
 - bin/ggsm
 - ggsm-1.0.0.gem
-- ggsm-1.1.0.gem
 - ggsm.gemspec
 - lib/ggsm.rb
 - lib/ggsm/flow/delete.rb