ggsm 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34d9787f4320d45a2351369c10eb1d20f8a044e9
-  data.tar.gz: 76b1eea58ff025fa196b8d26bc361661a5216714
+  metadata.gz: 7bca353fbe3f7bb7e7127103276a603263f45901
+  data.tar.gz: b70a5547943b8a980d73277f050bdaab2f0cc7e8
 SHA512:
-  metadata.gz: 0811971955639f68dbc09319acf62c820a9a636eacfdbcaeb1e78b05069fb9667ceffd442fc0a8acbb2581a2815fbe01dfd979ac352fdfb4f82d77f72fca7214
-  data.tar.gz: 9198afa8a6e42e81495a488fc55646d297ffb082ec003c4faf8453b7364f6384d6b13a029e0ed8293114fd88ccceb32e7eb0b2f6b2b36af87d144aecf4ef21f2
+  metadata.gz: 340922eac3a57be385df68f2a87779854317cdf3e80e6cb2af6456926d16b400f62821abe081a275f8a448dad17e59d0761ee6df64b348f643b976e38b61b467
+  data.tar.gz: 450185b9f5f584c388769588c528c6a04962c18ea800a3560d5e5d4782a16d60a567cadc23252ff892faf1514f97b4d76a125b772da615a703c99c4352fd58cb

data/lib/ggsm/flow/delete.rb

@@ -7,9 +7,7 @@ module GGSM
     include Stash
 
     def delete_flow(branch, remote, all)
-      unless check_submodule
-        return
-      end
+      check_submodule
 
       puts '==> 进入主工程：'.yellow
 

data/lib/ggsm/flow/finish.rb

@@ -1,18 +1,30 @@
 require 'colorize'
 require_relative '../util/submodule'
-require_relative '../util/stash'
 
 module GGSM
   module Finish
     include Submodule
-    include Stash
 
-    def finish_flow(branch)
-      unless check_submodule
-        return
+    def finish_flow
+      check_submodule
+      check_un_commit_code
+
+      subs = get_submodule
+      subs.each do |sub|
+        Dir.chdir sub
+        puts "==> 进入#{sub}：".yellow
+        system 'git add .'
+        system 'git commit'
+        system "git push origin #{get_current_branch}"
+        Dir.chdir '..'
       end
 
       puts '==> 进入主工程：'.yellow
+      system 'git add .'
+      system 'git commit'
+      system "git push origin #{get_current_branch}"
+
+      puts 'Modules执行：git add & commit & push'.blue
     end
   end
 end

data/lib/ggsm/flow/foreach.rb

@@ -8,9 +8,7 @@ module GGSM
     include Stash
 
     def foreach_flow(*commands)
-      unless check_submodule
-        return
-      end
+      check_submodule
 
       cmd = ''
       if commands.size == 0

data/lib/ggsm/flow/start.rb

@@ -8,9 +8,7 @@ module GGSM
     include Stash
 
     def start_flow(branch, action)
-      unless check_submodule
-        return
-      end
+      check_submodule
 
       puts '==> 进入主工程：'.yellow
 

data/lib/ggsm/flow/switch.rb

@@ -8,9 +8,7 @@ module GGSM
     include Stash
 
     def switch_flow(branch)
-      unless check_submodule
-        return
-      end
+      check_submodule
 
       puts '==> 进入主工程：'.yellow
 

data/lib/ggsm/flow/sync.rb

@@ -6,9 +6,7 @@ module GGSM
     include Switch
 
     def sync_flow
-      unless check_submodule
-        return
-      end
+      check_submodule
 
       result = system 'git pull'
       unless result

data/lib/ggsm/flow/update.rb

@@ -1,9 +1,7 @@
 module GGSM
   module Update
     def update_flow
-      unless check_submodule
-        return
-      end
+      check_submodule
 
       system 'git submodule update --init --recursive'
       puts '==> 更新子模块完成！'.yellow

data/lib/ggsm/util/stash.rb

@@ -1,7 +1,7 @@
 module GGSM
   module Stash
     def try_stash
-      status = `git status | grep 'nothing to commit'`
+      status = `git status --ignore-submodules | grep 'nothing to commit'`
       need_stash = false
       if status.strip == ''
         need_stash = true

data/lib/ggsm/util/submodule.rb

@@ -4,9 +4,8 @@ module GGSM
       sub_str = `git submodule`
       if sub_str.empty?
         puts '所在目录工程下不存在Submodule，请检查所在目录！'.red
-        return false
+        exit 1
       end
-      return true
     end
 
     def get_submodule
@@ -33,5 +32,28 @@ module GGSM
       end
       return result
     end
+
+    def check_un_commit_code
+      subs = get_submodule
+      subs.each do |sub|
+        Dir.chdir sub
+        status = `git status --ignore-submodules | grep 'nothing to commit'`
+        if status.strip == ''
+          puts "#{sub} 有未提交的代码".red
+          exit 1
+        end
+        Dir.chdir '..'
+      end
+
+      status = `git status --ignore-submodules | grep 'nothing to commit'`
+      if status.strip == ''
+        puts '主工程 有未提交的代码'.red
+        exit 1
+      end
+    end
+
+    def get_current_branch
+      return `git branch | grep "*"`.split('* ')[1].split("\n")[0]
+    end
   end
 end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/lib/ggsm.rb

@@ -6,6 +6,7 @@ require_relative 'ggsm/flow/sync'
 require_relative 'ggsm/flow/switch'
 require_relative 'ggsm/flow/delete'
 require_relative 'ggsm/flow/foreach'
+require_relative 'ggsm/flow/merge'
 require_relative 'ggsm/flow/finish'
 
 module GGSM
@@ -16,6 +17,7 @@ module GGSM
     include Switch
     include Delete
     include Foreach
+    include Merge
     include Finish
 
     desc 'start <branch> [<commit>] [<origin>]', 'Start to develop new feature'
@@ -52,9 +54,14 @@ module GGSM
       foreach_flow(*commands)
     end
 
-    desc 'finish <branch>', 'Finish the feature'
-    def finish(branch)
-      finish_flow(branch)
+    desc 'merge [<branch>]', 'Merge the <branch>, default <branch>: origin/dev'
+    def merge(branch='origin/dev')
+      merge_flow(branch)
+    end
+
+    desc 'finish', 'Finish the feature'
+    def finish
+      finish_flow
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler